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

---
 .../controller/NasaDataRecordController.java  | 28 +++++++++++++------
 .../database/dto/NasaDataRecordPage.java      |  1 -
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/NasaDataRecordController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/NasaDataRecordController.java
index 6cb6f7d..1e79d27 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/NasaDataRecordController.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/NasaDataRecordController.java
@@ -51,15 +51,14 @@ public class NasaDataRecordController extends JeecgController<NasaDataRecord, IN
     //@AutoLog(value = "NASA数据管理-分页列表查询")
     @Operation(summary = "NASA数据管理-分页列表查询")
     @GetMapping(value = "/list")
-    public Result<NasaDataRecordPage> queryPageList(NasaDataRecord nasaDataRecord,
-                                                    @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                    HttpServletRequest req) {
+    public Result<IPage<NasaDataRecord>> queryPageList(NasaDataRecord nasaDataRecord,
+                                                       @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                       @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                       HttpServletRequest req) {
         QueryWrapper<NasaDataRecord> queryWrapper = QueryGenerator.initQueryWrapper(nasaDataRecord, req.getParameterMap());
         Page<NasaDataRecord> page = new Page<NasaDataRecord>(pageNo, pageSize);
         IPage<NasaDataRecord> pageList = nasaDataRecordService.page(page, queryWrapper);
-        long totalCountLhs = 0;
-        long totalCountXhy = 0;
+
         for (NasaDataRecord nr : pageList.getRecords()) {
             String fileList = nr.getFileList();
             if (StringUtils.isNotBlank(fileList)) {
@@ -68,11 +67,22 @@ public class NasaDataRecordController extends JeecgController<NasaDataRecord, IN
                 list.forEach(files::putAll);
                 nr.setFileMap(files);
             }
-            totalCountLhs += Optional.ofNullable(nr.getTotalCountLhs()).orElse(0l);
-            totalCountXhy += Optional.ofNullable(nr.getTotalCountNasa()).orElse(0l);
         }
+        return Result.OK(pageList);
+    }
+
+    @GetMapping(value = "/statistics")
+    public Result<NasaDataRecordPage> queryPageList(NasaDataRecord nasaDataRecord) {
         NasaDataRecordPage result = new NasaDataRecordPage();
-        result.setPageList(pageList);
+        List<NasaDataRecord> list = nasaDataRecordService.list();
+        long totalCountLhs = list.stream().filter(Objects::nonNull) // 排除 null 对象
+                .mapToLong(NasaDataRecord::getTotalCountLhs) // 将对象映射为 long 字段
+                .filter(Objects::nonNull) // 排除 myField 为 null 的情况
+                .sum();
+        long totalCountXhy = list.stream().filter(Objects::nonNull) // 排除 null 对象
+                .mapToLong(NasaDataRecord::getTotalCountNasa) // 将对象映射为 long 字段
+                .filter(Objects::nonNull) // 排除 myField 为 null 的情况
+                .sum();
         result.setLhsCount(totalCountLhs);
         result.setLhsTotal(totalCountLhs);
         result.setXhyCount(totalCountXhy);
diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/dto/NasaDataRecordPage.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/dto/NasaDataRecordPage.java
index fb765ad..b5ce92c 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/dto/NasaDataRecordPage.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/dto/NasaDataRecordPage.java
@@ -15,7 +15,6 @@ import org.jeecg.modules.database.entity.NasaDataRecord;
 
 @Data
 public class NasaDataRecordPage {
-    private IPage<NasaDataRecord> pageList;
     private long                  lhsCount;
     private long                  lhsTotal;
     private long                  xhyCount;