From 5849612a3bb95f550c0be8f79e3960c8344f130f Mon Sep 17 00:00:00 2001
From: nieziyan <nzyone@qq.com>
Date: Thu, 18 Jul 2024 19:43:26 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9AbgSpectrum=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jeecg/modules/entity/vo/SeriseData.java   |  3 --
 .../service/impl/SelfStationServiceImpl.java  | 30 +++++++++++++++++++
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/SeriseData.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/SeriseData.java
index 52486cc1..8a520cdb 100644
--- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/SeriseData.java
+++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/SeriseData.java
@@ -10,7 +10,4 @@ public class SeriseData implements Serializable {
     private double x;
 
     private double y;
-
-    private double e;
-
 }
diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SelfStationServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SelfStationServiceImpl.java
index 765dc047..b2cd4644 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SelfStationServiceImpl.java
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SelfStationServiceImpl.java
@@ -273,6 +273,8 @@ public class SelfStationServiceImpl implements ISelfStationService {
                     resultMap.put("sample", map);
                     // 初始化Configure
                     initConfigure(struct, selfStationData);
+                    // 返回Beta和Gamma的数据
+                    bGSpectrum(struct, map);
                 }
             }
             //判断det文件名是否为空
@@ -335,6 +337,8 @@ public class SelfStationServiceImpl implements ISelfStationService {
                 Map<String, Object> map = new HashMap<>();
                 selfStationUtil.loadFile(selfStationData, null, null, "sample", map);
                 resultMap.put("sample", map);
+                // 返回Beta和Gamma的数据
+                bGSpectrum(selfStationData.getSampleStruct(), map);
             }
             if (StringUtils.isNotBlank(detFileName)) {
                 //返回结果map
@@ -447,6 +451,32 @@ public class SelfStationServiceImpl implements ISelfStationService {
         }
     }
 
+    public void bGSpectrum(EnergySpectrumStruct struct, Map<String, Object> map){
+        List<SeriseData> seriseDataB = new LinkedList<>();
+        List<SeriseData> seriseDataG = new LinkedList<>();
+
+        long numBChannel = struct.num_b_channel;
+        long numGChannel = struct.num_g_channel;
+        List<Long> bCounts = struct.b_counts;
+        List<Long> gCounts = struct.g_counts;
+
+        for (int i = 0; i < numBChannel; i++) {
+            SeriseData seriseData = new SeriseData();
+            seriseData.setX(i);
+            seriseData.setY(bCounts.get(i));
+            seriseDataB.add(seriseData);
+        }
+        for (int i = 0; i < numGChannel; i++) {
+            SeriseData seriseData = new SeriseData();
+            seriseData.setX(i);
+            seriseData.setY(gCounts.get(i));
+            seriseDataG.add(seriseData);
+        }
+        Map<String, Object> result = new HashMap<>();
+        map.put("bSpectrum", seriseDataB);
+        map.put("gSpectrum", seriseDataG);
+    }
+
     @Override
     public void deleteSelfStationCache(String sampleFileName, HttpServletRequest request) {
         String userName = JwtUtil.getUserNameByToken(request);