认证-参数项收集-查询数据格式修改

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java

@@ -187,67 +187,66 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		}
 
 		List<Map<String, Object>> listMap = new ArrayList<>();
-		if (CollectionUtil.isNotEmpty(paramsConfigEOList)) {
+		list.forEach(collectManifestEO -> { // 参数收集清单
-			list.forEach(collectManifestEO -> { // 参数收集清单
+			// 处理数据字典字段 中英文切换 认证类型，责任领域
-				// 处理数据字典字段 中英文切换 认证类型，责任领域
+			List<String> certCategory = Arrays.asList(collectManifestEO.getCertCategory().split(","));
-				List<String> certCategory = Arrays.asList(collectManifestEO.getCertCategory().split(","));
+			List<String> dutyTerritory = Arrays.asList(collectManifestEO.getDutyTerritory().split(","));
-				List<String> dutyTerritory = Arrays.asList(collectManifestEO.getDutyTerritory().split(","));
+			String certCategoryName = "";
-				String certCategoryName = "";
+			String dutyTerritoryName = "";
-				String dutyTerritoryName = "";
+			if (CutEnum.CN.getValue().equals(cut)) {
-				if (CutEnum.CN.getValue().equals(cut)) {
+				certCategoryName = dictItemList.stream()
-					certCategoryName = dictItemList.stream()
+						.filter(e -> certCategory.contains(e.getItemValue()))
-							.filter(e -> certCategory.contains(e.getItemValue()))
+						.map(SysDictItem::getItemText)
-							.map(SysDictItem::getItemText)
+						.collect(Collectors.joining(","));
-							.collect(Collectors.joining(","));
 
-					dutyTerritoryName = dictItemList.stream()
+				dutyTerritoryName = dictItemList.stream()
-							.filter(e -> dutyTerritory.contains(e.getItemValue()))
+						.filter(e -> dutyTerritory.contains(e.getItemValue()))
-							.map(SysDictItem::getItemText)
+						.map(SysDictItem::getItemText)
-							.collect(Collectors.joining(","));
+						.collect(Collectors.joining(","));
 
-				} else if (CutEnum.EN.getValue().equals(cut)) {
+			} else if (CutEnum.EN.getValue().equals(cut)) {
-					certCategoryName = dictItemList.stream()
+				certCategoryName = dictItemList.stream()
-							.filter(e -> certCategory.contains(e.getItemValue()))
+						.filter(e -> certCategory.contains(e.getItemValue()))
-							.map(SysDictItem::getEnName)
+						.map(SysDictItem::getEnName)
-							.collect(Collectors.joining(","));
+						.collect(Collectors.joining(","));
 
-					dutyTerritoryName = dictItemList.stream()
+				dutyTerritoryName = dictItemList.stream()
-							.filter(e -> dutyTerritory.contains(e.getItemValue()))
+						.filter(e -> dutyTerritory.contains(e.getItemValue()))
-							.map(SysDictItem::getEnName)
+						.map(SysDictItem::getEnName)
-							.collect(Collectors.joining(","));
+						.collect(Collectors.joining(","));
 
-				}
+			}
 
 
 //			String certCategoryName = sysDictService.queryDictItemByValue("cert_category", collectManifestEO.getCertCategory(), cut);
-				collectManifestEO.setCertCategory(certCategoryName);
+			collectManifestEO.setCertCategory(certCategoryName);
 //			String dutyTerritoryName = sysDictService.queryDictItemByValue("duty_territory", collectManifestEO.getDutyTerritory(), cut);
-				collectManifestEO.setDutyTerritory(dutyTerritoryName);
+			collectManifestEO.setDutyTerritory(dutyTerritoryName);
 
-				// 处理状态字段
+			// 处理状态字段
-				Map<String, String> collectManifestStateMap = CollectManifestStateEnum.toMap(cut);
+			Map<String, String> collectManifestStateMap = CollectManifestStateEnum.toMap(cut);
-				String stateName = collectManifestStateMap.get(collectManifestEO.getState());
+			String stateName = collectManifestStateMap.get(collectManifestEO.getState());
-				collectManifestEO.setState(stateName);
+			collectManifestEO.setState(stateName);
 
-				Map<String, Object> manifestMap = objectToMap(collectManifestEO); // 对象转map
+			Map<String, Object> manifestMap = objectToMap(collectManifestEO); // 对象转map
-				String controlType = collectManifestEO.getControlType();
+			String controlType = collectManifestEO.getControlType();
-				String paramsCollectManifestId = collectManifestEO.getId();
+			String paramsCollectManifestId = collectManifestEO.getId();
 
-				if (CollectionUtil.isNotEmpty(paramsConfigEOList)) {
+			if (CollectionUtil.isNotEmpty(paramsConfigEOList)) {
-					paramsConfigEOList.forEach(paramsConfigEO -> { // 参数配置
+				paramsConfigEOList.forEach(paramsConfigEO -> { // 参数配置
-						Map<String, Object> configMap = new HashMap<>();
+					Map<String, Object> configMap = new HashMap<>();
-						String paramsConfigId = paramsConfigEO.getId();
+					String paramsConfigId = paramsConfigEO.getId();
-						ParamsConfigDataEO paramsConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据
+					ParamsConfigDataEO paramsConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据
-						List<ParamsConfigDataVO> paramsConfigDataVOList = getConfigDataVOList(controlType, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据
+					List<ParamsConfigDataVO> paramsConfigDataVOList = getConfigDataVOList(controlType, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据
-						configMap.put("controlType", controlType);
+					configMap.put("controlType", controlType);
-						configMap.put("list", paramsConfigDataVOList);
+					configMap.put("list", paramsConfigDataVOList);
-						manifestMap.put(paramsConfigEO.getId(), configMap);
+					manifestMap.put(paramsConfigEO.getId(), configMap);
-					});
+				});
-				}
+			}
+
+			listMap.add(manifestMap);
+		});
 
-				listMap.add(manifestMap);
-			});
-		}
         return listMap;
     }
 
@@ -266,7 +265,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			ParamsConfigDataVO configDataVO = new ParamsConfigDataVO();
 			configDataVO.setType(ConfigDataTypeEnum.TEXT.getValue());
 			configDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
-			configDataVO.setControlValue(paramsCollectManifestEO.getControlVerify());
+			configDataVO.setControlVerify(paramsCollectManifestEO.getControlVerify());
 			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getTextData())) {
 				configDataVO.setDataValue(paramsConfigDataEO.getTextData());
 			}
@@ -277,7 +276,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			ParamsConfigDataVO configDataVO = new ParamsConfigDataVO();
 			configDataVO.setType(ConfigDataTypeEnum.PULL.getValue());
 			configDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
-			configDataVO.setControlValue(paramsCollectManifestEO.getControlValues());
+			configDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
 			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getPullData())) {
 				configDataVO.setDataValue(paramsConfigDataEO.getPullData());
 			}
@@ -288,7 +287,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			ParamsConfigDataVO configDataVO = new ParamsConfigDataVO();
 			configDataVO.setType(ConfigDataTypeEnum.PULL_MORE.getValue());
 			configDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
-			configDataVO.setControlValue(paramsCollectManifestEO.getControlValues());
+			configDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
 			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getPullData())) {
 				configDataVO.setDataValue(paramsConfigDataEO.getPullData());
 			}
@@ -309,7 +308,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			ParamsConfigDataVO textConfigDataVO = new ParamsConfigDataVO();
 			textConfigDataVO.setType(ConfigDataTypeEnum.TEXT.getValue());
 			textConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
-			textConfigDataVO.setControlValue(paramsCollectManifestEO.getControlVerify());
+			textConfigDataVO.setControlVerify(paramsCollectManifestEO.getControlVerify());
 			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getTextData())) {
 				textConfigDataVO.setDataValue(paramsConfigDataEO.getTextData());
 			}
@@ -318,7 +317,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			ParamsConfigDataVO pullConfigDataVO = new ParamsConfigDataVO();
 			pullConfigDataVO.setType(ConfigDataTypeEnum.PULL.getValue());
 			pullConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
-			pullConfigDataVO.setControlValue(paramsCollectManifestEO.getControlValues());
+			pullConfigDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
 			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getPullData())) {
 				pullConfigDataVO.setDataValue(paramsConfigDataEO.getPullData());
 			}
@@ -329,7 +328,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			ParamsConfigDataVO textConfigDataVO = new ParamsConfigDataVO();
 			textConfigDataVO.setType(ConfigDataTypeEnum.TEXT.getValue());
 			textConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
-			textConfigDataVO.setControlValue(paramsCollectManifestEO.getControlVerify());
+			textConfigDataVO.setControlVerify(paramsCollectManifestEO.getControlVerify());
 			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getTextData())) {
 				textConfigDataVO.setDataValue(paramsConfigDataEO.getTextData());
 			}
@@ -338,7 +337,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			ParamsConfigDataVO pullMoreConfigDataVO = new ParamsConfigDataVO();
 			pullMoreConfigDataVO.setType(ConfigDataTypeEnum.PULL_MORE.getValue());
 			pullMoreConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
-			pullMoreConfigDataVO.setControlValue(paramsCollectManifestEO.getControlValues());
+			pullMoreConfigDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
 			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getPullData())) {
 				pullMoreConfigDataVO.setDataValue(paramsConfigDataEO.getPullData());
 			}
@@ -349,7 +348,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			ParamsConfigDataVO textConfigDataVO = new ParamsConfigDataVO();
 			textConfigDataVO.setType(ConfigDataTypeEnum.TEXT.getValue());
 			textConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
-			textConfigDataVO.setControlValue(paramsCollectManifestEO.getControlVerify());
+			textConfigDataVO.setControlVerify(paramsCollectManifestEO.getControlVerify());
 			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getTextData())) {
 				textConfigDataVO.setDataValue(paramsConfigDataEO.getTextData());
 			}
@@ -368,7 +367,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			ParamsConfigDataVO pullConfigDataVO = new ParamsConfigDataVO();
 			pullConfigDataVO.setType(ConfigDataTypeEnum.PULL.getValue());
 			pullConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
-			pullConfigDataVO.setControlValue(paramsCollectManifestEO.getControlValues());
+			pullConfigDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
 			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getPullData())) {
 				pullConfigDataVO.setDataValue(paramsConfigDataEO.getPullData());
 			}
@@ -387,7 +386,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			ParamsConfigDataVO pullMoreConfigDataVO = new ParamsConfigDataVO();
 			pullMoreConfigDataVO.setType(ConfigDataTypeEnum.PULL_MORE.getValue());
 			pullMoreConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
-			pullMoreConfigDataVO.setControlValue(paramsCollectManifestEO.getControlValues());
+			pullMoreConfigDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
 			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getPullData())) {
 				pullMoreConfigDataVO.setDataValue(paramsConfigDataEO.getPullData());
 			}
@@ -406,7 +405,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			ParamsConfigDataVO textConfigDataVO = new ParamsConfigDataVO();
 			textConfigDataVO.setType(ConfigDataTypeEnum.TEXT.getValue());
 			textConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
-			textConfigDataVO.setControlValue(paramsCollectManifestEO.getControlVerify());
+			textConfigDataVO.setControlVerify(paramsCollectManifestEO.getControlVerify());
 			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getTextData())) {
 				textConfigDataVO.setDataValue(paramsConfigDataEO.getTextData());
 			}
@@ -415,7 +414,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			ParamsConfigDataVO pullConfigDataVO = new ParamsConfigDataVO();
 			pullConfigDataVO.setType(ConfigDataTypeEnum.PULL.getValue());
 			pullConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
-			pullConfigDataVO.setControlValue(paramsCollectManifestEO.getControlValues());
+			pullConfigDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
 			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getPullData())) {
 				pullConfigDataVO.setDataValue(paramsConfigDataEO.getPullData());
 			}
@@ -433,6 +432,21 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		return paramsConfigDataVOList;
 	}
 
+	private List<Map<String, String>> getControlValueMapList(String controlValue) {
+		List<Map<String, String>> controlValueMapList = new ArrayList<>();
+    	if (StringUtils.isNotEmpty(controlValue)) {
+    		controlValue = controlValue.replace("，", ",");
+			String[] controlValueStr = controlValue.split(",");
+			for (int i = 0; i < controlValueStr.length; i++) {
+				Map<String, String> controlValueMap = new HashMap<>();
+				controlValueMap.put("lable", controlValueStr[i]);
+				controlValueMap.put("value", controlValueStr[i]);
+				controlValueMapList.add(controlValueMap);
+			}
+		}
+    	return controlValueMapList;
+ 	}
+
 	/**
 	 * 列表表头中英文切换
 	 *

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigEOServiceImpl.java

@@ -52,18 +52,18 @@ public class ParamsConfigEOServiceImpl extends ServiceImpl<ParamsConfigEOMapper,
 		String paramsManifestId = paramsConfigVO.getParamsManifestId();
 		List<ParamsConfigEO> paramsConfigEOList = paramsConfigVO.getParamsConfigEOList();
 
-//		int ind = 1;
+		int ind = 1;
 		List<ParamsConfigEO> addConfigList = new ArrayList<>(); // 新增的配置
 		List<ParamsConfigEO> updateConfigList = new ArrayList<>(); // 修改的配置
 		for (ParamsConfigEO paramsConfigEO : paramsConfigEOList) {
 			paramsConfigEO.setParamsManifestId(paramsManifestId);
-//			paramsConfigEO.setDisplaySeq(ind);
+			paramsConfigEO.setDisplaySeq(ind);
 			if (StringUtils.isEmpty(paramsConfigEO.getId())) {
 				addConfigList.add(paramsConfigEO);
 			} else {
 				updateConfigList.add(paramsConfigEO);
 			}
-//			ind++;
+			ind++;
 		}
 
 		// 删除的配置
@@ -96,10 +96,11 @@ public class ParamsConfigEOServiceImpl extends ServiceImpl<ParamsConfigEOMapper,
 				paramsConfigEO.setUpdateBy(sysUser.getUsername());
 				paramsConfigEO.setUpdateTime(now);
 			});
-			updateConfigList.addAll(addConfigList);
-			saveOrUpdateBatch(updateConfigList);
 //			paramsConfigEOMapper.updateForeach(updateConfigList); 批量修改不行
 		}
+
+		updateConfigList.addAll(addConfigList);
+		saveOrUpdateBatch(updateConfigList);
     }
 
 	/**

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java

@@ -1,13 +1,16 @@
 package com.jero.modules.cert.collect.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
+import com.jero.modules.cert.collect.entity.ParamsConfigEO;
 import com.jero.modules.cert.collect.entity.ParamsManifestEO;
 import com.jero.modules.cert.collect.enums.CollectManifestStateEnum;
 import com.jero.modules.cert.collect.enums.ManifestStateEnum;
+import com.jero.modules.cert.collect.mapper.ParamsConfigEOMapper;
 import com.jero.modules.cert.collect.mapper.ParamsManifestEOMapper;
 import com.jero.modules.cert.collect.service.IParamsCollectManifestEOService;
 import com.jero.modules.cert.collect.service.IParamsManifestEOService;
@@ -30,6 +33,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 /**
  * @Description: 参数清单
@@ -59,6 +63,9 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
 	@Autowired
 	private ISysUserService sysUserService;
 
+	@Autowired
+	private ParamsConfigEOMapper paramsConfigEOMapper;
+
 	/**
 	 * 保存
 	 *
@@ -128,6 +135,21 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
 	 */
 	@Override
     public void deleteById(String id) {
+		// 关联删除配置
+		LambdaQueryWrapper<ParamsConfigEO>  configEOQueryWrapper = new LambdaQueryWrapper<>();
+		configEOQueryWrapper.eq(ParamsConfigEO::getParamsManifestId, id);
+		paramsConfigEOMapper.delete(configEOQueryWrapper);
+
+		// 关联删除收集的参数项（包含配置数据）
+		LambdaQueryWrapper<ParamsCollectManifestEO>  queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.eq(ParamsCollectManifestEO::getParamsManifestId, id);
+		List<ParamsCollectManifestEO> paramsCollectManifestEOList = paramsCollectManifestEOService.list(queryWrapper);
+		if (CollectionUtil.isNotEmpty(paramsCollectManifestEOList)) {
+			List<String> paramsCollectManifestIdList = paramsCollectManifestEOList.stream().map(ParamsCollectManifestEO::getId).collect(Collectors.toList());
+			paramsCollectManifestEOService.deleteByIds(paramsCollectManifestIdList);
+
+		}
+
         removeById(id);
     }
 
@@ -139,6 +161,21 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
 	 */
 	@Override
     public void deleteByIds(List<String> ids) {
+
+		// 关联删除配置
+		LambdaQueryWrapper<ParamsConfigEO>  configEOQueryWrapper = new LambdaQueryWrapper<>();
+		configEOQueryWrapper.in(ParamsConfigEO::getParamsManifestId, ids);
+		paramsConfigEOMapper.delete(configEOQueryWrapper);
+
+		// 关联删除收集的参数项（包含配置数据）
+		LambdaQueryWrapper<ParamsCollectManifestEO>  queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.in(ParamsCollectManifestEO::getParamsManifestId, ids);
+		List<ParamsCollectManifestEO> paramsCollectManifestEOList = paramsCollectManifestEOService.list(queryWrapper);
+		if (CollectionUtil.isNotEmpty(paramsCollectManifestEOList)) {
+			List<String> paramsCollectManifestIdList = paramsCollectManifestEOList.stream().map(ParamsCollectManifestEO::getId).collect(Collectors.toList());
+			paramsCollectManifestEOService.deleteByIds(paramsCollectManifestIdList);
+
+		}
         removeByIds(ids);
     }
 

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsConfigDataVO.java

@@ -2,6 +2,9 @@ package com.jero.modules.cert.collect.vo;
 
 import lombok.Data;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * @Author: liyawei
  * @Description:
@@ -11,6 +14,7 @@ import lombok.Data;
 public class ParamsConfigDataVO {
     private String type; // 类型：文本，单选，多选，附件
     private String isMust; // 是否必填 1-必填  0-非必填
-    private String controlValue; // 控件备选值，控件校验
+    private String controlVerify; // 控件校验
+    private List<Map<String, String>> controlValue; // 控件备选值
     private String dataValue; // 配置具体数据
 }