From 441a4ee6f67978b5d3b4ea955bf1ad4cf74b7243 Mon Sep 17 00:00:00 2001
From: xiaoguangbin <xiaoguangbin>
Date: Thu, 1 Aug 2024 19:02:58 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=20updateROI=20?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=85=B6=E4=BB=96=E8=B0=B1=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SelfStationController.java     |  5 +++--
 .../modules/service/ISelfStationService.java  |  2 +-
 .../service/impl/SelfStationServiceImpl.java  | 21 +++++++++++++++++--
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SelfStationController.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SelfStationController.java
index 484516d3..62b6028d 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SelfStationController.java
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SelfStationController.java
@@ -58,12 +58,13 @@ public class SelfStationController {
 
     @PutMapping("updateROI")
     @ApiOperation(value = "更新ROI范围", notes = "更新ROI范围")
-    public Result updateROI(@RequestParam String roiParams, @RequestParam String sampleFileName, HttpServletRequest request) {
+    public Result updateROI(@RequestParam String roiParams, @RequestParam String sampleFileName,
+                            @RequestParam String dataType, HttpServletRequest request) {
         if (StrUtil.isBlank(roiParams)) {
             return Result.error("roiParams cannot be empty!");
         }
         List<ROIParam> roiParamList = JSONArray.parseArray(roiParams, ROIParam.class);
-        return selfStationService.updateROI(roiParamList, sampleFileName, request);
+        return selfStationService.updateROI(roiParamList, sampleFileName, dataType, request);
     }
 
     @GetMapping("energyCalibration")
diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISelfStationService.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISelfStationService.java
index 3fde6491..6b082749 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISelfStationService.java
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISelfStationService.java
@@ -21,7 +21,7 @@ public interface ISelfStationService {
 
     Result updateROI(Integer startChannel, Integer endChannel, Integer ROINum, String sampleFileName, HttpServletRequest request);
 
-    Result updateROI(List<ROIParam> roiParams, String sampleFileName, HttpServletRequest request);
+    Result updateROI(List<ROIParam> roiParams, String sampleFileName, String dataType, HttpServletRequest request);
 
     Result energyCalibration(String fileName, String currentText, Double width, HttpServletRequest request);
 
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 83b32488..04b03179 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
@@ -627,7 +627,7 @@ public class SelfStationServiceImpl implements ISelfStationService {
     }
 
     @Override
-    public Result updateROI(List<ROIParam> roiParams, String sampleFileName, HttpServletRequest request) {
+    public Result updateROI(List<ROIParam> roiParams, String sampleFileName, String dataType, HttpServletRequest request) {
         Result result = new Result();
         Map<String, Object> map = new HashMap<>();
         //获取用户名
@@ -640,7 +640,24 @@ public class SelfStationServiceImpl implements ISelfStationService {
             result.error500("Load basic file information first!");
             return result;
         }
-        EnergySpectrumStruct struct = selfStationData.getSampleStruct();
+        if (StrUtil.isBlank(dataType)) {
+            result.error500("Update failed!");
+            return result;
+        }
+        EnergySpectrumStruct struct = null;
+        switch (dataType) {
+            case "SAMPLEPHD":
+                struct = selfStationData.getSampleStruct();
+                break;
+            case "QCPHD":
+                struct = selfStationData.getQcStruct();
+                break;
+            case "DETPHD":
+                struct = selfStationData.getDetStruct();
+                break;
+            default:
+                break;
+        }
         for (ROIParam roiParam : roiParams) {
             Integer ROINum = roiParam.getRoiNum();
             Map<String, Object> resultMap = selfStationUtil.statisticsROIList(roiParam.getStartChannel(), roiParam.getEndChannel(),