diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java index b21553267..42288369f 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java @@ -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>> getHeader(@RequestParam(name = "paramsManifestId") String paramsManifestId, @RequestParam(name = "flag") String flag, @@ -54,55 +57,81 @@ public class ParamsCollectManifestEOController extends JeroController>> 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> 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> 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> 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 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 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 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("未找到对应数据"); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java index 8d5490fcc..cd8ff578e 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java @@ -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 { - int deleteByParamsConfigIds(@Param("paramsConfigIds") String paramsConfigIds); + int deleteByConfigIdsAndCollectManifestIds(@Param("paramsConfigIds") String paramsConfigIds, + @Param("paramsCollectManifestIds") String paramsCollectManifestIds); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml index bfb27e565..40595bc90 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml @@ -58,6 +58,7 @@ select * from params_collect_manifest + order by create_time asc \ No newline at end of file diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigDataEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigDataEOMapper.xml index 250e0b1d5..3a87c588d 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigDataEOMapper.xml +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigDataEOMapper.xml @@ -15,11 +15,15 @@ - + delete from params_config_data where params_config_id in - - #{item} + + #{paramsConfigId} + + and params_collect_manifest_id in + + #{paramsCollectManifestId} \ No newline at end of file diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java index 004dcfe3d..84a5fba90 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java @@ -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 ids); + boolean deleteByIds(List ids); /** * 通过id查询 @@ -69,4 +72,18 @@ public interface IParamsCollectManifestEOService extends IService> getHeader(String paramsManifestId, String flag, String cut); + + /** + * 提交 + * @param configDataList + * @return + */ + boolean submit(List> configDataList); + + /** + * 查询清单所用模版参数项列表（过滤清单已添加的参数项） + * @param paramsCollectManifestVO + * @return + */ + List getParamsInfoPublishListForAdd(ParamsCollectManifestVO paramsCollectManifestVO); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataEOService.java index ef950390c..5bd56aa89 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataEOService.java @@ -44,6 +44,9 @@ public interface IParamsConfigDataEOService extends IService */ void deleteByIds(List ids); + + int deleteByParamsCollectManifestIdList(List paramsCollectManifestIdList); + /** * 通过id查询 * @@ -51,7 +54,7 @@ public interface IParamsConfigDataEOService extends IService * @param paramsCollectManifestId * @return */ - ParamsConfigDataEO queryById(String paramsConfigId, String paramsCollectManifestId); + ParamsConfigDataEO queryByConfigIdAndCollectManifestId(String paramsConfigId, String paramsCollectManifestId); /** * 列表查询 diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 8d2933968..871fe2b5b 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -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 implements IParamsCollectManifestEOService { @Autowired @@ -53,18 +67,53 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl paramsInfoPublishEOList = paramsCollectManifestVO.getParamsInfoPublishEOList(); + // 复制参数项 + List 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 ids) { - removeByIds(ids); + public boolean deleteByIds(List ids) { + // 关联删除配置数据 + paramsConfigDataEOService.deleteByParamsCollectManifestIdList(ids); + return removeByIds(ids); } /** @@ -186,7 +237,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl { // 参数配置 Map configMap = new HashMap<>(); String paramsConfigId = paramsConfigEO.getId(); - ParamsConfigDataEO paramsConfigDataEO = paramsConfigDataEOService.queryById(paramsConfigId, paramsCollectManifestId); // 参数配置数据 + ParamsConfigDataEO paramsConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据 List paramsConfigDataVOList = getConfigDataVOList(controlType, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据 configMap.put("controlType", controlType); configMap.put("list", paramsConfigDataVOList); @@ -214,6 +265,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl> configDataList) { + List newConfigDataEOList = new ArrayList<>(); + + // 处理数据 + for (Map map : configDataList) { + String paramsCollectManifestId = (String) map.get("paramsCollectManifestId"); + ParamsConfigDataEO paramsConfigDataEO = new ParamsConfigDataEO(); + + for (Map.Entry entry : map.entrySet()) { + if ("paramsCollectManifestId".equals(entry.getKey())) { + continue; + } + + // 取值 + String paramsConfigEOId = entry.getKey(); + Map paramsConfigDataMap = (Map) entry.getValue(); + List paramsConfigDataVOList = (List) 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 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 getParamsInfoPublishListForAdd(ParamsCollectManifestVO paramsCollectManifestVO) { + LambdaQueryWrapper 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 paramsInfoPublishEOList = paramsInfoPublishEOService.list(queryWrapper); + + // 过滤清单已添加的参数项 + ParamsCollectManifestEO paramsCollectManifestEO = new ParamsCollectManifestEO(); + paramsCollectManifestEO.setParamsManifestId(paramsCollectManifestVO.getParamsManifestId()); + List paramsCollectManifestEOList = paramsCollectManifestEOMapper.listInfo(paramsCollectManifestEO); + List 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 实体对象 diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataEOServiceImpl.java index 33a861895..9e10c9da8 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataEOServiceImpl.java @@ -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 implements IParamsConfigDataEOService { + @Autowired + private ParamsConfigDataEOMapper paramsConfigDataEOMapper; + /** * 保存 * @@ -68,6 +75,13 @@ public class ParamsConfigDataEOServiceImpl extends ServiceImpl paramsCollectManifestIdList) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(ParamsConfigDataEO::getParamsCollectManifestId, paramsCollectManifestIdList); + return paramsConfigDataEOMapper.delete(queryWrapper); + } + /** * 通过id查询 * @@ -76,7 +90,7 @@ public class ParamsConfigDataEOServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(ParamsConfigDataEO::getParamsConfigId, paramsConfigId); queryWrapper.eq(ParamsConfigDataEO::getParamsCollectManifestId, paramsCollectManifestId); diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigEOServiceImpl.java index 9bbf26128..1964bf891 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigEOServiceImpl.java @@ -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 implements IParamsConfigEOService { @Autowired private ParamsConfigEOMapper paramsConfigEOMapper; @Autowired private ParamsConfigDataEOMapper paramsConfigDataEOMapper; + @Autowired + private ParamsCollectManifestEOMapper paramsCollectManifestEOMapper; /** * 保存 @@ -63,15 +71,22 @@ public class ParamsConfigEOServiceImpl extends ServiceImpl deleteConfigIdList = Arrays.asList(deleteConfigIds.split(",")); paramsConfigEOMapper.deleteBatchIds(deleteConfigIdList); - // 级联删除配置数据 - paramsConfigDataEOMapper.deleteByParamsConfigIds(deleteConfigIds); + // TODO 级联删除配置数据 + ParamsCollectManifestEO paramsCollectManifestEO = new ParamsCollectManifestEO(); + paramsCollectManifestEO.setParamsManifestId(paramsManifestId); + List 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 implements IParamsManifestEOService { @Autowired @@ -45,6 +53,12 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl paramsInfoPublishEOList; +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsConfigDataVO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsConfigDataVO.java index 98979e22c..a2495d85f 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsConfigDataVO.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsConfigDataVO.java @@ -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; // 配置具体数据 } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java index cfffca2e5..95479f608 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java @@ -64,6 +64,14 @@ public class ParamsInfoEOController extends JeroController 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 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 @@ -151,7 +151,7 @@ select 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 diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java index 784f30a38..8bc072b1b 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java @@ -839,6 +839,25 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl oldParamsInfoEOList = paramsInfoEOMapper.selectListWithCert(paramsInfoVO); + + List importNioNumber = paramsInfoEOS.stream().map(ParamsInfoEO::getNioNumber).distinct().collect(Collectors.toList()); + //找出需要覆盖的参数项和认证类别参数项 + List delParamsInfoEOList = oldParamsInfoEOList.stream().filter(e->importNioNumber.contains(e.getNioNumber())).collect(Collectors.toList()); + List delCertCategoryParamsInfoEOList = new ArrayList<>(); + delParamsInfoEOList.forEach(delParamsInfoEO -> { + delCertCategoryParamsInfoEOList.addAll(delParamsInfoEO.getCertCategoryParamsInfoEOList()); + }); + // 删除原数据 参数项和认证类别参数项 + List delParamsInfoEOIdList = delParamsInfoEOList.stream().map(ParamsInfoEO::getId).collect(Collectors.toList()); + List delCertCategoryParamsInfoEOIdList = delCertCategoryParamsInfoEOList.stream().map(CertCategoryParamsInfoEO::getId).collect(Collectors.toList()); + deleteByIds(delParamsInfoEOIdList); + certCategoryParamsInfoEOService.deleteByIds(delCertCategoryParamsInfoEOIdList); + // 批量新增认证参数项 certCategoryParamsInfoEOService.saveBatch(certCategoryParamsInfoEOS); // 批量新增参数项 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java index 5479976c3..3cb185df3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java @@ -82,4 +82,7 @@ public interface IProjectRelatedPersonnelService extends IService oppositeDisposeData(List records,String projectId,String cut); + + ProjectRelatedPersonnel queryByProjectIdAndDutyTerritory(String projectId, String dutyTerritory); + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java index 19aff6a9a..1e896d24a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java @@ -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 queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ProjectRelatedPersonnel::getProjectId, projectId); + queryWrapper.eq(ProjectRelatedPersonnel::getDutyTerritory, dutyTerritory); + return getOne(queryWrapper); + } + //导入时,把传入的数据,拼到原来数据后面 private void updateDataById(ProjectRelatedPersonnel projectRelatedPersonnel) { List records = projectRelatedPersonnelMapper.queryById(projectRelatedPersonnel.getId());