From b1d3a0a09d2045de8728c8af1842764edefeda5f Mon Sep 17 00:00:00 2001
From: duwenyuan <1351851645@qq.com>
Date: Fri, 17 Oct 2025 19:16:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E7=B4=A0=E4=BF=A1=E6=81=AF=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=B7=BB=E5=8A=A0=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/DataAnalysisController.java    |  4 +--
 .../java/org/jeecg/entity/SystemType.java     | 27 +++++++++++++++++++
 .../service/ISampleStatAnalysisService.java   |  4 +--
 .../impl/SampleStatAnalysisService.java       | 11 ++++++--
 4 files changed, 40 insertions(+), 6 deletions(-)
 create mode 100644 jeecg-module-data-analyze/src/main/java/org/jeecg/entity/SystemType.java

diff --git a/jeecg-module-data-analyze/src/main/java/org/jeecg/controller/DataAnalysisController.java b/jeecg-module-data-analyze/src/main/java/org/jeecg/controller/DataAnalysisController.java
index 02c10ee..6cb90ef 100644
--- a/jeecg-module-data-analyze/src/main/java/org/jeecg/controller/DataAnalysisController.java
+++ b/jeecg-module-data-analyze/src/main/java/org/jeecg/controller/DataAnalysisController.java
@@ -135,7 +135,7 @@ public class DataAnalysisController {
     public Result findStationList(String systemType) {
         Result result = new Result();
         try {
-            List<GardsStations> gardsStations = sampleStatAnalysisService.findStationListByMenuName();
+            List<GardsStations> gardsStations = sampleStatAnalysisService.findStationListByMenuName(systemType);
             result.setCode(200);
             result.setSuccess(true);
             result.setResult(gardsStations);
@@ -149,7 +149,7 @@ public class DataAnalysisController {
     public Result findNuclideList(String systemType) {
         Result result = new Result();
         try {
-            List<SysDefaultNuclide> defaultNuclides = sampleStatAnalysisService.findNuclideList();
+            List<SysDefaultNuclide> defaultNuclides = sampleStatAnalysisService.findNuclideList(systemType);
             result.setCode(200);
             result.setSuccess(true);
             result.setResult(defaultNuclides);
diff --git a/jeecg-module-data-analyze/src/main/java/org/jeecg/entity/SystemType.java b/jeecg-module-data-analyze/src/main/java/org/jeecg/entity/SystemType.java
new file mode 100644
index 0000000..5ef8098
--- /dev/null
+++ b/jeecg-module-data-analyze/src/main/java/org/jeecg/entity/SystemType.java
@@ -0,0 +1,27 @@
+package org.jeecg.entity;
+
+public enum SystemType {
+    /**
+     * 颗粒物
+     */
+    PARTICULATE("P"),
+    /**
+     * β-γ
+     */
+    BETA("B"),
+    /**
+     * γ
+     */
+    GAMMA("G");
+
+    private String type;
+
+    SystemType(String type) {
+        this.type = type;
+    }
+
+    public String getType(){
+        return this.type;
+    }
+
+}
diff --git a/jeecg-module-data-analyze/src/main/java/org/jeecg/service/ISampleStatAnalysisService.java b/jeecg-module-data-analyze/src/main/java/org/jeecg/service/ISampleStatAnalysisService.java
index 2920039..2c234a7 100644
--- a/jeecg-module-data-analyze/src/main/java/org/jeecg/service/ISampleStatAnalysisService.java
+++ b/jeecg-module-data-analyze/src/main/java/org/jeecg/service/ISampleStatAnalysisService.java
@@ -27,7 +27,7 @@ public interface ISampleStatAnalysisService extends IService<GardsSampleData> {
     Result  getNuclideActivityConcAnalyze(String sampleType, Integer[] stationIds, String nuclideName, Integer dataSource, Date startDate, Date endDate);
 
 
-    List<GardsStations> findStationListByMenuName();
-    List<SysDefaultNuclide> findNuclideList();
+    List<GardsStations> findStationListByMenuName(String systemType);
+    List<SysDefaultNuclide> findNuclideList(String systemType);
 
 }
diff --git a/jeecg-module-data-analyze/src/main/java/org/jeecg/service/impl/SampleStatAnalysisService.java b/jeecg-module-data-analyze/src/main/java/org/jeecg/service/impl/SampleStatAnalysisService.java
index a7d3257..16ba3b1 100644
--- a/jeecg-module-data-analyze/src/main/java/org/jeecg/service/impl/SampleStatAnalysisService.java
+++ b/jeecg-module-data-analyze/src/main/java/org/jeecg/service/impl/SampleStatAnalysisService.java
@@ -436,7 +436,7 @@ public class SampleStatAnalysisService extends ServiceImpl<GardsSampleStatAnalys
     }
 
     @Override
-    public List<GardsStations> findStationListByMenuName() {
+    public List<GardsStations> findStationListByMenuName(String systemType) {
         List<GardsStations> gardsStations = new LinkedList<>();
         //获取台站信息
         gardsStations = this.baseMapper.findStationListByMenuName();
@@ -445,10 +445,17 @@ public class SampleStatAnalysisService extends ServiceImpl<GardsSampleStatAnalys
 
     @Override
     @DS("master")
-    public List<SysDefaultNuclide> findNuclideList() {
+    public List<SysDefaultNuclide> findNuclideList(String systemType) {
 
         LambdaQueryWrapper<SysDefaultNuclide> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(SysDefaultNuclide::getUseType, 4);
+        if (systemType.equals("B")) {
+            queryWrapper.eq(SysDefaultNuclide::getNuclideType, SystemType.BETA.getType());
+        } else if (systemType.equals("G")) {
+            queryWrapper.eq(SysDefaultNuclide::getNuclideType, SystemType.GAMMA.getType());
+        } else if (systemType.equals("P")) {
+            queryWrapper.eq(SysDefaultNuclide::getNuclideType, SystemType.PARTICULATE.getType());
+        }
         List<SysDefaultNuclide> defaultNuclides = defaultNuclideMapper.selectList(queryWrapper);
         return defaultNuclides;
     }