From e5bcf3bae07ef7c3262d061663e484c259901b5d Mon Sep 17 00:00:00 2001
From: xiaoguangbin <xiaoguangbin>
Date: Mon, 18 Nov 2024 14:03:59 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E8=A7=A3=E5=86=B3gamma=E4=BA=A4?=
 =?UTF-8?q?=E4=BA=92=E5=B7=A5=E5=85=B7=E6=B7=BB=E5=8A=A0=E6=A0=B8=E7=B4=A0?=
 =?UTF-8?q?=E4=B9=8B=E5=90=8Emdc=E6=B2=A1=E6=9C=89=E6=A0=B8=E7=B4=A0?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/org/jeecg/common/util/GammaFileUtil.java  | 6 +++---
 .../main/java/org/jeecg/modules/entity/vo/NuclideInfo.java  | 2 +-
 .../main/java/org/jeecg/modules/service/IGammaService.java  | 2 +-
 .../org/jeecg/modules/service/impl/GammaServiceImpl.java    | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java
index 07801a8e..d6507cfd 100644
--- a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java
+++ b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java
@@ -1527,10 +1527,10 @@ public class GammaFileUtil extends AbstractLogOrReport {
             }
         } catch (JsonProcessingException e){
             e.printStackTrace();
-            log.error("AnalyseSpectrum(): {}", e.getMessage());
+            log.error("AnalyseSpectrum(): {}", e);
         } catch (RuntimeException e) {
             e.printStackTrace();
-            log.error("AnalyseSpectrum(): {}", e.getMessage());
+            log.error("AnalyseSpectrum(): {}", e);
         }
         return true;
     }
@@ -4156,7 +4156,7 @@ public class GammaFileUtil extends AbstractLogOrReport {
         return result;
     }
 
-    public void CalcNuclideMDA(PHDFile phd, NuclideLines lines, String nucName, List<Integer> vPeakIdx, Integer energyTolerance) {
+    public void CalcNuclideMDA(PHDFile phd, NuclideLines lines, String nucName, List<Integer> vPeakIdx, Double energyTolerance) {
         if(lines.halflife <= 0) {
             return;
         }
diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/NuclideInfo.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/NuclideInfo.java
index e7afda22..5c04d2ab 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/NuclideInfo.java
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/NuclideInfo.java
@@ -16,6 +16,6 @@ public class NuclideInfo implements Serializable {
 
     private List<String> list_identify;
 
-    private Integer energyTolerance;
+    private Double energyTolerance;
 
 }
diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGammaService.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGammaService.java
index d8120810..d94ecc8b 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGammaService.java
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGammaService.java
@@ -53,7 +53,7 @@ public interface IGammaService{
 
     Result getSelPosNuclide(Integer sampleId, String fileName, int channel, HttpServletRequest request);
 
-    Result addNuclide(Integer curRow, String nuclideName, String fileName, List<String> list_identify, Integer energyTolerance,
+    Result addNuclide(Integer curRow, String nuclideName, String fileName, List<String> list_identify, Double energyTolerance,
                       HttpServletRequest request);
 
     Result deleteNuclide(Integer curRow, String nuclideName, String fileName, List<String> list_identify, HttpServletRequest request);
diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java
index 55d8f081..3cc25ab6 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java
@@ -1664,7 +1664,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
 
     @Override
     public Result addNuclide(Integer curRow, String nuclideName, String fileName, List<String> list_identify,
-                             Integer energyTolerance, HttpServletRequest request) {
+                             Double energyTolerance, HttpServletRequest request) {
         Result result = new Result();
         Map<String, Object> map = new HashMap<>();
         String userName = JwtUtil.getUserNameByToken(request);