diff --git a/common/src/main/java/com/sdm/common/entity/pojo/task/TaskBaseInfo.java b/common/src/main/java/com/sdm/common/entity/pojo/task/TaskBaseInfo.java index 2411ffaa..b9d6e13b 100644 --- a/common/src/main/java/com/sdm/common/entity/pojo/task/TaskBaseInfo.java +++ b/common/src/main/java/com/sdm/common/entity/pojo/task/TaskBaseInfo.java @@ -16,7 +16,7 @@ public class TaskBaseInfo { public String version; - public Long poolId; + public Integer poolId; public Long fileId; diff --git a/common/src/main/java/com/sdm/common/entity/resp/data/FileSimulationMappingResp.java b/common/src/main/java/com/sdm/common/entity/resp/data/FileSimulationMappingResp.java index 2795b5ce..fc58c99a 100644 --- a/common/src/main/java/com/sdm/common/entity/resp/data/FileSimulationMappingResp.java +++ b/common/src/main/java/com/sdm/common/entity/resp/data/FileSimulationMappingResp.java @@ -29,7 +29,7 @@ public class FileSimulationMappingResp implements Serializable { private Long fileId; - private Long simulationPoolId; + private Integer simulationPoolId; private String simulationPoolVersion; diff --git a/common/src/main/java/com/sdm/common/entity/resp/data/PoolInfo.java b/common/src/main/java/com/sdm/common/entity/resp/data/PoolInfo.java index e01111d1..a8928f7e 100644 --- a/common/src/main/java/com/sdm/common/entity/resp/data/PoolInfo.java +++ b/common/src/main/java/com/sdm/common/entity/resp/data/PoolInfo.java @@ -7,7 +7,7 @@ import java.util.List; @Data public class PoolInfo { - private Long simulationPoolId; + private Integer simulationPoolId; private String simulationPoolName; private String simulationPoolVersion; private List simulationPoolTaskIds; diff --git a/data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java b/data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java index 57e63230..0e8c0f0e 100644 --- a/data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java +++ b/data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java @@ -2334,27 +2334,30 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService { if(CollectionUtils.isEmpty(fileSimulationMappingByFileId)){ return; } + log.info("文件绑定知识库的查询结果 :{}",fileSimulationMappingByFileId); fileSimulationMappingByFileId.forEach(fileSimulationMappingResp -> { SdmResponse> taskPoolTaskMap = isSimuluationTaskPoolFeignClient.getTaskPoolTaskMap(fileSimulationMappingResp.getSimulationPoolId()); if(taskPoolTaskMap.isSuccess() && !Objects.isNull(taskPoolTaskMap.getData())) { Map data = taskPoolTaskMap.getData(); TaskBaseInfo taskBaseInfo = data.getOrDefault(fileSimulationMappingResp.getSimulationPoolTaskId(), null); - taskBaseInfo.setPoolId(fileSimulationMappingResp.getSimulationPoolId()); - taskBaseInfo.setFileId(fileSimulationMappingResp.getFileId()); + if(ObjectUtils.isNotEmpty(taskBaseInfo)) { + taskBaseInfo.setPoolId(fileSimulationMappingResp.getSimulationPoolId()); + taskBaseInfo.setFileId(fileSimulationMappingResp.getFileId()); + } result.add(taskBaseInfo); } }); // 按 fileId 和 poolId 双重分组 - Map>> fileTaskPoolMap = result.stream() + Map>> fileTaskPoolMap = result.stream() .collect(Collectors.groupingBy( TaskBaseInfo::getFileId, Collectors.groupingBy(TaskBaseInfo::getPoolId) )); // 按 fileId 和 poolId 分组收集 simulationPoolTaskId - Map>> filePoolTaskIdsMap = fileSimulationMappingByFileId.stream() + Map>> filePoolTaskIdsMap = fileSimulationMappingByFileId.stream() .collect(Collectors.groupingBy( FileSimulationMappingResp::getFileId, Collectors.groupingBy( @@ -2367,12 +2370,12 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService { for (FileMetadataInfo fileMetadataInfo : list) { Long fileId = fileMetadataInfo.getId(); if (fileTaskPoolMap.containsKey(fileId)) { - Map> poolMap = fileTaskPoolMap.get(fileId); - Map> poolTaskIdsMap = filePoolTaskIdsMap.getOrDefault(fileId, new HashMap<>()); + Map> poolMap = fileTaskPoolMap.get(fileId); + Map> poolTaskIdsMap = filePoolTaskIdsMap.getOrDefault(fileId, new HashMap<>()); List poolInfos = new ArrayList<>(); - for (Map.Entry> poolEntry : poolMap.entrySet()) { - Long poolId = poolEntry.getKey(); + for (Map.Entry> poolEntry : poolMap.entrySet()) { + Integer poolId = poolEntry.getKey(); List taskList = poolEntry.getValue(); List taskIds = poolTaskIdsMap.getOrDefault(poolId, new ArrayList<>());