diff --git a/common/pom.xml b/common/pom.xml index f6a064db..35dc8548 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -76,6 +76,18 @@ 5.0.0 provided + + com.paratera + ipcs + 1.0 + compile + + + com.paratera + ipcs + 1.0 + compile + diff --git a/data/src/main/java/com/sdm/data/service/impl/FileSimulationMappingServiceImpl.java b/data/src/main/java/com/sdm/data/service/impl/FileSimulationMappingServiceImpl.java index 1a2cb16b..00c96b01 100644 --- a/data/src/main/java/com/sdm/data/service/impl/FileSimulationMappingServiceImpl.java +++ b/data/src/main/java/com/sdm/data/service/impl/FileSimulationMappingServiceImpl.java @@ -16,6 +16,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -93,12 +94,17 @@ public class FileSimulationMappingServiceImpl extends ServiceImpl list = this.lambdaQuery().eq(FileSimulationMapping::getSimulationPoolId, getFileSimulationMappingReq.getSimulationPoolId()) .eq(FileSimulationMapping::getSimulationPoolVersion, getFileSimulationMappingReq.getSimulationPoolVersion()) .list(); + Map> map = new HashMap<>(); if (list.isEmpty()) { - return SdmResponse.success(); + SdmResponse response = SdmResponse.success(); + response.setData(map); + return response; } List fileMetadataInfos = fileMetadataInfoService.lambdaQuery().in(FileMetadataInfo::getId, list.stream().map(FileSimulationMapping::getFileId).toList()).list(); if (fileMetadataInfos.isEmpty()) { - return SdmResponse.success(); + SdmResponse response = SdmResponse.success(); + response.setData(map); + return response; } List fileMetadataInfoResps = new ArrayList<>(); fileMetadataInfos.forEach(fileMetadataInfo -> { diff --git a/task/src/main/java/com/sdm/task/service/impl/SimulationTaskPoolServiceImpl.java b/task/src/main/java/com/sdm/task/service/impl/SimulationTaskPoolServiceImpl.java index 13309044..acfdaa77 100644 --- a/task/src/main/java/com/sdm/task/service/impl/SimulationTaskPoolServiceImpl.java +++ b/task/src/main/java/com/sdm/task/service/impl/SimulationTaskPoolServiceImpl.java @@ -379,7 +379,7 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul GetFileSimulationMappingReq req = new GetFileSimulationMappingReq(); req.setSimulationPoolId(poolBrief.getInteger("id")); req.setSimulationPoolVersion(version); - SdmResponse feignRsp = simulationMappingFeignClient.batchGetFileSimulationMappingBySimulationPoolIdAndVersion(req); + SdmResponse>> feignRsp = simulationMappingFeignClient.batchGetFileSimulationMappingBySimulationPoolIdAndVersion(req); if (feignRsp.isSuccess()) stardardMap = (Map>) feignRsp.getData(); }