From b583789649db7a080c3b3a5375dd0cb0418a7b5b Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Wed, 1 Feb 2023 18:22:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=B8=85=E5=8D=95=E6=94=B6?= =?UTF-8?q?=E9=9B=86-=E6=8E=A7=E4=BB=B6=E6=A0=A1=E9=AA=8C=E6=94=B9?= =?UTF-8?q?=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_2nd_period.sql | 4 + .../service/IParamsConfigDataEOService.java | 9 + .../ParamsCollectManifestEOServiceImpl.java | 383 +++++++++++------- .../impl/ParamsConfigDataEOServiceImpl.java | 15 + .../impl/ParamsManifestEOServiceImpl.java | 33 +- 5 files changed, 273 insertions(+), 171 deletions(-) diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql index 83fe49ee9..4381f981e 100644 --- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql +++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql @@ -163,3 +163,7 @@ UPDATE `laws_weilai`.`onl_cgform_field` SET `is_show_list` = 0 WHERE `id` = '152 -- 参数配置数据表，增加排序号字段sql 2023-1-31 未同步生产环境 ALTER TABLE `laws_weilai`.`params_config_data` ADD COLUMN `order_num` int(10) NULL COMMENT '排序号' AFTER `params_collect_manifest_id`; + +-- 上报库参数配置数据表，增加排序号字段sql 2023-2-1 未同步生产环境 +ALTER TABLE `laws_weilai`.`params_report_config_data` + ADD COLUMN `order_num` int(10) NULL COMMENT '排序号' AFTER `params_collect_manifest_id`; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataEOService.java index ed9ffbd67..1a5ac490f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataEOService.java @@ -56,6 +56,15 @@ public interface IParamsConfigDataEOService extends IService */ ParamsConfigDataEO queryByConfigIdAndCollectManifestId(String paramsConfigId, String paramsCollectManifestId); + /** + * 通过id查询 + * + * @param paramsConfigId + * @param paramsCollectManifestId + * @return + */ + List queryListByConfigIdAndCollectManifestId(String paramsConfigId, String paramsCollectManifestId); + /** * 列表查询 * diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 7f56bc94c..c6dec5747 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -1250,7 +1250,6 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl entry : map.entrySet()) { - ParamsConfigDataEO paramsConfigDataEO = new ParamsConfigDataEO(); if ("id".equals(entry.getKey())) { continue; } @@ -1259,100 +1258,122 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl paramsConfigDataMap = (Map) entry.getValue(); // 无法转ParamsConfigDataVO（遍历会出现该异常 ： LinkedHashMap cannot be cast to ParamsConfigDataVO） - List> paramsConfigDataVOList = (List>) paramsConfigDataMap.get("list"); +// List> paramsConfigDataVOList = (List>) paramsConfigDataMap.get("list"); + Map paramsConfigDataVOMap = (Map) paramsConfigDataMap.get("paramsConfigData"); // 判断是新增还是修改 - ParamsConfigDataEO oldConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigEOId, paramsCollectManifestId); - if (ObjectUtil.isNotEmpty(oldConfigDataEO)) { - paramsConfigDataEO.setId(oldConfigDataEO.getId()); + // ParamsConfigDataEO oldConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigEOId, paramsCollectManifestId); + List oldConfigDataEOList = this.paramsConfigDataEOService.queryListByConfigIdAndCollectManifestId(paramsConfigEOId, paramsCollectManifestId); - } - paramsConfigDataEO.setParamsCollectManifestId(paramsCollectManifestId); - paramsConfigDataEO.setParamsConfigId(paramsConfigEOId); ParamsConfigEO paramsConfigEO = this.paramsConfigEOService.queryById(paramsConfigEOId); if(Objects.isNull(paramsConfigEO)){ continue; } - if (CollectionUtil.isNotEmpty(paramsConfigDataVOList)) { - boolean appendFlag = false; // 拼接标识 - for (Map paramsConfigDataVO : paramsConfigDataVOList) { - String dataValue = (String) paramsConfigDataVO.get("dataValue"); - // 只要其中有一个值就可以进行拼接 - if(StringUtils.isNotEmpty(dataValue)){ - appendFlag = true; - break; - } - } - if(appendFlag){ - logCnContentSb.append(paramsConfigEO.getConfigName()).append("为"); - logEnContentSb.append(" configuration ").append(paramsConfigEO.getConfigName()).append(" as "); - } - for (Map paramsConfigDataVO : paramsConfigDataVOList) { - String type = (String) paramsConfigDataVO.get("type"); - String dataValue = (String) paramsConfigDataVO.get("dataValue"); - if (type.equals(ConfigDataTypeEnum.TEXT.getValue())) { - paramsConfigDataEO.setTextData(dataValue); - if (StringUtils.isNotEmpty(dataValue)) { - logCnContentSb.append("\"").append(dataValue).append("\""); - logEnContentSb.append("\"").append(dataValue).append("\""); - } + // 拼接历史记录信息 + for (Map.Entry configDataMap : paramsConfigDataVOMap.entrySet()) { + List> paramsConfigDataVOList = (List>)configDataMap.getValue(); - } else if (type.equals(ConfigDataTypeEnum.PULL.getValue()) - || type.equals(ConfigDataTypeEnum.PULL_MORE.getValue())) { - paramsConfigDataEO.setPullData(dataValue); - if (StringUtils.isNotEmpty(dataValue)) { - logCnContentSb.append("\"").append(dataValue).append("\""); - logEnContentSb.append("\"").append(dataValue).append("\""); - } + if (CollectionUtil.isNotEmpty(paramsConfigDataVOList)) { - } else if (type.equals(ConfigDataTypeEnum.FILE.getValue())) { - 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); + ParamsConfigDataEO paramsConfigDataEO = new ParamsConfigDataEO(); + if(CollectionUtils.isNotEmpty(oldConfigDataEOList)){ + List oldConfigDataEOs = oldConfigDataEOList.stream().filter(configData -> { + boolean flag = false; + if (StringUtils.equals(configDataMap.getKey(), configData.getId())) { + flag = true; } - ossFileService.updateBatchById(updateFileList); - dataValue = connectId; - } else if (StringUtils.isNotEmpty(dataValue) && !dataValue.contains(",")) { - List ossFiles = ossFileService.getFileInfosByConnectId(dataValue); - if(CollectionUtil.isEmpty(ossFiles)){ // 新加了一个文件 + return flag; + }).collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(oldConfigDataEOs)){ + paramsConfigDataEO.setId(oldConfigDataEOs.get(0).getId()); + } + } + + paramsConfigDataEO.setParamsCollectManifestId(paramsCollectManifestId); + paramsConfigDataEO.setParamsConfigId(paramsConfigEOId); + + boolean appendFlag = false; // 拼接标识 + for (Map paramsConfigDataVO : paramsConfigDataVOList) { + String dataValue = (String) paramsConfigDataVO.get("dataValue"); + // 只要其中有一个值就可以进行拼接 + if(StringUtils.isNotEmpty(dataValue)){ + appendFlag = true; + break; + } + } + if(appendFlag){ + logCnContentSb.append(paramsConfigEO.getConfigName()).append("为"); + logEnContentSb.append(" configuration ").append(paramsConfigEO.getConfigName()).append(" as "); + } + for (Map paramsConfigDataVO : paramsConfigDataVOList) { + String type = (String) paramsConfigDataVO.get("type"); + String dataValue = (String) paramsConfigDataVO.get("dataValue"); + + if (type.equals(ConfigDataTypeEnum.TEXT.getValue())) { + paramsConfigDataEO.setTextData(dataValue); + if (StringUtils.isNotEmpty(dataValue)) { + logCnContentSb.append("\"").append(dataValue).append("\""); + logEnContentSb.append("\"").append(dataValue).append("\""); + } + + } else if (type.equals(ConfigDataTypeEnum.PULL.getValue()) + || type.equals(ConfigDataTypeEnum.PULL_MORE.getValue())) { + paramsConfigDataEO.setPullData(dataValue); + if (StringUtils.isNotEmpty(dataValue)) { + logCnContentSb.append("\"").append(dataValue).append("\""); + logEnContentSb.append("\"").append(dataValue).append("\""); + } + + } else if (type.equals(ConfigDataTypeEnum.FILE.getValue())) { + if (StringUtils.isNotEmpty(dataValue) && dataValue.contains(",")) { // 新加多个文件 + // 处理文件connectId + String[] fileIdList = dataValue.split(","); String connectId = UUID.randomUUID().toString().replace("-", ""); - //修改文件表关联信息connect_id - List oSSFileList = new ArrayList<>(); - for (String fileId : dataValue.split(",")) { + List updateFileList = new ArrayList<>(); + for (int i = 0; i < fileIdList.length; i++) { OSSFile ossFile = new OSSFile(); - ossFile.setId(fileId); + ossFile.setId(fileIdList[i]); ossFile.setConnectId(connectId); - oSSFileList.add(ossFile); + updateFileList.add(ossFile); } - ossFileService.updateFileInfo(oSSFileList); + ossFileService.updateBatchById(updateFileList); dataValue = connectId; + } else if (StringUtils.isNotEmpty(dataValue) && !dataValue.contains(",")) { + List ossFiles = ossFileService.getFileInfosByConnectId(dataValue); + if(CollectionUtil.isEmpty(ossFiles)){ // 新加了一个文件 + String connectId = UUID.randomUUID().toString().replace("-", ""); + //修改文件表关联信息connect_id + List oSSFileList = new ArrayList<>(); + for (String fileId : dataValue.split(",")) { + OSSFile ossFile = new OSSFile(); + ossFile.setId(fileId); + ossFile.setConnectId(connectId); + oSSFileList.add(ossFile); + } + ossFileService.updateFileInfo(oSSFileList); + dataValue = connectId; + } + } + paramsConfigDataEO.setFileConnectId(dataValue); + + List fileInfos = ossFileService.getFileInfos(dataValue); + String fileNames = fileInfos.stream().map(OSSFile::getFileName).distinct().collect(Collectors.joining(",")); + if (StringUtils.isNotEmpty(fileNames)) { + logCnContentSb.append("\"").append(fileNames).append("\""); + logEnContentSb.append("\"").append(fileNames).append("\""); } } - paramsConfigDataEO.setFileConnectId(dataValue); - - List fileInfos = ossFileService.getFileInfos(dataValue); - String fileNames = fileInfos.stream().map(OSSFile::getFileName).distinct().collect(Collectors.joining(",")); - if (StringUtils.isNotEmpty(fileNames)) { - logCnContentSb.append("\"").append(fileNames).append("\""); - logEnContentSb.append("\"").append(fileNames).append("\""); - } + newConfigDataEOList.add(paramsConfigDataEO); } - } - if(appendFlag){ - logCnContentSb.append("，"); - logEnContentSb.append(" and "); + if(appendFlag){ + logCnContentSb.append("，"); + logEnContentSb.append(" and "); + } } } - newConfigDataEOList.add(paramsConfigDataEO); } ParamsCollectManifestLogEO paramsCollectManifestLogEO = new ParamsCollectManifestLogEO(); @@ -1818,35 +1839,37 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl configDataEOList = this.paramsConfigDataEOService.queryListByConfigIdAndCollectManifestId(configEO.getId(), paramsCollectManifestEO.getId()); + for (ParamsConfigDataEO configDataEO : configDataEOList) { + if(StringUtils.isNotEmpty(configDataEO.getPullData()) || StringUtils.isNotEmpty(configDataEO.getTextData()) || StringUtils.isNotEmpty(configDataEO.getFileConnectId())){ + logCnContentSb.append(configEO.getConfigName()); + logCnContentSb.append(" 的"); - if(StringUtils.isNotEmpty(configDataEO.getPullData()) || StringUtils.isNotEmpty(configDataEO.getTextData()) || StringUtils.isNotEmpty(configDataEO.getFileConnectId())){ - logCnContentSb.append(configEO.getConfigName()); - logCnContentSb.append(" 的"); - - if(StringUtils.isNotEmpty(configDataEO.getPullData())){ - logCnContentSb.append("\"" +configDataEO.getPullData()+ "\""); - logEnContentSb.append("\"" +configDataEO.getPullData()+ "\""); - } - if(StringUtils.isNotEmpty(configDataEO.getTextData())){ - logCnContentSb.append("\"" +configDataEO.getTextData()+ "\""); - logEnContentSb.append("\"" +configDataEO.getTextData()+ "\""); - } - if(StringUtils.isNotEmpty(configDataEO.getFileConnectId())){ - List fileInfos = ossFileService.getFileInfos(configDataEO.getFileConnectId()); - String fileNames = fileInfos.stream().map(OSSFile::getFileName).distinct().collect(Collectors.joining(",")); - if (StringUtils.isNotEmpty(fileNames)) { - logCnContentSb.append("\"" +fileNames+ "\""); - logEnContentSb.append("\"" +fileNames+ "\""); + if(StringUtils.isNotEmpty(configDataEO.getPullData())){ + logCnContentSb.append("\"" +configDataEO.getPullData()+ "\""); + logEnContentSb.append("\"" +configDataEO.getPullData()+ "\""); + } + if(StringUtils.isNotEmpty(configDataEO.getTextData())){ + logCnContentSb.append("\"" +configDataEO.getTextData()+ "\""); + logEnContentSb.append("\"" +configDataEO.getTextData()+ "\""); + } + if(StringUtils.isNotEmpty(configDataEO.getFileConnectId())){ + List fileInfos = ossFileService.getFileInfos(configDataEO.getFileConnectId()); + String fileNames = fileInfos.stream().map(OSSFile::getFileName).distinct().collect(Collectors.joining(",")); + if (StringUtils.isNotEmpty(fileNames)) { + logCnContentSb.append("\"" +fileNames+ "\""); + logEnContentSb.append("\"" +fileNames+ "\""); + } } - } - logEnContentSb.append(" of configuration " +configEO.getConfigName()+ ""); + logEnContentSb.append(" of configuration " +configEO.getConfigName()+ ""); - // 如果配置有两条或两条以上，并且不是最后一次循环 - if(paramsConfigEOList.size() > 1 && paramsConfigLenth != paramsConfigEOList.size()){ - logCnContentSb.append("，"); - logEnContentSb.append(" and "); + // 如果配置有两条或两条以上，并且不是最后一次循环 + if(paramsConfigEOList.size() > 1 && paramsConfigLenth != paramsConfigEOList.size()){ + logCnContentSb.append("，"); + logEnContentSb.append(" and "); + } } } @@ -2754,45 +2777,89 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl updateConfigDataEOList = new ArrayList<>(); List addConfigDataEOList = new ArrayList<>(); for (int i=0; i sourceConfigDataEOList = this.paramsConfigDataEOService.queryListByConfigIdAndCollectManifestId(sourceConfigId, paramsCollectManifestIdStr[i]); + if(CollectionUtils.isNotEmpty(sourceConfigDataEOList)){ + for (ParamsConfigDataEO sourceConfigDataEO : sourceConfigDataEOList) { + if (ObjectUtil.isNotEmpty(sourceConfigDataEO)) { + for (int j = 0; j < targetConfigIdStr.length; j++) { + // 根据配置id、参数清单id，将被引用参数列的数据删掉，重新加 + QueryWrapper targetConfigDataRemoveWrap = new QueryWrapper<>(); + targetConfigDataRemoveWrap.lambda().eq(ParamsConfigDataEO::getParamsConfigId,targetConfigIdStr[j]); + targetConfigDataRemoveWrap.lambda().eq(ParamsConfigDataEO::getParamsCollectManifestId,paramsCollectManifestIdStr[i]); + this.paramsConfigDataEOService.remove(targetConfigDataRemoveWrap); + + ParamsConfigDataEO targetConfigDataEO = new ParamsConfigDataEO(); + BeanUtils.copyProperties(sourceConfigDataEO,targetConfigDataEO); + targetConfigDataEO.setId(null); + targetConfigDataEO.setParamsConfigId(targetConfigIdStr[j]); + targetConfigDataEO.setParamsCollectManifestId(paramsCollectManifestIdStr[i]); + addConfigDataEOList.add(targetConfigDataEO); + + /* ParamsConfigDataEO targetConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(targetConfigIdStr[j], paramsCollectManifestIdStr[i]); + List targetConfigDataEOList = this.paramsConfigDataEOService.queryListByConfigIdAndCollectManifestId(targetConfigIdStr[j], paramsCollectManifestIdStr[i]); + if(CollectionUtils.isNotEmpty(targetConfigDataEOList)){ + for (ParamsConfigDataEO targetConfigDataEO : targetConfigDataEOList) { + if (ObjectUtil.isNotEmpty(targetConfigDataEO)) { + ParamsConfigDataEO updateConfigDataEO = new ParamsConfigDataEO(); + updateConfigDataEO.setId(targetConfigDataEO.getId()); + updateConfigDataEO.setTextData(sourceConfigDataEO.getTextData()); + updateConfigDataEO.setPullData(sourceConfigDataEO.getPullData()); + updateConfigDataEO.setFileConnectId(sourceConfigDataEO.getFileConnectId()); + updateConfigDataEOList.add(updateConfigDataEO); + } else { + ParamsConfigDataEO addConfigDataEO = new ParamsConfigDataEO(); + addConfigDataEO.setParamsConfigId(targetConfigIdStr[j]); + addConfigDataEO.setParamsCollectManifestId(paramsCollectManifestIdStr[i]); + addConfigDataEO.setTextData(sourceConfigDataEO.getTextData()); + addConfigDataEO.setPullData(sourceConfigDataEO.getPullData()); + addConfigDataEO.setFileConnectId(sourceConfigDataEO.getFileConnectId()); + addConfigDataEOList.add(addConfigDataEO); + } + } + } + if (ObjectUtil.isNotEmpty(targetConfigDataEO)) { + ParamsConfigDataEO updateConfigDataEO = new ParamsConfigDataEO(); + updateConfigDataEO.setId(targetConfigDataEO.getId()); + updateConfigDataEO.setTextData(sourceConfigDataEO.getTextData()); + updateConfigDataEO.setPullData(sourceConfigDataEO.getPullData()); + updateConfigDataEO.setFileConnectId(sourceConfigDataEO.getFileConnectId()); + updateConfigDataEOList.add(updateConfigDataEO); + } else { + ParamsConfigDataEO addConfigDataEO = new ParamsConfigDataEO(); + addConfigDataEO.setParamsConfigId(targetConfigIdStr[j]); + addConfigDataEO.setParamsCollectManifestId(paramsCollectManifestIdStr[i]); + addConfigDataEO.setTextData(sourceConfigDataEO.getTextData()); + addConfigDataEO.setPullData(sourceConfigDataEO.getPullData()); + addConfigDataEO.setFileConnectId(sourceConfigDataEO.getFileConnectId()); + addConfigDataEOList.add(addConfigDataEO); + }*/ + } } } } else { // 清空引用到的配置的数据 for (int j = 0; j < targetConfigIdStr.length; j++) { - ParamsConfigDataEO targetConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(targetConfigIdStr[j], paramsCollectManifestIdStr[i]); - if (ObjectUtil.isNotEmpty(targetConfigDataEO)) { - ParamsConfigDataEO updateConfigDataEO = new ParamsConfigDataEO(); - updateConfigDataEO.setId(targetConfigDataEO.getId()); - updateConfigDataEO.setTextData(null); - updateConfigDataEO.setPullData(null); - updateConfigDataEO.setFileConnectId(null); - updateConfigDataEOList.add(updateConfigDataEO); + // ParamsConfigDataEO targetConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(targetConfigIdStr[j], paramsCollectManifestIdStr[i]); + List targetConfigDataEOList = this.paramsConfigDataEOService.queryListByConfigIdAndCollectManifestId(targetConfigIdStr[j], paramsCollectManifestIdStr[i]); + if(CollectionUtils.isNotEmpty(targetConfigDataEOList)){ + for (ParamsConfigDataEO targetConfigDataEO : targetConfigDataEOList) { + if (ObjectUtil.isNotEmpty(targetConfigDataEO)) { + ParamsConfigDataEO updateConfigDataEO = new ParamsConfigDataEO(); + updateConfigDataEO.setId(targetConfigDataEO.getId()); + updateConfigDataEO.setTextData(null); + updateConfigDataEO.setPullData(null); + updateConfigDataEO.setFileConnectId(null); + updateConfigDataEOList.add(updateConfigDataEO); + } + } } } } } paramsConfigDataEOService.saveBatch(addConfigDataEOList); - paramsConfigDataEOService.updateBatchById(updateConfigDataEOList); +// paramsConfigDataEOService.updateBatchById(updateConfigDataEOList); return true; } @@ -2865,42 +2932,44 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl configDataEOList = this.paramsConfigDataEOService.queryListByConfigIdAndCollectManifestId(configEO.getId(), collectManifestEO.getId()); + for (ParamsConfigDataEO configDataEO : configDataEOList) { + ParamsReportConfigDataEO addReportConfigDataEO = new ParamsReportConfigDataEO(); + BeanUtils.copyProperties(configDataEO, addReportConfigDataEO); + addReportConfigDataEO.setId(UUID.randomUUID().toString().replace("-","")); + addReportConfigDataEO.setParamsConfigId(configIdMap.get(configEO.getId())); + addReportConfigDataEO.setParamsCollectManifestId(reportDetailId); + addReportConfigDataEOList.add(addReportConfigDataEO); - ParamsReportConfigDataEO addReportConfigDataEO = new ParamsReportConfigDataEO(); - BeanUtils.copyProperties(configDataEO, addReportConfigDataEO); - addReportConfigDataEO.setId(UUID.randomUUID().toString().replace("-","")); - addReportConfigDataEO.setParamsConfigId(configIdMap.get(configEO.getId())); - addReportConfigDataEO.setParamsCollectManifestId(reportDetailId); - addReportConfigDataEOList.add(addReportConfigDataEO); + if(StringUtils.isNotEmpty(configDataEO.getPullData()) || StringUtils.isNotEmpty(configDataEO.getTextData()) || StringUtils.isNotEmpty(configDataEO.getFileConnectId())){ + logCnContentSb.append(configEO.getConfigName()); + logCnContentSb.append(" 的"); - if(StringUtils.isNotEmpty(configDataEO.getPullData()) || StringUtils.isNotEmpty(configDataEO.getTextData()) || StringUtils.isNotEmpty(configDataEO.getFileConnectId())){ - logCnContentSb.append(configEO.getConfigName()); - logCnContentSb.append(" 的"); - - if(StringUtils.isNotEmpty(configDataEO.getPullData())){ - logCnContentSb.append("\"" +configDataEO.getPullData()+ "\""); - logEnContentSb.append("\"" +configDataEO.getPullData()+ "\""); - } - if(StringUtils.isNotEmpty(configDataEO.getTextData())){ - logCnContentSb.append("\"" +configDataEO.getTextData()+ "\""); - logEnContentSb.append("\"" +configDataEO.getTextData()+ "\""); - } - if(StringUtils.isNotEmpty(configDataEO.getFileConnectId())){ - List fileInfos = ossFileService.getFileInfos(configDataEO.getFileConnectId()); - String fileNames = fileInfos.stream().map(OSSFile::getFileName).distinct().collect(Collectors.joining(",")); - if (StringUtils.isNotEmpty(fileNames)) { - logCnContentSb.append("\"" +fileNames+ "\""); - logEnContentSb.append("\"" +fileNames+ "\""); + if(StringUtils.isNotEmpty(configDataEO.getPullData())){ + logCnContentSb.append("\"" +configDataEO.getPullData()+ "\""); + logEnContentSb.append("\"" +configDataEO.getPullData()+ "\""); + } + if(StringUtils.isNotEmpty(configDataEO.getTextData())){ + logCnContentSb.append("\"" +configDataEO.getTextData()+ "\""); + logEnContentSb.append("\"" +configDataEO.getTextData()+ "\""); + } + if(StringUtils.isNotEmpty(configDataEO.getFileConnectId())){ + List fileInfos = ossFileService.getFileInfos(configDataEO.getFileConnectId()); + String fileNames = fileInfos.stream().map(OSSFile::getFileName).distinct().collect(Collectors.joining(",")); + if (StringUtils.isNotEmpty(fileNames)) { + logCnContentSb.append("\"" +fileNames+ "\""); + logEnContentSb.append("\"" +fileNames+ "\""); + } } - } - logEnContentSb.append("of configuration " +configEO.getConfigName()+ ""); + logEnContentSb.append("of configuration " +configEO.getConfigName()+ ""); - // 如果配置有两条或两条以上，并且不是最后一次循环 - if(paramsConfigEOList.size() > 1 && paramsConfigLenth != paramsConfigEOList.size()){ - logCnContentSb.append("，"); - logEnContentSb.append(" and "); + // 如果配置有两条或两条以上，并且不是最后一次循环 + if(paramsConfigEOList.size() > 1 && paramsConfigLenth != paramsConfigEOList.size()){ + logCnContentSb.append("，"); + logEnContentSb.append(" and "); + } } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataEOServiceImpl.java index a25a7e355..2766ceeac 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataEOServiceImpl.java @@ -99,6 +99,21 @@ public class ParamsConfigDataEOServiceImpl extends ServiceImpl queryListByConfigIdAndCollectManifestId(String paramsConfigId, String paramsCollectManifestId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ParamsConfigDataEO::getParamsConfigId, paramsConfigId); + queryWrapper.eq(ParamsConfigDataEO::getParamsCollectManifestId, paramsCollectManifestId); + return this.list(queryWrapper); + } + /** * 列表查询 * diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java index 49f65e2d7..f50b53ad1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java @@ -43,6 +43,7 @@ import com.jero.modules.system.enums.DicCodeEnum; import com.jero.modules.system.mapper.SysDictMapper; import com.jero.modules.system.service.ISysDictService; import com.jero.modules.system.service.ISysUserService; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -700,23 +701,27 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl configDataEOList = this.paramsConfigDataEOService.queryListByConfigIdAndCollectManifestId(configEO.getId(), collectManifestEO.getId()); + if(CollectionUtils.isNotEmpty(configDataEOList)){ + for (ParamsConfigDataEO configDataEO : configDataEOList) { + ParamsConfigDataEO addConfigDataEO = new ParamsConfigDataEO(); + if (ObjectUtil.isNotEmpty(configDataEO)) { + BeanUtils.copyProperties(configDataEO, addConfigDataEO); - addConfigDataEO.setId(null); - addConfigDataEO.setCreateBy(null); - addConfigDataEO.setCreateTime(null); - addConfigDataEO.setUpdateBy(null); - addConfigDataEO.setUpdateTime(null); - addConfigDataEO.setSysOrgCode(null); - addConfigDataEO.setParamsConfigId(configIdMap.get(configEO.getId())); - addConfigDataEO.setParamsCollectManifestId(addCollectManifestId); - addConfigDataEOList.add(addConfigDataEO); + addConfigDataEO.setId(null); + addConfigDataEO.setCreateBy(null); + addConfigDataEO.setCreateTime(null); + addConfigDataEO.setUpdateBy(null); + addConfigDataEO.setUpdateTime(null); + addConfigDataEO.setSysOrgCode(null); + addConfigDataEO.setParamsConfigId(configIdMap.get(configEO.getId())); + addConfigDataEO.setParamsCollectManifestId(addCollectManifestId); + addConfigDataEOList.add(addConfigDataEO); + } + } } - } }