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

参数清单收集-控件校验改造

Browse Source
This commit is contained in:
wangzhijiang
2023-02-01 18:22:13 +08:00
parent 7e606d48f5
commit b583789649
5 changed files with 273 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/db/蔚来标准sql/dev_2nd_period.sql
+4
View File
@@ -163,3 +163,7 @@ UPDATE `laws_weilai`.`onl_cgform_field` SET `is_show_list` = 0 WHERE `id` = '152
-- 参数配置数据表，增加排序号字段sql 2023-1-31 未同步生产环境 -- 参数配置数据表，增加排序号字段sql 2023-1-31 未同步生产环境
ALTER TABLE `laws_weilai`.`params_config_data` ALTER TABLE `laws_weilai`.`params_config_data`
ADD COLUMN `order_num` int(10) NULL COMMENT '排序号' AFTER `params_collect_manifest_id`; 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`;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataEOService.java
+9
View File
@@ -56,6 +56,15 @@ public interface IParamsConfigDataEOService extends IService<ParamsConfigDataEO>
*/ */
ParamsConfigDataEO queryByConfigIdAndCollectManifestId(String paramsConfigId, String paramsCollectManifestId); ParamsConfigDataEO queryByConfigIdAndCollectManifestId(String paramsConfigId, String paramsCollectManifestId);
/**
* 通过id查询
*
* @param paramsConfigId
* @param paramsCollectManifestId
* @return
*/
List<ParamsConfigDataEO> queryListByConfigIdAndCollectManifestId(String paramsConfigId, String paramsCollectManifestId);
/** /**
* 列表查询 * 列表查询
* *
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+226 -157
View File
@@ -1250,7 +1250,6 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
// 添加配置数据 // 添加配置数据
for (Map.Entry<String, Object> entry : map.entrySet()) { for (Map.Entry<String, Object> entry : map.entrySet()) {
ParamsConfigDataEO paramsConfigDataEO = new ParamsConfigDataEO();
if ("id".equals(entry.getKey())) { if ("id".equals(entry.getKey())) {
continue; continue;
} }
@@ -1259,100 +1258,122 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
String paramsConfigEOId = entry.getKey(); String paramsConfigEOId = entry.getKey();
Map<String, Object> paramsConfigDataMap = (Map<String, Object>) entry.getValue(); Map<String, Object> paramsConfigDataMap = (Map<String, Object>) entry.getValue();
// 无法转ParamsConfigDataVO（遍历会出现该异常 ： LinkedHashMap cannot be cast to ParamsConfigDataVO） // 无法转ParamsConfigDataVO（遍历会出现该异常 ： LinkedHashMap cannot be cast to ParamsConfigDataVO）
List<Map<String, Object>> paramsConfigDataVOList = (List<Map<String, Object>>) paramsConfigDataMap.get("list"); // List<Map<String, Object>> paramsConfigDataVOList = (List<Map<String, Object>>) paramsConfigDataMap.get("list");
Map<String, Object> paramsConfigDataVOMap = (Map<String, Object>) paramsConfigDataMap.get("paramsConfigData");
// 判断是新增还是修改 // 判断是新增还是修改
ParamsConfigDataEO oldConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigEOId, paramsCollectManifestId); // ParamsConfigDataEO oldConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigEOId, paramsCollectManifestId);
if (ObjectUtil.isNotEmpty(oldConfigDataEO)) { List<ParamsConfigDataEO> oldConfigDataEOList = this.paramsConfigDataEOService.queryListByConfigIdAndCollectManifestId(paramsConfigEOId, paramsCollectManifestId);
paramsConfigDataEO.setId(oldConfigDataEO.getId());
}
paramsConfigDataEO.setParamsCollectManifestId(paramsCollectManifestId);
paramsConfigDataEO.setParamsConfigId(paramsConfigEOId);
ParamsConfigEO paramsConfigEO = this.paramsConfigEOService.queryById(paramsConfigEOId); ParamsConfigEO paramsConfigEO = this.paramsConfigEOService.queryById(paramsConfigEOId);
if(Objects.isNull(paramsConfigEO)){ if(Objects.isNull(paramsConfigEO)){
continue; continue;
} }
if (CollectionUtil.isNotEmpty(paramsConfigDataVOList)) {
boolean appendFlag = false; // 拼接标识
for (Map<String, Object> 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<String, Object> paramsConfigDataVO : paramsConfigDataVOList) {
String type = (String) paramsConfigDataVO.get("type");
String dataValue = (String) paramsConfigDataVO.get("dataValue");
if (type.equals(ConfigDataTypeEnum.TEXT.getValue())) { // 拼接历史记录信息
paramsConfigDataEO.setTextData(dataValue); for (Map.Entry<String, Object> configDataMap : paramsConfigDataVOMap.entrySet()) {
if (StringUtils.isNotEmpty(dataValue)) { List<Map<String, Object>> paramsConfigDataVOList = (List<Map<String, Object>>)configDataMap.getValue();
logCnContentSb.append("\"").append(dataValue).append("\"");
logEnContentSb.append("\"").append(dataValue).append("\"");
}
} else if (type.equals(ConfigDataTypeEnum.PULL.getValue()) if (CollectionUtil.isNotEmpty(paramsConfigDataVOList)) {
|| 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())) { ParamsConfigDataEO paramsConfigDataEO = new ParamsConfigDataEO();
if (StringUtils.isNotEmpty(dataValue) && dataValue.contains(",")) { // 新加多个文件 if(CollectionUtils.isNotEmpty(oldConfigDataEOList)){
// 处理文件connectId List<ParamsConfigDataEO> oldConfigDataEOs = oldConfigDataEOList.stream().filter(configData -> {
String[] fileIdList = dataValue.split(","); boolean flag = false;
String connectId = UUID.randomUUID().toString().replace("-", ""); if (StringUtils.equals(configDataMap.getKey(), configData.getId())) {
List<OSSFile> updateFileList = new ArrayList<>(); flag = true;
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); return flag;
dataValue = connectId; }).collect(Collectors.toList());
} else if (StringUtils.isNotEmpty(dataValue) && !dataValue.contains(",")) {
List<OSSFile> ossFiles = ossFileService.getFileInfosByConnectId(dataValue); if(CollectionUtils.isNotEmpty(oldConfigDataEOs)){
if(CollectionUtil.isEmpty(ossFiles)){ // 新加了一个文件 paramsConfigDataEO.setId(oldConfigDataEOs.get(0).getId());
}
}
paramsConfigDataEO.setParamsCollectManifestId(paramsCollectManifestId);
paramsConfigDataEO.setParamsConfigId(paramsConfigEOId);
boolean appendFlag = false; // 拼接标识
for (Map<String, Object> 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<String, Object> 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("-", ""); String connectId = UUID.randomUUID().toString().replace("-", "");
//修改文件表关联信息connect_id List<OSSFile> updateFileList = new ArrayList<>();
List<OSSFile> oSSFileList = new ArrayList<>(); for (int i = 0; i < fileIdList.length; i++) {
for (String fileId : dataValue.split(",")) {
OSSFile ossFile = new OSSFile(); OSSFile ossFile = new OSSFile();
ossFile.setId(fileId); ossFile.setId(fileIdList[i]);
ossFile.setConnectId(connectId); ossFile.setConnectId(connectId);
oSSFileList.add(ossFile); updateFileList.add(ossFile);
} }
ossFileService.updateFileInfo(oSSFileList); ossFileService.updateBatchById(updateFileList);
dataValue = connectId; dataValue = connectId;
} else if (StringUtils.isNotEmpty(dataValue) && !dataValue.contains(",")) {
List<OSSFile> ossFiles = ossFileService.getFileInfosByConnectId(dataValue);
if(CollectionUtil.isEmpty(ossFiles)){ // 新加了一个文件
String connectId = UUID.randomUUID().toString().replace("-", "");
//修改文件表关联信息connect_id
List<OSSFile> 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<OSSFile> 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); newConfigDataEOList.add(paramsConfigDataEO);
List<OSSFile> 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("\"");
}
} }
}
if(appendFlag){ if(appendFlag){
logCnContentSb.append("，"); logCnContentSb.append("，");
logEnContentSb.append(" and "); logEnContentSb.append(" and ");
}
} }
} }
newConfigDataEOList.add(paramsConfigDataEO);
} }
ParamsCollectManifestLogEO paramsCollectManifestLogEO = new ParamsCollectManifestLogEO(); ParamsCollectManifestLogEO paramsCollectManifestLogEO = new ParamsCollectManifestLogEO();
@@ -1818,35 +1839,37 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
// 添加配置数据 // 添加配置数据
int paramsConfigLenth = 1; int paramsConfigLenth = 1;
for (ParamsConfigEO configEO : paramsConfigEOList) { for (ParamsConfigEO configEO : paramsConfigEOList) {
ParamsConfigDataEO configDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(configEO.getId(), paramsCollectManifestEO.getId()); // ParamsConfigDataEO configDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(configEO.getId(), paramsCollectManifestEO.getId());
List<ParamsConfigDataEO> 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())){ if(StringUtils.isNotEmpty(configDataEO.getPullData())){
logCnContentSb.append(configEO.getConfigName()); logCnContentSb.append("\"" +configDataEO.getPullData()+ "\"");
logCnContentSb.append(" 的"); logEnContentSb.append("\"" +configDataEO.getPullData()+ "\"");
}
if(StringUtils.isNotEmpty(configDataEO.getPullData())){ if(StringUtils.isNotEmpty(configDataEO.getTextData())){
logCnContentSb.append("\"" +configDataEO.getPullData()+ "\""); logCnContentSb.append("\"" +configDataEO.getTextData()+ "\"");
logEnContentSb.append("\"" +configDataEO.getPullData()+ "\""); logEnContentSb.append("\"" +configDataEO.getTextData()+ "\"");
} }
if(StringUtils.isNotEmpty(configDataEO.getTextData())){ if(StringUtils.isNotEmpty(configDataEO.getFileConnectId())){
logCnContentSb.append("\"" +configDataEO.getTextData()+ "\""); List<OSSFile> fileInfos = ossFileService.getFileInfos(configDataEO.getFileConnectId());
logEnContentSb.append("\"" +configDataEO.getTextData()+ "\""); String fileNames = fileInfos.stream().map(OSSFile::getFileName).distinct().collect(Collectors.joining(","));
} if (StringUtils.isNotEmpty(fileNames)) {
if(StringUtils.isNotEmpty(configDataEO.getFileConnectId())){ logCnContentSb.append("\"" +fileNames+ "\"");
List<OSSFile> fileInfos = ossFileService.getFileInfos(configDataEO.getFileConnectId()); logEnContentSb.append("\"" +fileNames+ "\"");
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()){ if(paramsConfigEOList.size() > 1 && paramsConfigLenth != paramsConfigEOList.size()){
logCnContentSb.append("，"); logCnContentSb.append("，");
logEnContentSb.append(" and "); logEnContentSb.append(" and ");
}
} }
} }
@@ -2754,45 +2777,89 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
List<ParamsConfigDataEO> updateConfigDataEOList = new ArrayList<>(); List<ParamsConfigDataEO> updateConfigDataEOList = new ArrayList<>();
List<ParamsConfigDataEO> addConfigDataEOList = new ArrayList<>(); List<ParamsConfigDataEO> addConfigDataEOList = new ArrayList<>();
for (int i=0; i<paramsCollectManifestIdStr.length; i++) { for (int i=0; i<paramsCollectManifestIdStr.length; i++) {
ParamsConfigDataEO sourceConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(sourceConfigId, paramsCollectManifestIdStr[i]); // ParamsConfigDataEO sourceConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(sourceConfigId, paramsCollectManifestIdStr[i]);
if (ObjectUtil.isNotEmpty(sourceConfigDataEO)) { List<ParamsConfigDataEO> sourceConfigDataEOList = this.paramsConfigDataEOService.queryListByConfigIdAndCollectManifestId(sourceConfigId, paramsCollectManifestIdStr[i]);
for (int j = 0; j < targetConfigIdStr.length; j++) { if(CollectionUtils.isNotEmpty(sourceConfigDataEOList)){
ParamsConfigDataEO targetConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(targetConfigIdStr[j], paramsCollectManifestIdStr[i]); for (ParamsConfigDataEO sourceConfigDataEO : sourceConfigDataEOList) {
if (ObjectUtil.isNotEmpty(targetConfigDataEO)) { if (ObjectUtil.isNotEmpty(sourceConfigDataEO)) {
ParamsConfigDataEO updateConfigDataEO = new ParamsConfigDataEO(); for (int j = 0; j < targetConfigIdStr.length; j++) {
updateConfigDataEO.setId(targetConfigDataEO.getId()); // 根据配置id、参数清单id，将被引用参数列的数据删掉，重新加
updateConfigDataEO.setTextData(sourceConfigDataEO.getTextData()); QueryWrapper<ParamsConfigDataEO> targetConfigDataRemoveWrap = new QueryWrapper<>();
updateConfigDataEO.setPullData(sourceConfigDataEO.getPullData()); targetConfigDataRemoveWrap.lambda().eq(ParamsConfigDataEO::getParamsConfigId,targetConfigIdStr[j]);
updateConfigDataEO.setFileConnectId(sourceConfigDataEO.getFileConnectId()); targetConfigDataRemoveWrap.lambda().eq(ParamsConfigDataEO::getParamsCollectManifestId,paramsCollectManifestIdStr[i]);
updateConfigDataEOList.add(updateConfigDataEO); this.paramsConfigDataEOService.remove(targetConfigDataRemoveWrap);
} else {
ParamsConfigDataEO addConfigDataEO = new ParamsConfigDataEO(); ParamsConfigDataEO targetConfigDataEO = new ParamsConfigDataEO();
addConfigDataEO.setParamsConfigId(targetConfigIdStr[j]); BeanUtils.copyProperties(sourceConfigDataEO,targetConfigDataEO);
addConfigDataEO.setParamsCollectManifestId(paramsCollectManifestIdStr[i]); targetConfigDataEO.setId(null);
addConfigDataEO.setTextData(sourceConfigDataEO.getTextData()); targetConfigDataEO.setParamsConfigId(targetConfigIdStr[j]);
addConfigDataEO.setPullData(sourceConfigDataEO.getPullData()); targetConfigDataEO.setParamsCollectManifestId(paramsCollectManifestIdStr[i]);
addConfigDataEO.setFileConnectId(sourceConfigDataEO.getFileConnectId()); addConfigDataEOList.add(targetConfigDataEO);
addConfigDataEOList.add(addConfigDataEO);
/* ParamsConfigDataEO targetConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(targetConfigIdStr[j], paramsCollectManifestIdStr[i]);
List<ParamsConfigDataEO> 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 { } else {
// 清空引用到的配置的数据 // 清空引用到的配置的数据
for (int j = 0; j < targetConfigIdStr.length; j++) { for (int j = 0; j < targetConfigIdStr.length; j++) {
ParamsConfigDataEO targetConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(targetConfigIdStr[j], paramsCollectManifestIdStr[i]); // ParamsConfigDataEO targetConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(targetConfigIdStr[j], paramsCollectManifestIdStr[i]);
if (ObjectUtil.isNotEmpty(targetConfigDataEO)) { List<ParamsConfigDataEO> targetConfigDataEOList = this.paramsConfigDataEOService.queryListByConfigIdAndCollectManifestId(targetConfigIdStr[j], paramsCollectManifestIdStr[i]);
ParamsConfigDataEO updateConfigDataEO = new ParamsConfigDataEO(); if(CollectionUtils.isNotEmpty(targetConfigDataEOList)){
updateConfigDataEO.setId(targetConfigDataEO.getId()); for (ParamsConfigDataEO targetConfigDataEO : targetConfigDataEOList) {
updateConfigDataEO.setTextData(null); if (ObjectUtil.isNotEmpty(targetConfigDataEO)) {
updateConfigDataEO.setPullData(null); ParamsConfigDataEO updateConfigDataEO = new ParamsConfigDataEO();
updateConfigDataEO.setFileConnectId(null); updateConfigDataEO.setId(targetConfigDataEO.getId());
updateConfigDataEOList.add(updateConfigDataEO); updateConfigDataEO.setTextData(null);
updateConfigDataEO.setPullData(null);
updateConfigDataEO.setFileConnectId(null);
updateConfigDataEOList.add(updateConfigDataEO);
}
}
} }
} }
} }
} }
paramsConfigDataEOService.saveBatch(addConfigDataEOList); paramsConfigDataEOService.saveBatch(addConfigDataEOList);
paramsConfigDataEOService.updateBatchById(updateConfigDataEOList); // paramsConfigDataEOService.updateBatchById(updateConfigDataEOList);
return true; return true;
} }
@@ -2865,42 +2932,44 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
// 添加配置数据 // 添加配置数据
int paramsConfigLenth = 1; int paramsConfigLenth = 1;
for (ParamsConfigEO configEO : paramsConfigEOList) { for (ParamsConfigEO configEO : paramsConfigEOList) {
ParamsConfigDataEO configDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(configEO.getId(), collectManifestEO.getId()); // ParamsConfigDataEO configDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(configEO.getId(), collectManifestEO.getId());
List<ParamsConfigDataEO> 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(); if(StringUtils.isNotEmpty(configDataEO.getPullData()) || StringUtils.isNotEmpty(configDataEO.getTextData()) || StringUtils.isNotEmpty(configDataEO.getFileConnectId())){
BeanUtils.copyProperties(configDataEO, addReportConfigDataEO); logCnContentSb.append(configEO.getConfigName());
addReportConfigDataEO.setId(UUID.randomUUID().toString().replace("-","")); logCnContentSb.append(" 的");
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())){ if(StringUtils.isNotEmpty(configDataEO.getPullData())){
logCnContentSb.append(configEO.getConfigName()); logCnContentSb.append("\"" +configDataEO.getPullData()+ "\"");
logCnContentSb.append(" 的"); logEnContentSb.append("\"" +configDataEO.getPullData()+ "\"");
}
if(StringUtils.isNotEmpty(configDataEO.getPullData())){ if(StringUtils.isNotEmpty(configDataEO.getTextData())){
logCnContentSb.append("\"" +configDataEO.getPullData()+ "\""); logCnContentSb.append("\"" +configDataEO.getTextData()+ "\"");
logEnContentSb.append("\"" +configDataEO.getPullData()+ "\""); logEnContentSb.append("\"" +configDataEO.getTextData()+ "\"");
} }
if(StringUtils.isNotEmpty(configDataEO.getTextData())){ if(StringUtils.isNotEmpty(configDataEO.getFileConnectId())){
logCnContentSb.append("\"" +configDataEO.getTextData()+ "\""); List<OSSFile> fileInfos = ossFileService.getFileInfos(configDataEO.getFileConnectId());
logEnContentSb.append("\"" +configDataEO.getTextData()+ "\""); String fileNames = fileInfos.stream().map(OSSFile::getFileName).distinct().collect(Collectors.joining(","));
} if (StringUtils.isNotEmpty(fileNames)) {
if(StringUtils.isNotEmpty(configDataEO.getFileConnectId())){ logCnContentSb.append("\"" +fileNames+ "\"");
List<OSSFile> fileInfos = ossFileService.getFileInfos(configDataEO.getFileConnectId()); logEnContentSb.append("\"" +fileNames+ "\"");
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()){ if(paramsConfigEOList.size() > 1 && paramsConfigLenth != paramsConfigEOList.size()){
logCnContentSb.append("，"); logCnContentSb.append("，");
logEnContentSb.append(" and "); logEnContentSb.append(" and ");
}
} }
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataEOServiceImpl.java
+15
View File
@@ -99,6 +99,21 @@ public class ParamsConfigDataEOServiceImpl extends ServiceImpl<ParamsConfigDataE
return getOne(queryWrapper); return getOne(queryWrapper);
} }
/**
* 通过id查询
*
* @param paramsConfigId
* @param paramsCollectManifestId
* @return
*/
@Override
public List<ParamsConfigDataEO> queryListByConfigIdAndCollectManifestId(String paramsConfigId, String paramsCollectManifestId) {
LambdaQueryWrapper<ParamsConfigDataEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ParamsConfigDataEO::getParamsConfigId, paramsConfigId);
queryWrapper.eq(ParamsConfigDataEO::getParamsCollectManifestId, paramsCollectManifestId);
return this.list(queryWrapper);
}
/** /**
* 列表查询 * 列表查询
* *
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
+19 -14
View File
@@ -43,6 +43,7 @@ import com.jero.modules.system.enums.DicCodeEnum;
import com.jero.modules.system.mapper.SysDictMapper; import com.jero.modules.system.mapper.SysDictMapper;
import com.jero.modules.system.service.ISysDictService; import com.jero.modules.system.service.ISysDictService;
import com.jero.modules.system.service.ISysUserService; import com.jero.modules.system.service.ISysUserService;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -700,23 +701,27 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
// 配置数据： nio编号，控件类型，控件备选值，控件校验 均一致时 将清单参数项项复制到模板参数项，否则不复制 // 配置数据： nio编号，控件类型，控件备选值，控件校验 均一致时 将清单参数项项复制到模板参数项，否则不复制
for (ParamsConfigEO configEO : paramsConfigEOList) { for (ParamsConfigEO configEO : paramsConfigEOList) {
ParamsConfigDataEO configDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(configEO.getId(), collectManifestEO.getId()); // ParamsConfigDataEO configDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(configEO.getId(), collectManifestEO.getId());
ParamsConfigDataEO addConfigDataEO = new ParamsConfigDataEO(); List<ParamsConfigDataEO> configDataEOList = this.paramsConfigDataEOService.queryListByConfigIdAndCollectManifestId(configEO.getId(), collectManifestEO.getId());
if (ObjectUtil.isNotEmpty(configDataEO)) { if(CollectionUtils.isNotEmpty(configDataEOList)){
BeanUtils.copyProperties(configDataEO, addConfigDataEO); for (ParamsConfigDataEO configDataEO : configDataEOList) {
ParamsConfigDataEO addConfigDataEO = new ParamsConfigDataEO();
if (ObjectUtil.isNotEmpty(configDataEO)) {
BeanUtils.copyProperties(configDataEO, addConfigDataEO);
addConfigDataEO.setId(null); addConfigDataEO.setId(null);
addConfigDataEO.setCreateBy(null); addConfigDataEO.setCreateBy(null);
addConfigDataEO.setCreateTime(null); addConfigDataEO.setCreateTime(null);
addConfigDataEO.setUpdateBy(null); addConfigDataEO.setUpdateBy(null);
addConfigDataEO.setUpdateTime(null); addConfigDataEO.setUpdateTime(null);
addConfigDataEO.setSysOrgCode(null); addConfigDataEO.setSysOrgCode(null);
addConfigDataEO.setParamsConfigId(configIdMap.get(configEO.getId())); addConfigDataEO.setParamsConfigId(configIdMap.get(configEO.getId()));
addConfigDataEO.setParamsCollectManifestId(addCollectManifestId); addConfigDataEO.setParamsCollectManifestId(addCollectManifestId);
addConfigDataEOList.add(addConfigDataEO); addConfigDataEOList.add(addConfigDataEO);
}
}
} }
} }
} }