From f292de72a7fe639a1133a4c5ab356e2e6f31fc38 Mon Sep 17 00:00:00 2001 From: liyawei Date: Thu, 30 Jun 2022 15:34:49 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0=E9=A1=B9?= =?UTF-8?q?=E6=94=B6=E9=9B=86-=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/IParamsConfigDataEOService.java | 7 +++++++ .../IParamsConfigDataHistoryEOService.java | 10 ++++++++++ .../ParamsCollectManifestEOServiceImpl.java | 13 ++++++++++++- ...msCollectManifestHistoryEOServiceImpl.java | 18 +++++++++++++++--- .../impl/ParamsConfigDataEOServiceImpl.java | 16 ++++++++++++++++ .../ParamsConfigDataHistoryEOServiceImpl.java | 19 +++++++++++++++++++ .../impl/ParamsConfigEOServiceImpl.java | 6 ++++-- 7 files changed, 83 insertions(+), 6 deletions(-) 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 5bd56aa89..ed9ffbd67 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 @@ -62,4 +62,11 @@ public interface IParamsConfigDataEOService extends IService * @return */ List queryList(); + + /** + * 查询清单的所有配置数据 + * @param configIdList + * @return + */ + List queryListByConfigIdList(List configIdList); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataHistoryEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataHistoryEOService.java index 84ff430f9..d7f6f1f41 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataHistoryEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataHistoryEOService.java @@ -1,8 +1,11 @@ package com.jero.modules.cert.collect.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.cert.collect.entity.ParamsConfigDataEO; import com.jero.modules.cert.collect.entity.ParamsConfigDataHistoryEO; +import java.util.List; + /** * @Description: 参数配置数据历史版本 * @Author: jero-boot @@ -19,4 +22,11 @@ public interface IParamsConfigDataHistoryEOService extends IService queryListByConfigIdList(List configIdList); } 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 11947cd09..56bbc2800 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 @@ -217,6 +217,14 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl paramsConfigDataEOList) { + List configDataEOList = paramsConfigDataEOList.stream().filter(e-> configId.equals(e.getParamsConfigId()) && collectManifestId.equals(e.getParamsCollectManifestId())).collect(Collectors.toList()); + if (CollectionUtil.isNotEmpty(configDataEOList)) { + return configDataEOList.get(0); + } + return null; + } + /** * 列表查询 * @@ -255,6 +263,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl list = paramsCollectManifestEOMapper.listInfo(paramsCollectManifestEO); // 查询固定列 List paramsConfigEOList = paramsConfigEOService.queryList(paramsManifestId); // 查询配置列 + List paramsConfigIdList = paramsConfigEOList.stream().map(ParamsConfigEO::getId).collect(Collectors.toList()); + List paramsConfigDataEOList = paramsConfigDataEOService.queryListByConfigIdList(paramsConfigIdList); // 查询所有配置数据 // 普通数据字典 List dictItemList = new ArrayList<>(); @@ -318,7 +328,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl { // 参数配置 Map configMap = new HashMap<>(); String paramsConfigId = paramsConfigEO.getId(); - ParamsConfigDataEO paramsConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据 +// ParamsConfigDataEO paramsConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据 + ParamsConfigDataEO paramsConfigDataEO = getConfigDataEOByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId, paramsConfigDataEOList); // 参数配置数据 List paramsConfigDataVOList = getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据 configMap.put("controlType", controlType); configMap.put("list", paramsConfigDataVOList); diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java index 3a31c4d3e..70c6b7e9a 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java @@ -58,6 +58,14 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl paramsConfigDataEOList) { + List configDataEOList = paramsConfigDataEOList.stream().filter(e-> configId.equals(e.getParamsConfigId()) && collectManifestId.equals(e.getParamsCollectManifestId())).collect(Collectors.toList()); + if (CollectionUtil.isNotEmpty(configDataEOList)) { + return configDataEOList.get(0); + } + return null; + } + /** * 列表查询 * @@ -69,6 +77,9 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl list = paramsCollectManifestHistoryEOMapper.listInfo(paramsCollectManifestEO); // 查询固定列 List paramsConfigEOList = paramsConfigHistoryEOService.queryList(paramsManifestId); // 查询配置列 + List paramsConfigIdList = paramsConfigEOList.stream().map(ParamsConfigEO::getId).collect(Collectors.toList()); + List paramsConfigDataEOList = paramsConfigDataHistoryEOService.queryListByConfigIdList(paramsConfigIdList); // 查询所有配置数据 + // 普通数据字典 List dictItemList = new ArrayList<>(); @@ -132,8 +143,9 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl { // 参数配置 Map configMap = new HashMap<>(); String paramsConfigId = paramsConfigEO.getId(); - ParamsConfigDataEO paramsConfigDataEO = paramsConfigDataHistoryEOService.queryByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据 - List paramsConfigDataVOList = getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据 +// ParamsConfigDataEO paramsConfigDataEO = paramsConfigDataHistoryEOService.queryByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据 + ParamsConfigDataHistoryEO paramsConfigDataHistoryEO = getConfigDataEOByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId, paramsConfigDataEOList); // 参数配置数据 + List paramsConfigDataVOList = getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataHistoryEO, collectManifestEO); // 重新组合配置数据 configMap.put("controlType", controlType); configMap.put("list", paramsConfigDataVOList); manifestMap.put(paramsConfigEO.getId(), configMap); @@ -166,7 +178,7 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl getConfigDataVOList(String controlType, ParamsConfigEO paramsConfigEO, ParamsConfigDataEO paramsConfigDataEO, ParamsCollectManifestHistoryEO paramsCollectManifestEO) { + private List getConfigDataVOList(String controlType, ParamsConfigEO paramsConfigEO, ParamsConfigDataHistoryEO paramsConfigDataEO, ParamsCollectManifestHistoryEO paramsCollectManifestEO) { List paramsConfigDataVOList = new ArrayList<>(); String templateId = null; String templateName = null; 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 9e10c9da8..a25a7e355 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 @@ -1,5 +1,6 @@ package com.jero.modules.cert.collect.service.impl; +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.modules.cert.collect.entity.ParamsConfigDataEO; @@ -107,4 +108,19 @@ public class ParamsConfigDataEOServiceImpl extends ServiceImpl queryList() { return list(); } + + /** + * 查询清单的所有配置数据 + * @param configIdList + * @return + */ + @Override + public List queryListByConfigIdList(List configIdList) { + if (CollectionUtil.isNotEmpty(configIdList)) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(ParamsConfigDataEO::getParamsConfigId, configIdList); + return list(queryWrapper); + } + return null; + } } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataHistoryEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataHistoryEOServiceImpl.java index 0a58d103f..08ac676f1 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataHistoryEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataHistoryEOServiceImpl.java @@ -1,12 +1,16 @@ package com.jero.modules.cert.collect.service.impl; +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.modules.cert.collect.entity.ParamsConfigDataEO; import com.jero.modules.cert.collect.entity.ParamsConfigDataHistoryEO; import com.jero.modules.cert.collect.mapper.ParamsConfigDataHistoryEOMapper; import com.jero.modules.cert.collect.service.IParamsConfigDataHistoryEOService; import org.springframework.stereotype.Service; +import java.util.List; + /** * @Description: 参数配置数据历史版本 * @Author: jero-boot @@ -31,4 +35,19 @@ public class ParamsConfigDataHistoryEOServiceImpl extends ServiceImpl queryListByConfigIdList(List configIdList) { + if (CollectionUtil.isNotEmpty(configIdList)) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(ParamsConfigDataHistoryEO::getParamsConfigId, configIdList); + return list(queryWrapper); + } + return null; + } } 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 810363d77..c1410f477 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 @@ -107,9 +107,11 @@ public class ParamsConfigEOServiceImpl extends ServiceImpl updateList = paramsCollectManifestEOList.stream() + .filter(e-> !CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(e.getState())).collect(Collectors.toList()); + if (CollectionUtil.isNotEmpty(updateList)) { List updateCollectManifestEOList = new ArrayList<>(); - paramsCollectManifestEOList.forEach(collectManifestEO -> { + updateList.forEach(collectManifestEO -> { ParamsCollectManifestEO updateCollectManifestEO = new ParamsCollectManifestEO(); updateCollectManifestEO.setId(collectManifestEO.getId()); updateCollectManifestEO.setState(CollectManifestStateEnum.WAIT_COLLECT.getValue());