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 2e691fc4..efb5886c 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 @@ -119,16 +119,22 @@ public class DataAnalysisServiceImpl implements IDataAnalysisService { PageInfo page = new PageInfo<>(fileMetadataInfoList); long total = page.getTotal(); - List resultCurveRespList = fileMetadataInfoList.stream().map(i -> { - SimulationTaskResultCurveResp resultCurveResp = new SimulationTaskResultCurveResp(); - BeanUtils.copyProperties(i,resultCurveResp); - resultCurveResp.setFormatFileSize(FileSizeUtils.formatFileSize(BigDecimal.valueOf(i.getFileSize()))); - return resultCurveResp; - }).toList(); +// List resultCurveRespList = fileMetadataInfoList.stream().map(i -> { +// SimulationTaskResultCurveResp resultCurveResp = new SimulationTaskResultCurveResp(); +// BeanUtils.copyProperties(i,resultCurveResp); +// resultCurveResp.setFormatFileSize(FileSizeUtils.formatFileSize(BigDecimal.valueOf(i.getFileSize()))); +// return resultCurveResp; +// }).toList(); + List fileIdList = fileMetadataInfoList.stream().map(FileMetadataInfo::getId).toList(); + List finalResultList = hierarchyHelper.processFileHierarchy( + fileIdList, + SimulationTaskResultCurveResp.class, + FileMetadataHierarchyHelper::setFileHierarchy + ); - PageInfo page1 = new PageInfo<>(resultCurveRespList); + PageInfo page1 = new PageInfo<>(finalResultList); page1.setTotal(total); - return PageUtils.getJsonObjectSdmResponse(resultCurveRespList, page1); + return PageUtils.getJsonObjectSdmResponse(finalResultList, page1); } @Override