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

update

Browse Source
This commit is contained in:
wangzhijiang
2023-02-02 16:12:37 +08:00
parent e981308fae
commit 5f5c8b4975
1 changed files with 20 additions and 13 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
+20 -13
View File
@@ -4419,7 +4419,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
record1.put("control_verify", controlVerifyMap.get(controlVerify)); record1.put("control_verify", controlVerifyMap.get(controlVerify));
// 处理参考列，没引用过则不显示该列 // 处理参考列，没引用过则不显示该列
if (StringUtils.isNotEmpty(paramsManifestEO.getReferencesColName())) { if (StringUtils.isNotEmpty(paramsManifestEO.getReferencesColName()) && StringUtils.isNotEmpty(collectManifestEO.getReferencesCol())) {
List<String> referencesColList = Arrays.asList(collectManifestEO.getReferencesCol().split("#")); List<String> referencesColList = Arrays.asList(collectManifestEO.getReferencesCol().split("#"));
StringBuilder referencesColBuilder = new StringBuilder(); StringBuilder referencesColBuilder = new StringBuilder();
if (!" ".equals(referencesColList.get(0))) { if (!" ".equals(referencesColList.get(0))) {
@@ -5893,19 +5893,27 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
for (Map<String, Object> map : configDataList) { for (Map<String, Object> map : configDataList) {
String paramsCollectManifestId = (String) map.get("id"); String paramsCollectManifestId = (String) map.get("id");
StringBuilder referncesColBuilder = new StringBuilder();
// 添加配置数据 // 添加配置数据
for (Map.Entry<String, Object> entry : map.entrySet()) { for (Map.Entry<String, Object> entry : map.entrySet()) {
StringBuilder referncesColBuilder = new StringBuilder();
if ("id".equals(entry.getKey())) { if ("id".equals(entry.getKey())) {
continue; continue;
} }
// 取值 // 取值
Map<String, Object> paramsConfigDataMap = (Map<String, Object>) entry.getValue(); // Map<String, Object> paramsConfigDataMap = (Map<String, Object>) entry.getValue();
String controlType = (String) paramsConfigDataMap.get("controlType"); // String controlType = (String) paramsConfigDataMap.get("controlType");
// 无法转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>>) entry.getValue();
if (CollectionUtil.isNotEmpty(paramsConfigDataVOList)) { if (CollectionUtil.isNotEmpty(paramsConfigDataVOList)) {
// 如果拼接不为空 则是匹配到了多个 拼接换行符 </br>
if(StringUtils.isNotEmpty(referncesColBuilder.toString())){
referncesColBuilder.append("</br>");
}
// TEXT // TEXT
List<Map<String, Object>> textList = paramsConfigDataVOList.stream() List<Map<String, Object>> textList = paramsConfigDataVOList.stream()
.filter(e->e.get("type").equals(ConfigDataTypeEnum.TEXT.getValue())).collect(Collectors.toList()); .filter(e->e.get("type").equals(ConfigDataTypeEnum.TEXT.getValue())).collect(Collectors.toList());
@@ -5980,16 +5988,15 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
} }
String referencesCol = referncesColBuilder.toString();
if (StringUtils.isNotEmpty(referencesCol)) {
ParamsCollectManifestEO updateEO = new ParamsCollectManifestEO();
updateEO.setId(paramsCollectManifestId);
updateEO.setReferencesCol(referencesCol);
updateEOList.add(updateEO);
}
} }
String referencesCol = referncesColBuilder.toString();
if (StringUtils.isNotEmpty(referencesCol)) {
ParamsCollectManifestEO updateEO = new ParamsCollectManifestEO();
updateEO.setId(paramsCollectManifestId);
updateEO.setReferencesCol(referencesCol);
updateEOList.add(updateEO);
}
} }
} }