From 7a1750107892a773c41a547f0a5485226b008e72 Mon Sep 17 00:00:00 2001
From: nieziyan <nzyone@qq.com>
Date: Fri, 1 Sep 2023 15:47:29 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/spectrum/Prepare_G_Analysis.java  | 19 +++++++++++++++++++
 .../modules/spectrum/Sample_G_Analysis.java   |  2 +-
 .../SysDefaultNuclideController.java          |  2 ++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Prepare_G_Analysis.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Prepare_G_Analysis.java
index 360b10fd..c3719cb4 100644
--- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Prepare_G_Analysis.java
+++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Prepare_G_Analysis.java
@@ -2,12 +2,15 @@ package org.jeecg.modules.spectrum;
 
 import cn.hutool.core.util.StrUtil;
 import org.jeecg.common.constant.Setting;
+import org.jeecg.modules.base.entity.configuration.GardsNuclLinesLib;
 import org.jeecg.modules.base.vo.PHDFile;
 import org.jeecg.modules.base.vo.SpecSetup;
+import org.jeecg.modules.service.GardsAnalysesService;
 import org.jeecg.modules.service.IGardsGammaDefaultParamsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
 import java.util.Map;
 
 @Component
@@ -16,6 +19,9 @@ public class Prepare_G_Analysis {
     @Autowired
     private IGardsGammaDefaultParamsService gammaDefaultParamsService;
 
+    @Autowired
+    private GardsAnalysesService analysesService;
+
     public PHDFile getSettingFromDB(String systemType){
         Map<String, String> mapSetting = gammaDefaultParamsService.mapSetting();
         PHDFile phdFile = new PHDFile();
@@ -70,4 +76,17 @@ public class Prepare_G_Analysis {
             setting.setRiskLevelK(Double.parseDouble(RiskLevelK));
         return phdFile;
     }
+
+    public Map<String, List<GardsNuclLinesLib>> getNuclideLinesG(){
+        return null;
+    }
+
+    public Map<String,List<GardsNuclLinesLib>> getNuclideLinesP(){
+        return null;
+    }
+
+    public void saveAnalysis(){
+
+    }
+
 }
diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_G_Analysis.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_G_Analysis.java
index 590cfbfe..2fa08136 100644
--- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_G_Analysis.java
+++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_G_Analysis.java
@@ -27,7 +27,7 @@ public class Sample_G_Analysis {
         init();
         String systemType = energySpectrumStruct.system_type;
         PHDFile phdFile = prepareGAnalysis.getSettingFromDB(systemType);
-
+        
     }
 
     private void init(){
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDefaultNuclideController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDefaultNuclideController.java
index 94eae2db..3b27c6ab 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDefaultNuclideController.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDefaultNuclideController.java
@@ -51,4 +51,6 @@ public class SysDefaultNuclideController extends JeecgController<SysDefaultNucli
     public Result<?> add(@RequestBody List<SysDefaultNuclide> nuclides) {
         return service.add(nuclides);
     }
+
+
 }