diff --git a/data/src/main/java/com/sdm/data/service/impl/DataAnalysisServiceImpl.java b/data/src/main/java/com/sdm/data/service/impl/DataAnalysisServiceImpl.java index cf704171..7191aa06 100644 --- a/data/src/main/java/com/sdm/data/service/impl/DataAnalysisServiceImpl.java +++ b/data/src/main/java/com/sdm/data/service/impl/DataAnalysisServiceImpl.java @@ -124,26 +124,35 @@ public class DataAnalysisServiceImpl implements IDataAnalysisService { Long deliverableDirId = deliverableFileInfoList.get(0).getId(); // 云图/曲线/文件夹名称 String secondDirName = FileBizTypeEnum.getDirNameByValue(req.getFileBizType()); - - PageHelper.startPage(req.getCurrent(), req.getSize()); - List fileMetadataInfoList = fileMetadataInfoService.lambdaQuery() + List secondDirFileMetadataInfoList = fileMetadataInfoService.lambdaQuery() .eq(FileMetadataInfo::getParentId, deliverableDirId) .eq(FileMetadataInfo::getOriginalName, secondDirName) .eq(FileMetadataInfo::getTenantId, ThreadLocalContext.getTenantId()) .list(); - PageInfo page = new PageInfo<>(fileMetadataInfoList); - long total = page.getTotal(); + if (CollectionUtils.isNotEmpty(secondDirFileMetadataInfoList)) { + // 云图/曲线/文件夹id + Long secondDirId = secondDirFileMetadataInfoList.get(0).getId(); - List fileIdList = fileMetadataInfoList.stream().map(FileMetadataInfo::getId).toList(); - List finalResultList = hierarchyHelper.processFileHierarchy( - fileIdList, - SimulationTaskResultCurveResp.class, - FileMetadataHierarchyHelper::setFileHierarchy - ); + // 最后查云图/曲线/文件夹底下的文件 + PageHelper.startPage(req.getCurrent(), req.getSize()); + List fileMetadataInfoList = fileMetadataInfoService.lambdaQuery() + .eq(FileMetadataInfo::getParentId, secondDirId) + .eq(FileMetadataInfo::getTenantId, ThreadLocalContext.getTenantId()) + .list(); + PageInfo page = new PageInfo<>(fileMetadataInfoList); + long total = page.getTotal(); - PageInfo page1 = new PageInfo<>(finalResultList); - page1.setTotal(total); - return PageUtils.getJsonObjectSdmResponse(finalResultList, page1); + List fileIdList = fileMetadataInfoList.stream().map(FileMetadataInfo::getId).toList(); + List finalResultList = hierarchyHelper.processFileHierarchy( + fileIdList, + SimulationTaskResultCurveResp.class, + FileMetadataHierarchyHelper::setFileHierarchy + ); + + PageInfo page1 = new PageInfo<>(finalResultList); + page1.setTotal(total); + return PageUtils.getJsonObjectSdmResponse(finalResultList, page1); + } } return PageUtils.getJsonObjectSdmResponse(new ArrayList<>(), new PageInfo<>()); diff --git a/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java index a71f0d7c..72f052f7 100644 --- a/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java @@ -2467,6 +2467,7 @@ public class SimulationRunServiceImpl extends ServiceImpl