diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java index c372fec..c57e650 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java @@ -354,22 +354,17 @@ public class ExperimentController extends JeecgController queryPageList(NasaDataRecord nasaDataRecord) { NasaDataRecordPage result = new NasaDataRecordPage(); - List list = nasaDataRecordService.list(); - long totalCountLhs = list.stream().filter(Objects::nonNull).mapToLong(NasaDataRecord::getTotalCountLhs).filter(Objects::nonNull) - .sum(); - long totalCountXhy = list.stream().filter(Objects::nonNull).mapToLong(NasaDataRecord::getTotalCountNasa).filter(Objects::nonNull) - .sum(); + Long nasaCountLhs = nasaDataRecordService.sumLhs(); + Long nasaCountXhy = nasaDataRecordService.sumXhy(); - List experimentList = experimentService.list(); - long experimentLhs = experimentList.stream().filter(Objects::nonNull).mapToLong(Experiment::getTotalCountLhs).filter( - Objects::nonNull).sum(); - long experimentXhy = experimentList.stream().filter(Objects::nonNull).mapToLong(Experiment::getTotalCountXhy).filter( - Objects::nonNull).sum(); + Long localCountLhs = experimentService.sumLhs(); + Long localCountXhy = experimentService.sumXhy(); + + result.setLhsCount(localCountLhs); + result.setLhsTotal(nasaCountLhs + localCountLhs); + result.setXhyCount(localCountXhy); + result.setXyhTotal(nasaCountXhy + localCountXhy); - result.setLhsCount(experimentLhs); - result.setLhsTotal(totalCountLhs + experimentLhs); - result.setXhyCount(experimentXhy); - result.setXyhTotal(totalCountXhy + experimentXhy); return Result.OK(result); }