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-03-23 10:27:15 +08:00
parent e8c9839ea5
commit f5755e08a7
1 changed files with 41 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+41 -8
View File
@@ -773,29 +773,62 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
if (StringUtils.isNotEmpty(paramsManifestEO.getReferencesColName())) { if (StringUtils.isNotEmpty(paramsManifestEO.getReferencesColName())) {
Map<String, Object> referencesColMap = new HashMap<>(); Map<String, Object> referencesColMap = new HashMap<>();
referencesColMap.put("referencesColFlag",true);
Map<String,Object> referencesColConfigDataVOMap = new HashMap<>();
String referencesCol = collectManifestEO.getReferencesCol(); String referencesCol = collectManifestEO.getReferencesCol();
if (StringUtils.isNotBlank(referencesCol)) { if (StringUtils.isNotBlank(referencesCol)) {
List<ParamsConfigDataVO> referencesColVOList = getReferencesColList(controlType, referencesCol, collectManifestEO, userTypes); // 重新组合配置数据 String[] referencesColArr = referencesCol.split("</br>");
for (String col : referencesColArr) {
List<ParamsConfigDataVO> referencesColVOList = getReferencesColList(controlType, col, collectManifestEO, userTypes); // 重新组合配置数据
String key = UUID.randomUUID().toString().replaceAll("-","");
referencesColConfigDataVOMap.put(key,referencesColVOList);
}
referencesColMap.put("controlType", controlType); referencesColMap.put("controlType", controlType);
referencesColMap.put("list", referencesColVOList); referencesColMap.put("paramsConfigData", referencesColConfigDataVOMap);
manifestMap.put("referencesCol", referencesColMap); manifestMap.put("referencesCol", referencesColMap);
} else { } else {
List<ParamsConfigDataVO> referencesColVOList = getReferencesColList(controlType, " # # #", collectManifestEO, userTypes); // 重新组合配置数据 List<ParamsConfigDataVO> referencesColVOList = getReferencesColList(controlType, " # # #", collectManifestEO, userTypes); // 重新组合配置数据
referencesColMap.put("controlType", controlType); referencesColMap.put("controlType", controlType);
referencesColMap.put("list", referencesColVOList);
String key = UUID.randomUUID().toString().replaceAll("-","");
referencesColConfigDataVOMap.put(key,referencesColVOList);
referencesColMap.put("paramsConfigData", referencesColConfigDataVOMap);
manifestMap.put("referencesCol", referencesColMap); manifestMap.put("referencesCol", referencesColMap);
} }
} }
if (CollectionUtil.isNotEmpty(paramsConfigEOList)) { if (CollectionUtil.isNotEmpty(paramsConfigEOList)) {
paramsConfigEOList.forEach(paramsConfigEO -> { // 参数配置 paramsConfigEOList.forEach(paramsConfigEO -> { // 参数配置
Map<String, Object> paramsConfigDataVO = new HashMap<>();
Map<String, Object> configMap = new HashMap<>(); Map<String, Object> configMap = new HashMap<>();
String paramsConfigId = paramsConfigEO.getId(); String paramsConfigId = paramsConfigEO.getId();
ParamsConfigDataEO paramsConfigDataEO = getConfigDataEOByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId, paramsConfigDataEOList); // 参数配置数据 List<ParamsConfigDataEO> paramsConfigDatas = this.getConfigDataEOListByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId, paramsConfigDataEOList); // 参数配置数据
List<ParamsConfigDataVO> paramsConfigDataVOList = getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据 if(CollectionUtils.isNotEmpty(paramsConfigDatas)){
configMap.put("controlType", controlType); // 匿名比较器排序
configMap.put("list", paramsConfigDataVOList); Collections.sort(paramsConfigDatas, new Comparator<ParamsConfigDataEO>() {
manifestMap.put(paramsConfigEO.getId(), configMap); @Override
public int compare(ParamsConfigDataEO p1, ParamsConfigDataEO p2) {
if (p2.getOrderNum() == null || p1.getOrderNum() == null) {
return 0;
}
return p1.getOrderNum().compareTo(p2.getOrderNum());
}
});
for (ParamsConfigDataEO paramsConfigDataEO : paramsConfigDatas) {
List<ParamsConfigDataVO> paramsConfigDataVOList = this.getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据
paramsConfigDataVO.put(paramsConfigDataEO.getId(), paramsConfigDataVOList);
}
}else{
ParamsConfigDataEO paramsConfigDataEO = this.getConfigDataEOByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId, paramsConfigDataEOList); // 参数配置数据
List<ParamsConfigDataVO> paramsConfigDataVOList = this.getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据
String key = UUID.randomUUID().toString().replaceAll("-", "");
paramsConfigDataVO.put(key, paramsConfigDataVOList);
}
configMap.put("controlType",controlType);
configMap.put("paramsConfigData",paramsConfigDataVO);
configMap.put("configId",paramsConfigEO.getId());
manifestMap.put(paramsConfigEO.getId(),configMap);
configIdList.add(paramsConfigEO.getId()); configIdList.add(paramsConfigEO.getId());
}); });