From e2e67752c31bce1160f5b1e418e3a30d614a57ee Mon Sep 17 00:00:00 2001
From: ls <lslvxy@163.com>
Date: Sat, 22 Feb 2025 14:15:03 +0800
Subject: [PATCH] update

---
 .../controller/ExperimentController.java      | 29 +++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

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 33d9691..c372fec 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
@@ -15,6 +15,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.modules.database.constant.ExperimentStatus;
+import org.jeecg.modules.database.dto.NasaDataRecordPage;
 import org.jeecg.modules.database.entity.*;
 import org.jeecg.modules.database.service.*;
 import org.jeecg.modules.system.entity.SysUser;
@@ -64,6 +65,8 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
     private IExperimentIrradiationBoardService   experimentIrradiationBoardService;
     @Autowired
     private IExperimentFileService               experimentFileService;
+    @Autowired
+    private INasaDataRecordService               nasaDataRecordService;
 
     /**
      * 分页列表查询
@@ -150,8 +153,8 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
         }
         if (StringUtils.isNotBlank(experiment.getId())) {
             Experiment dbExp = experimentService.getById(experiment.getId());
-            if (!StringUtils.equals(dbExp.getStatus(), ExperimentStatus.STAGING)
-                    || !StringUtils.equals(dbExp.getStatus(), ExperimentStatus.PRE_TEST)) {
+            if (!StringUtils.equals(dbExp.getStatus(), ExperimentStatus.STAGING) || !StringUtils.equals(dbExp.getStatus(),
+                    ExperimentStatus.PRE_TEST)) {
                 return Result.error("实验状态不正确！");
             }
         }
@@ -348,4 +351,26 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
         return super.importExcel(request, response, Experiment.class);
     }
 
+    @GetMapping(value = "/statistics")
+    public Result<NasaDataRecordPage> queryPageList(NasaDataRecord nasaDataRecord) {
+        NasaDataRecordPage result = new NasaDataRecordPage();
+        List<NasaDataRecord> 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();
+
+        List<Experiment> 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();
+
+        result.setLhsCount(experimentLhs);
+        result.setLhsTotal(totalCountLhs + experimentLhs);
+        result.setXhyCount(experimentXhy);
+        result.setXyhTotal(totalCountXhy + experimentXhy);
+        return Result.OK(result);
+    }
+
 }