WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

认证-参数收集清单-添加查询,添加,批量删除

Browse Source
This commit is contained in:
liyawei
2022-05-09 18:37:25 +08:00
parent 600b7fcb98
commit bf5b43db7a
22 changed files with 437 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
+82 -48
View File
@@ -5,9 +5,12 @@ import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.system.base.controller.JeroController;
import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
import com.jero.modules.cert.collect.service.IParamsCollectManifestEOService;
import com.jero.modules.cert.collect.vo.ParamsCollectManifestVO;
import com.jero.modules.cert.template.entity.ParamsInfoPublishEO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -21,12 +24,12 @@ import java.util.Map;
/**
* @Description: 参数收集清单
* @Description: 参数项收集清单
* @Author: jero-boot
* @Date: 2022-05-05
* @Version: V1.0
*/
@Api(tags="参数收集清单")
@Api(tags="参数项收集清单")
@RestController
@RequestMapping("/params/collectManifest")
@Slf4j
@@ -39,8 +42,8 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
*
* @return
*/
@AutoLog(value = "参数收集清单-表头中英文切换")
@ApiOperation(value="参数收集清单-表头中英文切换", notes="参数收集清单-表头中英文切换")
@AutoLog(value = "参数项收集清单-表头中英文切换")
@ApiOperation(value="参数项收集清单-表头中英文切换", notes="参数项收集清单-表头中英文切换")
@GetMapping(value = "/getHeader")
public Result<List<Map<String, Object>>> getHeader(@RequestParam(name = "paramsManifestId") String paramsManifestId,
@RequestParam(name = "flag") String flag,
@@ -54,55 +57,81 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
*
* @return
*/
@AutoLog(value = "参数收集清单-列表查询")
@ApiOperation(value="参数收集清单-列表查询", notes="参数收集清单-列表查询")
@AutoLog(value = "参数项收集清单-列表查询")
@ApiOperation(value="参数项收集清单-列表查询", notes="参数项收集清单-列表查询")
@GetMapping(value = "/list")
public Result<List<Map<String, Object>>> queryList(ParamsCollectManifestEO paramsCollectManifestEO,
@RequestParam(name = "cut") String cut) {
if (StringUtils.isNotEmpty(paramsCollectManifestEO.getNioNumber())) {
paramsCollectManifestEO.setNioNumber(paramsCollectManifestEO.getNioNumber().replace("%","\\%"));
}
if (StringUtils.isNotEmpty(paramsCollectManifestEO.getParamsName())) {
paramsCollectManifestEO.setParamsName(paramsCollectManifestEO.getParamsName().replace("%","\\%"));
}
if (StringUtils.isNotEmpty(paramsCollectManifestEO.getDre())) {
paramsCollectManifestEO.setDre(paramsCollectManifestEO.getDre().replace("%","\\%"));
}
List<Map<String, Object>> list = paramsCollectManifestEOService.queryList(paramsCollectManifestEO, cut);
return Result.OK(list);
}
/**
* 提交
*
* @param configDataList
* @return
*/
@AutoLog(value = "参数项收集清单-提交")
@ApiOperation(value="参数项收集清单-提交", notes="参数项收集清单-提交")
@PostMapping(value = "/submit")
public Result<?> submit(@RequestBody List<Map<String, Object>> configDataList) {
boolean isSuccess = paramsCollectManifestEOService.submit(configDataList);
if (isSuccess) {
return Result.OK("提交成功！");
} else {
return Result.error("提交失败！");
}
}
/**
* 查询清单所用模版参数项列表（过滤清单已添加的参数项）
*
* @return
*/
@AutoLog(value = "参数项收集清单-添加查询")
@ApiOperation(value="参数项收集清单-添加查询", notes="参数项收集清单-添加查询")
@GetMapping(value = "/paramsInfoList")
public Result<List<ParamsInfoPublishEO>> paramsInfoList(ParamsCollectManifestVO paramsCollectManifestVO,
@RequestParam(name = "cut") String cut) {
if (StringUtils.isNotEmpty(paramsCollectManifestVO.getNioNumber())) {
paramsCollectManifestVO.setNioNumber(paramsCollectManifestVO.getNioNumber().replace("%","\\%"));
}
if (StringUtils.isNotEmpty(paramsCollectManifestVO.getParamsName())) {
paramsCollectManifestVO.setParamsName(paramsCollectManifestVO.getParamsName().replace("%","\\%"));
}
List<ParamsInfoPublishEO> list = paramsCollectManifestEOService.getParamsInfoPublishListForAdd(paramsCollectManifestVO);
return Result.OK(cut, list);
}
/**
* 添加
*
* @param paramsCollectManifestEO
* @param paramsCollectManifestVO
* @return
*/
@AutoLog(value = "参数收集清单-添加")
@ApiOperation(value="参数收集清单-添加", notes="参数收集清单-添加")
@AutoLog(value = "参数项收集清单-添加")
@ApiOperation(value="参数项收集清单-添加", notes="参数项收集清单-添加")
@PostMapping(value = "/add")
public Result<?> add(@Validated @RequestBody ParamsCollectManifestEO paramsCollectManifestEO) {
paramsCollectManifestEOService.add(paramsCollectManifestEO);
return Result.OK("添加成功！");
}
/**
* 编辑
*
* @param paramsCollectManifestEO
* @return
*/
@AutoLog(value = "参数收集清单-编辑")
@ApiOperation(value="参数收集清单-编辑", notes="参数收集清单-编辑")
@PutMapping(value = "/edit")
public Result<?> edit(@Validated @RequestBody ParamsCollectManifestEO paramsCollectManifestEO) {
paramsCollectManifestEOService.editById(paramsCollectManifestEO);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "参数收集清单-通过id删除")
@ApiOperation(value="参数收集清单-通过id删除", notes="参数收集清单-通过id删除")
@DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
paramsCollectManifestEOService.deleteById(id);
return Result.OK("删除成功!");
public Result<?> add(@Validated @RequestBody ParamsCollectManifestVO paramsCollectManifestVO) {
boolean isSuccess = paramsCollectManifestEOService.add(paramsCollectManifestVO);
if (isSuccess) {
return Result.OK("添加成功！");
} else {
return Result.error("添加失败！");
}
}
/**
@@ -111,22 +140,27 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
* @param ids
* @return
*/
@AutoLog(value = "参数收集清单-批量删除")
@ApiOperation(value="参数收集清单-批量删除", notes="参数收集清单-批量删除")
@DeleteMapping(value = "/deleteBatch")
@AutoLog(value = "参数项收集清单-批量删除")
@ApiOperation(value="参数项收集清单-批量删除", notes="参数项收集清单-批量删除")
@PostMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.paramsCollectManifestEOService.deleteByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
boolean isSuccess = paramsCollectManifestEOService.deleteByIds(Arrays.asList(ids.split(",")));
if (isSuccess) {
return Result.OK("批量删除成功！");
} else {
return Result.error("批量删除失败！");
}
}
/**
* 通过id查询
*
* @param id
* @return
*/
@AutoLog(value = "参数收集清单-通过id查询")
@ApiOperation(value="参数收集清单-通过id查询", notes="参数收集清单-通过id查询")
@AutoLog(value = "参数项收集清单-通过id查询")
@ApiOperation(value="参数项收集清单-通过id查询", notes="参数项收集清单-通过id查询")
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
ParamsCollectManifestEO paramsCollectManifestEO = paramsCollectManifestEOService.queryById(id);
@@ -144,7 +178,7 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, ParamsCollectManifestEO paramsCollectManifestEO) {
return super.exportXls(request, paramsCollectManifestEO, ParamsCollectManifestEO.class, "参数收集清单");
return super.exportXls(request, paramsCollectManifestEO, ParamsCollectManifestEO.class, "参数项收集清单");
}
/**
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsConfigDataEOController.java
+3 -2
View File
@@ -131,7 +131,8 @@ public class ParamsConfigDataEOController extends JeroController<ParamsConfigDat
/**
* 通过id查询
*
* @param id
* @param paramsConfigId
* @param paramsCollectManifestId
* @return
*/
@AutoLog(value = "参数配置数据-通过id查询")
@@ -139,7 +140,7 @@ public class ParamsConfigDataEOController extends JeroController<ParamsConfigDat
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name="paramsConfigId",required=true) String paramsConfigId,
@RequestParam(name="paramsCollectManifestId",required=true) String paramsCollectManifestId) {
ParamsConfigDataEO paramsConfigDataEO = paramsConfigDataEOService.queryById(paramsConfigId, paramsCollectManifestId);
ParamsConfigDataEO paramsConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId);
if(paramsConfigDataEO==null) {
return Result.error("未找到对应数据");
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java
+5
View File
@@ -13,6 +13,7 @@ import com.jero.modules.cert.template.entity.ParamsTemplateEO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -55,6 +56,10 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
@RequestParam(name="cut") String cut,
HttpServletRequest req) {
if (StringUtils.isNotEmpty(paramsManifestEO.getTitle())) {
paramsManifestEO.setTitle(paramsManifestEO.getTitle().replace("%","\\%"));
}
IPage page = new Page(pageNo, pageSize);
IPage pageList = paramsManifestEOService.pageInfo(page, paramsManifestEO);
return Result.OK(cut, pageList);
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestStateEnum.java
+1 -2
View File
@@ -1,14 +1,13 @@
package com.jero.modules.cert.collect.enums;
import com.jero.common.constant.enums.CutEnum;
import com.jero.modules.cert.template.enums.ControlTypeEnum;
import java.util.HashMap;
import java.util.Map;
/**
* @Author: liyawei
* @Description:
* @Description: 参数收集清单-状态
* @Date: Created in 15:17 2022/5/7
*/
public enum CollectManifestStateEnum {
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/ConfigDataTypeEnum.java
+1 -1
View File
@@ -2,7 +2,7 @@ package com.jero.modules.cert.collect.enums;
/**
* @Author: liyawei
* @Description:
* @Description: 参数收集清单-配置数据单个类型
* @Date: Created in 11:33 2022/5/7
*/
public enum ConfigDataTypeEnum {
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/ManifestStateEnum.java
+1 -1
View File
@@ -2,7 +2,7 @@ package com.jero.modules.cert.collect.enums;
/**
* @Author: liyawei
* @Description:
* @Description: 参数清单-状态
* @Date: Created in 16:19 2022/5/5
*/
public enum ManifestStateEnum {
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigDataEOMapper.java
+2 -1
View File
@@ -12,5 +12,6 @@ import org.apache.ibatis.annotations.Param;
*/
public interface ParamsConfigDataEOMapper extends BaseMapper<ParamsConfigDataEO> {
int deleteByParamsConfigIds(@Param("paramsConfigIds") String paramsConfigIds);
int deleteByConfigIdsAndCollectManifestIds(@Param("paramsConfigIds") String paramsConfigIds,
@Param("paramsCollectManifestIds") String paramsCollectManifestIds);
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml
+1
View File
@@ -58,6 +58,7 @@
select *
from params_collect_manifest
<include refid="BaseQuerySql"/>
order by create_time asc
</select>
</mapper>
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigDataEOMapper.xml
+7 -3
View File
@@ -15,11 +15,15 @@
<result column="params_collect_manifest_id" property="paramsCollectManifestId" />
</resultMap>
<delete id="deleteByParamsConfigIds" parameterType="java.lang.String">
<delete id="deleteByConfigIdsAndCollectManifestIds" parameterType="java.lang.String">
delete from params_config_data
where params_config_id in
<foreach collection="paramsConfigIds.split(',')" index="index" separator="," open="(" close=")" item="item">
#{item}
<foreach collection="paramsConfigIds.split(',')" index="index" separator="," open="(" close=")" item="paramsConfigId">
#{paramsConfigId}
</foreach>
and params_collect_manifest_id in
<foreach collection="paramsCollectManifestIds.split(',')" index="index" separator="," open="(" close=")" item="paramsCollectManifestId">
#{paramsCollectManifestId}
</foreach>
</delete>
</mapper>
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java
+22 -5
View File
@@ -1,12 +1,15 @@
package com.jero.modules.cert.collect.service;
import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
import com.jero.modules.cert.collect.vo.ParamsCollectManifestVO;
import com.jero.modules.cert.template.entity.ParamsInfoPublishEO;
import java.util.List;
import java.util.Map;
/**
* @Description: 参数收集清单
* @Description: 参数项收集清单
* @Author: jero-boot
* @Date: 2022-05-05
* @Version: V1.0
@@ -16,10 +19,10 @@ public interface IParamsCollectManifestEOService extends IService<ParamsCollectM
/**
* 保存
*
* @param paramsCollectManifestEO
* @param paramsCollectManifestVO
* @return
*/
void add(ParamsCollectManifestEO paramsCollectManifestEO);
boolean add(ParamsCollectManifestVO paramsCollectManifestVO);
/**
* 更新
@@ -43,7 +46,7 @@ public interface IParamsCollectManifestEOService extends IService<ParamsCollectM
* @param ids
* @return
*/
void deleteByIds(List<String> ids);
boolean deleteByIds(List<String> ids);
/**
* 通过id查询
@@ -69,4 +72,18 @@ public interface IParamsCollectManifestEOService extends IService<ParamsCollectM
* @return
*/
List<Map<String, Object>> getHeader(String paramsManifestId, String flag, String cut);
/**
* 提交
* @param configDataList
* @return
*/
boolean submit(List<Map<String, Object>> configDataList);
/**
* 查询清单所用模版参数项列表（过滤清单已添加的参数项）
* @param paramsCollectManifestVO
* @return
*/
List<ParamsInfoPublishEO> getParamsInfoPublishListForAdd(ParamsCollectManifestVO paramsCollectManifestVO);
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataEOService.java
+4 -1
View File
@@ -44,6 +44,9 @@ public interface IParamsConfigDataEOService extends IService<ParamsConfigDataEO>
*/
void deleteByIds(List<String> ids);
int deleteByParamsCollectManifestIdList(List<String> paramsCollectManifestIdList);
/**
* 通过id查询
*
@@ -51,7 +54,7 @@ public interface IParamsConfigDataEOService extends IService<ParamsConfigDataEO>
* @param paramsCollectManifestId
* @return
*/
ParamsConfigDataEO queryById(String paramsConfigId, String paramsCollectManifestId);
ParamsConfigDataEO queryByConfigIdAndCollectManifestId(String paramsConfigId, String paramsCollectManifestId);
/**
* 列表查询
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+171 -10
View File
@@ -2,6 +2,7 @@ package com.jero.modules.cert.collect.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.constant.enums.CutEnum;
import com.jero.common.constant.enums.YesOrNoEnum;
@@ -16,26 +17,39 @@ import com.jero.modules.cert.collect.mapper.ParamsCollectManifestEOMapper;
import com.jero.modules.cert.collect.service.IParamsCollectManifestEOService;
import com.jero.modules.cert.collect.service.IParamsConfigDataEOService;
import com.jero.modules.cert.collect.service.IParamsConfigEOService;
import com.jero.modules.cert.collect.vo.ParamsCollectManifestVO;
import com.jero.modules.cert.collect.vo.ParamsConfigDataVO;
import com.jero.modules.cert.template.entity.ParamsInfoPublishEO;
import com.jero.modules.cert.template.enums.ControlTypeEnum;
import com.jero.modules.cert.template.service.IParamsInfoPublishEOService;
import com.jero.modules.ocr.util.LineHumpUtil;
import com.jero.modules.oss.entity.OSSFile;
import com.jero.modules.oss.service.IOSSFileService;
import com.jero.modules.project.entity.ProjectRelatedPersonnel;
import com.jero.modules.project.service.IProjectRelatedPersonnelService;
import com.jero.modules.system.entity.SysDictItem;
import com.jero.modules.system.entity.SysUser;
import com.jero.modules.system.service.ISysDictItemService;
import com.jero.modules.system.service.ISysUserService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import java.lang.reflect.Field;
import java.util.*;
import java.util.stream.Collectors;
/**
* @Description: 参数收集清单
* @Description: 参数项收集清单
* @Author: jero-boot
* @Date: 2022-05-05
* @Version: V1.0
*/
@Service
@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollectManifestEOMapper, ParamsCollectManifestEO> implements IParamsCollectManifestEOService {
@Autowired
@@ -53,18 +67,53 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
@Autowired
private ISysDictItemService sysDictItemService;
@Autowired
private IOSSFileService ossFileService;
@Autowired
private IParamsInfoPublishEOService paramsInfoPublishEOService;
@Autowired
private IProjectRelatedPersonnelService projectRelatedPersonnelService;
@Autowired
private ISysUserService sysUserService;
/**
* 保存
*
* @param paramsCollectManifestEO
* @param paramsCollectManifestVO
* @return
*/
@Override
public void add(ParamsCollectManifestEO paramsCollectManifestEO) {
Date now = new Date();
paramsCollectManifestEO.setCreateTime(now);
paramsCollectManifestEO.setUpdateTime(now);
save(paramsCollectManifestEO);
public boolean add(ParamsCollectManifestVO paramsCollectManifestVO) {
String paramsManifestId = paramsCollectManifestVO.getParamsManifestId();
String projectId = paramsCollectManifestVO.getProjectId();
List<ParamsInfoPublishEO> paramsInfoPublishEOList = paramsCollectManifestVO.getParamsInfoPublishEOList();
// 复制参数项
List<ParamsCollectManifestEO> paramsCollectManifestEOList = new ArrayList<>();
for (ParamsInfoPublishEO source : paramsInfoPublishEOList) {
ParamsCollectManifestEO target = new ParamsCollectManifestEO();
BeanUtils.copyProperties(source, target);
target.setId(UUID.randomUUID().toString().replace("-",""));
target.setParamsManifestId(paramsManifestId);
target.setState(CollectManifestStateEnum.WAIT_COLLECT.getValue());
// 根据负责领域处理工程接口人（零个，一个，多个）： 领域中仅有一个人时，添加该字段
ProjectRelatedPersonnel projectRelatedPersonnel = projectRelatedPersonnelService.queryByProjectIdAndDutyTerritory(projectId, source.getDutyTerritory());
if (ObjectUtil.isNotEmpty(projectRelatedPersonnel)) {
String sdtId = projectRelatedPersonnel.getEngineeringInterfacePerson();
if (org.apache.commons.lang.StringUtils.isNotBlank(sdtId) && !sdtId.contains(",")) { // 领域中仅有一个人时，添加该字段
SysUser sysUser = sysUserService.getById(sdtId);
if (ObjectUtil.isNotEmpty(sysUser)) {
target.setSdt(sysUser.getUsername());
}
}
}
paramsCollectManifestEOList.add(target);
}
return saveBatch(paramsCollectManifestEOList);
}
/**
@@ -98,8 +147,10 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
* @return
*/
@Override
public void deleteByIds(List<String> ids) {
removeByIds(ids);
public boolean deleteByIds(List<String> ids) {
// 关联删除配置数据
paramsConfigDataEOService.deleteByParamsCollectManifestIdList(ids);
return removeByIds(ids);
}
/**
@@ -186,7 +237,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
paramsConfigEOList.forEach(paramsConfigEO -> { // 参数配置
Map<String, Object> configMap = new HashMap<>();
String paramsConfigId = paramsConfigEO.getId();
ParamsConfigDataEO paramsConfigDataEO = paramsConfigDataEOService.queryById(paramsConfigId, paramsCollectManifestId); // 参数配置数据
ParamsConfigDataEO paramsConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据
List<ParamsConfigDataVO> paramsConfigDataVOList = getConfigDataVOList(controlType, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据
configMap.put("controlType", controlType);
configMap.put("list", paramsConfigDataVOList);
@@ -214,6 +265,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
ParamsConfigDataVO configDataVO = new ParamsConfigDataVO();
configDataVO.setType(ConfigDataTypeEnum.TEXT.getValue());
configDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
configDataVO.setControlValue(paramsCollectManifestEO.getControlVerify());
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getTextData())) {
configDataVO.setDataValue(paramsConfigDataEO.getTextData());
@@ -224,6 +276,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
ParamsConfigDataVO configDataVO = new ParamsConfigDataVO();
configDataVO.setType(ConfigDataTypeEnum.PULL.getValue());
configDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
configDataVO.setControlValue(paramsCollectManifestEO.getControlValues());
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getPullData())) {
configDataVO.setDataValue(paramsConfigDataEO.getPullData());
@@ -234,6 +287,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
ParamsConfigDataVO configDataVO = new ParamsConfigDataVO();
configDataVO.setType(ConfigDataTypeEnum.PULL_MORE.getValue());
configDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
configDataVO.setControlValue(paramsCollectManifestEO.getControlValues());
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getPullData())) {
configDataVO.setDataValue(paramsConfigDataEO.getPullData());
@@ -244,6 +298,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
ParamsConfigDataVO configDataVO = new ParamsConfigDataVO();
configDataVO.setType(ConfigDataTypeEnum.FILE.getValue());
configDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getFileConnectId())) {
configDataVO.setDataValue(paramsConfigDataEO.getFileConnectId());
}
@@ -253,6 +308,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
ParamsConfigDataVO textConfigDataVO = new ParamsConfigDataVO();
textConfigDataVO.setType(ConfigDataTypeEnum.TEXT.getValue());
textConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
textConfigDataVO.setControlValue(paramsCollectManifestEO.getControlVerify());
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getTextData())) {
textConfigDataVO.setDataValue(paramsConfigDataEO.getTextData());
@@ -261,6 +317,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
ParamsConfigDataVO pullConfigDataVO = new ParamsConfigDataVO();
pullConfigDataVO.setType(ConfigDataTypeEnum.PULL.getValue());
pullConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
pullConfigDataVO.setControlValue(paramsCollectManifestEO.getControlValues());
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getPullData())) {
pullConfigDataVO.setDataValue(paramsConfigDataEO.getPullData());
@@ -271,6 +328,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
ParamsConfigDataVO textConfigDataVO = new ParamsConfigDataVO();
textConfigDataVO.setType(ConfigDataTypeEnum.TEXT.getValue());
textConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
textConfigDataVO.setControlValue(paramsCollectManifestEO.getControlVerify());
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getTextData())) {
textConfigDataVO.setDataValue(paramsConfigDataEO.getTextData());
@@ -279,6 +337,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
ParamsConfigDataVO pullMoreConfigDataVO = new ParamsConfigDataVO();
pullMoreConfigDataVO.setType(ConfigDataTypeEnum.PULL_MORE.getValue());
pullMoreConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
pullMoreConfigDataVO.setControlValue(paramsCollectManifestEO.getControlValues());
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getPullData())) {
pullMoreConfigDataVO.setDataValue(paramsConfigDataEO.getPullData());
@@ -289,6 +348,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
ParamsConfigDataVO textConfigDataVO = new ParamsConfigDataVO();
textConfigDataVO.setType(ConfigDataTypeEnum.TEXT.getValue());
textConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
textConfigDataVO.setControlValue(paramsCollectManifestEO.getControlVerify());
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getTextData())) {
textConfigDataVO.setDataValue(paramsConfigDataEO.getTextData());
@@ -297,6 +357,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
ParamsConfigDataVO fileConfigDataVO = new ParamsConfigDataVO();
fileConfigDataVO.setType(ConfigDataTypeEnum.FILE.getValue());
fileConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getFileConnectId())) {
fileConfigDataVO.setDataValue(paramsConfigDataEO.getFileConnectId());
}
@@ -306,6 +367,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
ParamsConfigDataVO pullConfigDataVO = new ParamsConfigDataVO();
pullConfigDataVO.setType(ConfigDataTypeEnum.PULL.getValue());
pullConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
pullConfigDataVO.setControlValue(paramsCollectManifestEO.getControlValues());
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getPullData())) {
pullConfigDataVO.setDataValue(paramsConfigDataEO.getPullData());
@@ -314,6 +376,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
ParamsConfigDataVO fileConfigDataVO = new ParamsConfigDataVO();
fileConfigDataVO.setType(ConfigDataTypeEnum.FILE.getValue());
fileConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getFileConnectId())) {
fileConfigDataVO.setDataValue(paramsConfigDataEO.getFileConnectId());
}
@@ -323,6 +386,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
ParamsConfigDataVO pullMoreConfigDataVO = new ParamsConfigDataVO();
pullMoreConfigDataVO.setType(ConfigDataTypeEnum.PULL_MORE.getValue());
pullMoreConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
pullMoreConfigDataVO.setControlValue(paramsCollectManifestEO.getControlValues());
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getPullData())) {
pullMoreConfigDataVO.setDataValue(paramsConfigDataEO.getPullData());
@@ -331,6 +395,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
ParamsConfigDataVO fileConfigDataVO = new ParamsConfigDataVO();
fileConfigDataVO.setType(ConfigDataTypeEnum.FILE.getValue());
fileConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getFileConnectId())) {
fileConfigDataVO.setDataValue(paramsConfigDataEO.getFileConnectId());
}
@@ -340,6 +405,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
ParamsConfigDataVO textConfigDataVO = new ParamsConfigDataVO();
textConfigDataVO.setType(ConfigDataTypeEnum.TEXT.getValue());
textConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
textConfigDataVO.setControlValue(paramsCollectManifestEO.getControlVerify());
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getTextData())) {
textConfigDataVO.setDataValue(paramsConfigDataEO.getTextData());
@@ -348,6 +414,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
ParamsConfigDataVO pullConfigDataVO = new ParamsConfigDataVO();
pullConfigDataVO.setType(ConfigDataTypeEnum.PULL.getValue());
pullConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
pullConfigDataVO.setControlValue(paramsCollectManifestEO.getControlValues());
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getPullData())) {
pullConfigDataVO.setDataValue(paramsConfigDataEO.getPullData());
@@ -356,6 +423,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
ParamsConfigDataVO fileConfigDataVO = new ParamsConfigDataVO();
fileConfigDataVO.setType(ConfigDataTypeEnum.FILE.getValue());
fileConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getFileConnectId())) {
fileConfigDataVO.setDataValue(paramsConfigDataEO.getFileConnectId());
}
@@ -396,6 +464,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
if ("description".equals(dbFieldName)) {
indexOfDescription = i;
}
if ("sdt".equals(dbFieldName)) {
map.put("click", true);
}
map.put("db_field_name", LineHumpUtil.lineToHump(dbFieldName));
if(CutEnum.CN.getValue().equals(cut)){
map.put("db_field_txt", onlCgformField.getDbFieldTxt());//字段中文名
@@ -409,6 +480,96 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
return list;
}
@Override
public boolean submit(List<Map<String, Object>> configDataList) {
List<ParamsConfigDataEO> newConfigDataEOList = new ArrayList<>();
// 处理数据
for (Map<String, Object> map : configDataList) {
String paramsCollectManifestId = (String) map.get("paramsCollectManifestId");
ParamsConfigDataEO paramsConfigDataEO = new ParamsConfigDataEO();
for (Map.Entry<String, Object> entry : map.entrySet()) {
if ("paramsCollectManifestId".equals(entry.getKey())) {
continue;
}
// 取值
String paramsConfigEOId = entry.getKey();
Map<String, Object> paramsConfigDataMap = (Map<String, Object>) entry.getValue();
List<ParamsConfigDataVO> paramsConfigDataVOList = (List<ParamsConfigDataVO>) paramsConfigDataMap.get("list");
// 判断是新增还是修改
ParamsConfigDataEO oldConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigEOId, paramsCollectManifestId);
if (ObjectUtil.isNotEmpty(oldConfigDataEO)) {
paramsConfigDataEO.setId(oldConfigDataEO.getId());
}
paramsConfigDataEO.setParamsCollectManifestId(paramsCollectManifestId);
paramsConfigDataEO.setParamsConfigId(paramsConfigEOId);
paramsConfigDataVOList.forEach(paramsConfigDataVO -> {
if (paramsConfigDataVO.getType().equals(ConfigDataTypeEnum.TEXT.getValue())) {
paramsConfigDataEO.setTextData(paramsConfigDataVO.getDataValue());
} else if (paramsConfigDataVO.getType().equals(ConfigDataTypeEnum.PULL.getValue())
|| paramsConfigDataVO.getType().equals(ConfigDataTypeEnum.PULL_MORE.getValue())) {
paramsConfigDataEO.setPullData(paramsConfigDataVO.getDataValue());
} else if (paramsConfigDataVO.getType().equals(ConfigDataTypeEnum.TEXT.getValue())) {
String dataValue = paramsConfigDataVO.getDataValue();
if (StringUtils.isNotEmpty(dataValue) && dataValue.contains(",")) {
// 处理文件connectId
String[] fileIdList = dataValue.split(",");
String connectId = UUID.randomUUID().toString().replace("-", "");
List<OSSFile> updateFileList = new ArrayList<>();
for (int i = 0; i < fileIdList.length; i++) {
OSSFile ossFile = new OSSFile();
ossFile.setId(fileIdList[i]);
ossFile.setConnectId(connectId);
updateFileList.add(ossFile);
}
ossFileService.updateBatchById(updateFileList);
dataValue = connectId;
}
paramsConfigDataEO.setFileConnectId(dataValue);
}
});
}
newConfigDataEOList.add(paramsConfigDataEO);
}
// 批量更新
return paramsConfigDataEOService.saveOrUpdateBatch(newConfigDataEOList);
}
/**
* 查询清单所用模版参数项列表（过滤清单已添加的参数项）
* @param paramsCollectManifestVO
* @return
*/
@Override
public List<ParamsInfoPublishEO> getParamsInfoPublishListForAdd(ParamsCollectManifestVO paramsCollectManifestVO) {
LambdaQueryWrapper<ParamsInfoPublishEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ParamsInfoPublishEO::getParamsTemplateId, paramsCollectManifestVO.getParamsTemplateId())
.eq(ParamsInfoPublishEO::getVersion, paramsCollectManifestVO.getParamsTemplatePublishVersion())
.like(StringUtils.isNotEmpty(paramsCollectManifestVO.getNioNumber()), ParamsInfoPublishEO::getNioNumber, paramsCollectManifestVO.getNioNumber())
.like(StringUtils.isNotEmpty(paramsCollectManifestVO.getParamsName()), ParamsInfoPublishEO::getParamsName, paramsCollectManifestVO.getParamsName())
.eq(StringUtils.isNotEmpty(paramsCollectManifestVO.getDutyTerritory()), ParamsInfoPublishEO::getDutyTerritory, paramsCollectManifestVO.getDutyTerritory())
.orderByDesc(ParamsInfoPublishEO::getCreateTime);
List<ParamsInfoPublishEO> paramsInfoPublishEOList = paramsInfoPublishEOService.list(queryWrapper);
// 过滤清单已添加的参数项
ParamsCollectManifestEO paramsCollectManifestEO = new ParamsCollectManifestEO();
paramsCollectManifestEO.setParamsManifestId(paramsCollectManifestVO.getParamsManifestId());
List<ParamsCollectManifestEO> paramsCollectManifestEOList = paramsCollectManifestEOMapper.listInfo(paramsCollectManifestEO);
List<String> nioNumberList = paramsCollectManifestEOList.stream().map(ParamsCollectManifestEO::getNioNumber).collect(Collectors.toList());
paramsInfoPublishEOList = paramsInfoPublishEOList.stream().filter(e-> !nioNumberList.contains(e.getNioNumber())).collect(Collectors.toList());
return paramsInfoPublishEOList;
}
/**
* 实体对象转成Map
* @param obj 实体对象
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataEOServiceImpl.java
+15 -1
View File
@@ -5,7 +5,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.modules.cert.collect.entity.ParamsConfigDataEO;
import com.jero.modules.cert.collect.mapper.ParamsConfigDataEOMapper;
import com.jero.modules.cert.collect.service.IParamsConfigDataEOService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
import java.util.List;
@@ -17,8 +20,12 @@ import java.util.List;
* @Version: V1.0
*/
@Service
@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
public class ParamsConfigDataEOServiceImpl extends ServiceImpl<ParamsConfigDataEOMapper, ParamsConfigDataEO> implements IParamsConfigDataEOService {
@Autowired
private ParamsConfigDataEOMapper paramsConfigDataEOMapper;
/**
* 保存
*
@@ -68,6 +75,13 @@ public class ParamsConfigDataEOServiceImpl extends ServiceImpl<ParamsConfigDataE
removeByIds(ids);
}
@Override
public int deleteByParamsCollectManifestIdList(List<String> paramsCollectManifestIdList) {
LambdaQueryWrapper<ParamsConfigDataEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(ParamsConfigDataEO::getParamsCollectManifestId, paramsCollectManifestIdList);
return paramsConfigDataEOMapper.delete(queryWrapper);
}
/**
* 通过id查询
*
@@ -76,7 +90,7 @@ public class ParamsConfigDataEOServiceImpl extends ServiceImpl<ParamsConfigDataE
* @return
*/
@Override
public ParamsConfigDataEO queryById(String paramsConfigId, String paramsCollectManifestId) {
public ParamsConfigDataEO queryByConfigIdAndCollectManifestId(String paramsConfigId, String paramsCollectManifestId) {
LambdaQueryWrapper<ParamsConfigDataEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ParamsConfigDataEO::getParamsConfigId, paramsConfigId);
queryWrapper.eq(ParamsConfigDataEO::getParamsCollectManifestId, paramsCollectManifestId);
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigEOServiceImpl.java
+22 -5
View File
@@ -4,20 +4,25 @@ import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.system.vo.LoginUser;
import com.jero.modules.cert.collect.vo.ParamsConfigVO;
import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
import com.jero.modules.cert.collect.entity.ParamsConfigEO;
import com.jero.modules.cert.collect.mapper.ParamsCollectManifestEOMapper;
import com.jero.modules.cert.collect.mapper.ParamsConfigDataEOMapper;
import com.jero.modules.cert.collect.mapper.ParamsConfigEOMapper;
import com.jero.modules.cert.collect.service.IParamsConfigEOService;
import com.jero.modules.cert.collect.vo.ParamsConfigVO;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
/**
* @Description: 参数配置
@@ -26,12 +31,15 @@ import java.util.List;
* @Version: V1.0
*/
@Service
@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
public class ParamsConfigEOServiceImpl extends ServiceImpl<ParamsConfigEOMapper, ParamsConfigEO> implements IParamsConfigEOService {
@Autowired
private ParamsConfigEOMapper paramsConfigEOMapper;
@Autowired
private ParamsConfigDataEOMapper paramsConfigDataEOMapper;
@Autowired
private ParamsCollectManifestEOMapper paramsCollectManifestEOMapper;
/**
* 保存
@@ -63,15 +71,22 @@ public class ParamsConfigEOServiceImpl extends ServiceImpl<ParamsConfigEOMapper,
if (StringUtils.isNotBlank(deleteConfigIds)) {
List<String> deleteConfigIdList = Arrays.asList(deleteConfigIds.split(","));
paramsConfigEOMapper.deleteBatchIds(deleteConfigIdList);
// 级联删除配置数据
paramsConfigDataEOMapper.deleteByParamsConfigIds(deleteConfigIds);
// TODO 级联删除配置数据
ParamsCollectManifestEO paramsCollectManifestEO = new ParamsCollectManifestEO();
paramsCollectManifestEO.setParamsManifestId(paramsManifestId);
List<ParamsCollectManifestEO> paramsCollectManifestEOList = paramsCollectManifestEOMapper.listInfo(paramsCollectManifestEO);
if (CollectionUtil.isNotEmpty(paramsCollectManifestEOList)) {
String paramsCollectManifestIds = paramsCollectManifestEOList.stream()
.map(ParamsCollectManifestEO::getId).collect(Collectors.joining(","));
paramsConfigDataEOMapper.deleteByConfigIdsAndCollectManifestIds(deleteConfigIds, paramsCollectManifestIds);
}
}
// 新增的配置
if (CollectionUtil.isNotEmpty(addConfigList)) {
addConfigList.forEach(paramsConfigEO -> {
paramsConfigEO.setParamsManifestId(paramsManifestId);
});
saveBatch(addConfigList);
// saveBatch(addConfigList);
}
// 修改的配置
if (CollectionUtil.isNotEmpty(updateConfigList)) {
@@ -81,7 +96,9 @@ public class ParamsConfigEOServiceImpl extends ServiceImpl<ParamsConfigEOMapper,
paramsConfigEO.setUpdateBy(sysUser.getUsername());
paramsConfigEO.setUpdateTime(now);
});
paramsConfigEOMapper.updateForeach(updateConfigList);
updateConfigList.addAll(addConfigList);
saveOrUpdateBatch(updateConfigList);
// paramsConfigEOMapper.updateForeach(updateConfigList); 批量修改不行
}
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
+26 -1
View File
@@ -1,5 +1,6 @@
package com.jero.modules.cert.collect.service.impl;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -14,10 +15,16 @@ import com.jero.modules.cert.template.entity.ParamsInfoPublishEO;
import com.jero.modules.cert.template.entity.ParamsTemplateEO;
import com.jero.modules.cert.template.service.IParamsInfoPublishEOService;
import com.jero.modules.cert.template.service.IParamsTemplateEOService;
import com.jero.modules.project.entity.ProjectRelatedPersonnel;
import com.jero.modules.project.service.IProjectRelatedPersonnelService;
import com.jero.modules.system.entity.SysUser;
import com.jero.modules.system.service.ISysUserService;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Date;
@@ -31,6 +38,7 @@ import java.util.UUID;
* @Version: V1.0
*/
@Service
@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMapper, ParamsManifestEO> implements IParamsManifestEOService {
@Autowired
@@ -45,6 +53,12 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
@Autowired
private IParamsInfoPublishEOService paramsInfoPublishEOService;
@Autowired
private IProjectRelatedPersonnelService projectRelatedPersonnelService;
@Autowired
private ISysUserService sysUserService;
/**
* 保存
*
@@ -67,7 +81,18 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
target.setParamsManifestId(paramsManifestId);
target.setState(CollectManifestStateEnum.WAIT_COLLECT.getValue());
// TODO 根据负责领域处理工程接口人：零个，一个，多个
// 根据负责领域处理工程接口人（零个，一个，多个）： 领域中仅有一个人时，添加该字段
ProjectRelatedPersonnel projectRelatedPersonnel = projectRelatedPersonnelService.queryByProjectIdAndDutyTerritory(paramsManifestEO.getProjectId(), source.getDutyTerritory());
if (ObjectUtil.isNotEmpty(projectRelatedPersonnel)) {
String sdtId = projectRelatedPersonnel.getEngineeringInterfacePerson();
if (StringUtils.isNotBlank(sdtId) && !sdtId.contains(",")) { // 领域中仅有一个人时，添加该字段
SysUser sysUser = sysUserService.getById(sdtId);
if (ObjectUtil.isNotEmpty(sysUser)) {
target.setSdt(sysUser.getUsername());
}
}
}
paramsCollectManifestEOList.add(target);
}
paramsCollectManifestEOService.saveBatch(paramsCollectManifestEOList);
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsCollectManifestVO.java
+24
View File
@@ -0,0 +1,24 @@
package com.jero.modules.cert.collect.vo;
import com.jero.modules.cert.template.entity.ParamsInfoPublishEO;
import lombok.Data;
import java.util.List;
/**
* @Author: liyawei
* @Description:
* @Date: Created in 17:01 2022/5/9
*/
@Data
public class ParamsCollectManifestVO {
private String paramsTemplateId;
private String paramsTemplatePublishVersion;
private String nioNumber;
private String paramsName;
private String dutyTerritory;
private String paramsManifestId;
private String projectId;
private List<ParamsInfoPublishEO> paramsInfoPublishEOList;
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsConfigDataVO.java
+1
View File
@@ -10,6 +10,7 @@ import lombok.Data;
@Data
public class ParamsConfigDataVO {
private String type; // 类型：文本，单选，多选，附件
private String isMust; // 是否必填 1-必填 0-非必填
private String controlValue; // 控件备选值，控件校验
private String dataValue; // 配置具体数据
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java
+16
View File
@@ -64,6 +64,14 @@ public class ParamsInfoEOController extends JeroController<ParamsInfoEO, IParams
@RequestParam(name="orderBy", required = false) String orderBy,
@RequestParam(name="cut") String cut,
HttpServletRequest req) {
if (StringUtils.isNotEmpty(paramsInfoEO.getNioNumber())) {
paramsInfoEO.setNioNumber(paramsInfoEO.getNioNumber().replace("%","\\%"));
}
if (StringUtils.isNotEmpty(paramsInfoEO.getParamsName())) {
paramsInfoEO.setParamsName(paramsInfoEO.getParamsName().replace("%","\\%"));
}
LambdaQueryWrapper<ParamsInfoEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ParamsInfoEO::getParamsTemplateId, paramsInfoEO.getParamsTemplateId())
.like(StringUtils.isNotEmpty(paramsInfoEO.getNioNumber()), ParamsInfoEO::getNioNumber, paramsInfoEO.getNioNumber())
@@ -211,6 +219,14 @@ public class ParamsInfoEOController extends JeroController<ParamsInfoEO, IParams
return Result.OK("发布版本：" + publishVersion + "成功!");
}
/**
* 模板下载
* @param cut
* @param templateName
* @param response
* @param request
* @throws Exception
*/
@AutoLog(value = "参数项基本信息表-模板下载")
@ApiOperation(value = "参数项基本信息表-模板下载", notes="参数项基本信息表-模板下载")
@GetMapping(value = "/exportTemplate")
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoEOMapper.xml
+2 -2
View File
@@ -141,7 +141,7 @@
select
<include refid="BaseColumnList"/>
from params_info pi
left join cert_category_params_info ccpi on pi.nio_number = ccpi.nio_number
left join cert_category_params_info ccpi on (pi.nio_number = ccpi.nio_number and pi.params_template_id = ccpi.params_template_id)
) tmp_tb
<include refid="BaseQuerySql"/>
</select>
@@ -151,7 +151,7 @@
select
<include refid="BaseColumnList"/>
from params_info pi
left join cert_category_params_info ccpi on pi.nio_number = ccpi.nio_number
left join cert_category_params_info ccpi on (pi.nio_number = ccpi.nio_number and pi.params_template_id = ccpi.params_template_id)
) tmp_tb
<include refid="BaseQuerySql"/>
</select>
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java
+19
View File
@@ -839,6 +839,25 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
BeanUtils.copyProperties(ccImportDto, target);
certCategoryParamsInfoEOS.add(target);
}
// 已存在的nio编号 进行覆盖 TODO 待测试
ParamsInfoVO paramsInfoVO = new ParamsInfoVO();
paramsInfoVO.setParamsTemplateId(paramsTemplateId);
List<ParamsInfoEO> oldParamsInfoEOList = paramsInfoEOMapper.selectListWithCert(paramsInfoVO);
List<String> importNioNumber = paramsInfoEOS.stream().map(ParamsInfoEO::getNioNumber).distinct().collect(Collectors.toList());
//找出需要覆盖的参数项和认证类别参数项
List<ParamsInfoEO> delParamsInfoEOList = oldParamsInfoEOList.stream().filter(e->importNioNumber.contains(e.getNioNumber())).collect(Collectors.toList());
List<CertCategoryParamsInfoEO> delCertCategoryParamsInfoEOList = new ArrayList<>();
delParamsInfoEOList.forEach(delParamsInfoEO -> {
delCertCategoryParamsInfoEOList.addAll(delParamsInfoEO.getCertCategoryParamsInfoEOList());
});
// 删除原数据 参数项和认证类别参数项
List<String> delParamsInfoEOIdList = delParamsInfoEOList.stream().map(ParamsInfoEO::getId).collect(Collectors.toList());
List<String> delCertCategoryParamsInfoEOIdList = delCertCategoryParamsInfoEOList.stream().map(CertCategoryParamsInfoEO::getId).collect(Collectors.toList());
deleteByIds(delParamsInfoEOIdList);
certCategoryParamsInfoEOService.deleteByIds(delCertCategoryParamsInfoEOIdList);
// 批量新增认证参数项
certCategoryParamsInfoEOService.saveBatch(certCategoryParamsInfoEOS);
// 批量新增参数项
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java
+3
View File
@@ -82,4 +82,7 @@ public interface IProjectRelatedPersonnelService extends IService<ProjectRelated
List<ProjectRelatedPersonnel> oppositeDisposeData(List<ProjectRelatedPersonnel> records,String projectId,String cut);
ProjectRelatedPersonnel queryByProjectIdAndDutyTerritory(String projectId, String dutyTerritory);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
+9 -1
View File
@@ -1,6 +1,6 @@
package com.jero.modules.project.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.api.vo.Result;
@@ -667,6 +667,14 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
return records;
}
@Override
public ProjectRelatedPersonnel queryByProjectIdAndDutyTerritory(String projectId, String dutyTerritory) {
LambdaQueryWrapper<ProjectRelatedPersonnel> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ProjectRelatedPersonnel::getProjectId, projectId);
queryWrapper.eq(ProjectRelatedPersonnel::getDutyTerritory, dutyTerritory);
return getOne(queryWrapper);
}
//导入时,把传入的数据,拼到原来数据后面
private void updateDataById(ProjectRelatedPersonnel projectRelatedPersonnel) {
List<ProjectRelatedPersonnel> records = projectRelatedPersonnelMapper.queryById(projectRelatedPersonnel.getId());