fix:任务下文件查询

This commit is contained in:
2026-01-29 13:42:43 +08:00
parent 5ad5feeae9
commit 8cc56bcabd

View File

@@ -119,16 +119,22 @@ public class DataAnalysisServiceImpl implements IDataAnalysisService {
PageInfo<FileMetadataInfo> page = new PageInfo<>(fileMetadataInfoList);
long total = page.getTotal();
List<SimulationTaskResultCurveResp> 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<SimulationTaskResultCurveResp> 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<Long> fileIdList = fileMetadataInfoList.stream().map(FileMetadataInfo::getId).toList();
List<SimulationTaskResultCurveResp> finalResultList = hierarchyHelper.processFileHierarchy(
fileIdList,
SimulationTaskResultCurveResp.class,
FileMetadataHierarchyHelper::setFileHierarchy
);
PageInfo<SimulationTaskResultCurveResp> page1 = new PageInfo<>(resultCurveRespList);
PageInfo<SimulationTaskResultCurveResp> page1 = new PageInfo<>(finalResultList);
page1.setTotal(total);
return PageUtils.getJsonObjectSdmResponse(resultCurveRespList, page1);
return PageUtils.getJsonObjectSdmResponse(finalResultList, page1);
}
@Override