认证-参数项收集-列表查询优化

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

@@ -62,4 +62,11 @@ public interface IParamsConfigDataEOService extends IService<ParamsConfigDataEO>
 	 * @return
 	 */
     List<ParamsConfigDataEO> queryList();
+
+	/**
+	 * 查询清单的所有配置数据
+	 * @param configIdList
+	 * @return
+	 */
+    List<ParamsConfigDataEO> queryListByConfigIdList(List<String> configIdList);
 }

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

@@ -1,8 +1,11 @@
 package com.jero.modules.cert.collect.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.jero.modules.cert.collect.entity.ParamsConfigDataEO;
 import com.jero.modules.cert.collect.entity.ParamsConfigDataHistoryEO;
 
+import java.util.List;
+
 /**
  * @Description: 参数配置数据历史版本
  * @Author: jero-boot
@@ -19,4 +22,11 @@ public interface IParamsConfigDataHistoryEOService extends IService<ParamsConfig
 	 * @return
 	 */
 	ParamsConfigDataHistoryEO queryByConfigIdAndCollectManifestId(String paramsConfigId, String paramsCollectManifestId);
+
+	/**
+	 * 查询清单的所有配置数据
+	 * @param configIdList
+	 * @return
+	 */
+	List<ParamsConfigDataHistoryEO> queryListByConfigIdList(List<String> configIdList);
 }

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

@@ -217,6 +217,14 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
         return getById(id);
     }
 
+	private ParamsConfigDataEO getConfigDataEOByConfigIdAndCollectManifestId(String configId, String collectManifestId, List<ParamsConfigDataEO> paramsConfigDataEOList) {
+		List<ParamsConfigDataEO> configDataEOList = paramsConfigDataEOList.stream().filter(e-> configId.equals(e.getParamsConfigId()) && collectManifestId.equals(e.getParamsCollectManifestId())).collect(Collectors.toList());
+		if (CollectionUtil.isNotEmpty(configDataEOList)) {
+			return configDataEOList.get(0);
+		}
+		return null;
+	}
+
     /**
 	 * 列表查询
 	 *
@@ -255,6 +263,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		}
 		List<ParamsCollectManifestEO> list = paramsCollectManifestEOMapper.listInfo(paramsCollectManifestEO); // 查询固定列
 		List<ParamsConfigEO> paramsConfigEOList = paramsConfigEOService.queryList(paramsManifestId); // 查询配置列
+		List<String> paramsConfigIdList = paramsConfigEOList.stream().map(ParamsConfigEO::getId).collect(Collectors.toList());
+		List<ParamsConfigDataEO> paramsConfigDataEOList = paramsConfigDataEOService.queryListByConfigIdList(paramsConfigIdList); // 查询所有配置数据
 
 		// 普通数据字典
 		List<SysDictItem> dictItemList = new ArrayList<>();
@@ -318,7 +328,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 				paramsConfigEOList.forEach(paramsConfigEO -> { // 参数配置
 					Map<String, Object> configMap = new HashMap<>();
 					String paramsConfigId = paramsConfigEO.getId();
-					ParamsConfigDataEO paramsConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据
+//					ParamsConfigDataEO paramsConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据
+					ParamsConfigDataEO paramsConfigDataEO = getConfigDataEOByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId, paramsConfigDataEOList); // 参数配置数据
 					List<ParamsConfigDataVO> paramsConfigDataVOList = getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据
 					configMap.put("controlType", controlType);
 					configMap.put("list", paramsConfigDataVOList);

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

@@ -58,6 +58,14 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl<Param
 	private IOSSFileService ossFileService;
 
 
+	private ParamsConfigDataHistoryEO getConfigDataEOByConfigIdAndCollectManifestId(String configId, String collectManifestId, List<ParamsConfigDataHistoryEO> paramsConfigDataEOList) {
+		List<ParamsConfigDataHistoryEO> configDataEOList = paramsConfigDataEOList.stream().filter(e-> configId.equals(e.getParamsConfigId()) && collectManifestId.equals(e.getParamsCollectManifestId())).collect(Collectors.toList());
+		if (CollectionUtil.isNotEmpty(configDataEOList)) {
+			return configDataEOList.get(0);
+		}
+		return null;
+	}
+
 	/**
 	 * 列表查询
 	 *
@@ -69,6 +77,9 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl<Param
 
 		List<ParamsCollectManifestHistoryEO> list = paramsCollectManifestHistoryEOMapper.listInfo(paramsCollectManifestEO); // 查询固定列
 		List<ParamsConfigHistoryEO> paramsConfigEOList = paramsConfigHistoryEOService.queryList(paramsManifestId); // 查询配置列
+		List<String> paramsConfigIdList = paramsConfigEOList.stream().map(ParamsConfigEO::getId).collect(Collectors.toList());
+		List<ParamsConfigDataHistoryEO> paramsConfigDataEOList = paramsConfigDataHistoryEOService.queryListByConfigIdList(paramsConfigIdList); // 查询所有配置数据
+
 
 		// 普通数据字典
 		List<SysDictItem> dictItemList = new ArrayList<>();
@@ -132,8 +143,9 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl<Param
 				paramsConfigEOList.forEach(paramsConfigEO -> { // 参数配置
 					Map<String, Object> configMap = new HashMap<>();
 					String paramsConfigId = paramsConfigEO.getId();
-					ParamsConfigDataEO paramsConfigDataEO = paramsConfigDataHistoryEOService.queryByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据
+//					ParamsConfigDataEO paramsConfigDataEO = paramsConfigDataHistoryEOService.queryByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据
-					List<ParamsConfigDataVO> paramsConfigDataVOList = getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据
+					ParamsConfigDataHistoryEO paramsConfigDataHistoryEO = getConfigDataEOByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId, paramsConfigDataEOList); // 参数配置数据
+					List<ParamsConfigDataVO> paramsConfigDataVOList = getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataHistoryEO, collectManifestEO); // 重新组合配置数据
 					configMap.put("controlType", controlType);
 					configMap.put("list", paramsConfigDataVOList);
 					manifestMap.put(paramsConfigEO.getId(), configMap);
@@ -166,7 +178,7 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl<Param
 	 * @param paramsCollectManifestEO
 	 * @return
 	 */
-	private List<ParamsConfigDataVO> getConfigDataVOList(String controlType, ParamsConfigEO paramsConfigEO, ParamsConfigDataEO paramsConfigDataEO, ParamsCollectManifestHistoryEO paramsCollectManifestEO) {
+	private List<ParamsConfigDataVO> getConfigDataVOList(String controlType, ParamsConfigEO paramsConfigEO, ParamsConfigDataHistoryEO paramsConfigDataEO, ParamsCollectManifestHistoryEO paramsCollectManifestEO) {
 		List<ParamsConfigDataVO> paramsConfigDataVOList = new ArrayList<>();
 		String templateId = null;
 		String templateName = null;

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

@@ -1,5 +1,6 @@
 package com.jero.modules.cert.collect.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.modules.cert.collect.entity.ParamsConfigDataEO;
@@ -107,4 +108,19 @@ public class ParamsConfigDataEOServiceImpl extends ServiceImpl<ParamsConfigDataE
     public List<ParamsConfigDataEO> queryList() {
         return list();
     }
+
+	/**
+	 * 查询清单的所有配置数据
+	 * @param configIdList
+	 * @return
+	 */
+	@Override
+    public List<ParamsConfigDataEO> queryListByConfigIdList(List<String> configIdList) {
+		if (CollectionUtil.isNotEmpty(configIdList)) {
+			LambdaQueryWrapper<ParamsConfigDataEO> queryWrapper = new LambdaQueryWrapper<>();
+			queryWrapper.in(ParamsConfigDataEO::getParamsConfigId, configIdList);
+			return list(queryWrapper);
+		}
+		return null;
+    }
 }

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

@@ -1,12 +1,16 @@
 package com.jero.modules.cert.collect.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.modules.cert.collect.entity.ParamsConfigDataEO;
 import com.jero.modules.cert.collect.entity.ParamsConfigDataHistoryEO;
 import com.jero.modules.cert.collect.mapper.ParamsConfigDataHistoryEOMapper;
 import com.jero.modules.cert.collect.service.IParamsConfigDataHistoryEOService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * @Description: 参数配置数据历史版本
  * @Author: jero-boot
@@ -31,4 +35,19 @@ public class ParamsConfigDataHistoryEOServiceImpl extends ServiceImpl<ParamsConf
 		getOne(queryWrapper);
 		return getOne(queryWrapper);
 	}
+
+	/**
+	 * 查询清单的所有配置数据
+	 * @param configIdList
+	 * @return
+	 */
+	@Override
+	public List<ParamsConfigDataHistoryEO> queryListByConfigIdList(List<String> configIdList) {
+		if (CollectionUtil.isNotEmpty(configIdList)) {
+			LambdaQueryWrapper<ParamsConfigDataHistoryEO> queryWrapper = new LambdaQueryWrapper<>();
+			queryWrapper.in(ParamsConfigDataHistoryEO::getParamsConfigId, configIdList);
+			return list(queryWrapper);
+		}
+		return null;
+	}
 }

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

@@ -107,9 +107,11 @@ public class ParamsConfigEOServiceImpl extends ServiceImpl<ParamsConfigEOMapper,
 			});
 //			saveBatch(addConfigList);
 			// 修改所有参数项状态为：待发起收集
-			if (CollectionUtil.isNotEmpty(paramsCollectManifestEOList)) {
+			List<ParamsCollectManifestEO> updateList = paramsCollectManifestEOList.stream()
+					.filter(e-> !CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(e.getState())).collect(Collectors.toList());
+			if (CollectionUtil.isNotEmpty(updateList)) {
 				List<ParamsCollectManifestEO> updateCollectManifestEOList = new ArrayList<>();
-				paramsCollectManifestEOList.forEach(collectManifestEO -> {
+				updateList.forEach(collectManifestEO -> {
 					ParamsCollectManifestEO updateCollectManifestEO  = new ParamsCollectManifestEO();
 					updateCollectManifestEO.setId(collectManifestEO.getId());
 					updateCollectManifestEO.setState(CollectManifestStateEnum.WAIT_COLLECT.getValue());