Merge remote-tracking branch 'origin/station' into station

# Conflicts:
#	jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Prepare_G_Analysis.java
#	jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_G_Analysis.java

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/AcquisitionBlock.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import lombok.Data;
 

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/AnalyseData.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import lombok.Data;
 

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/BaseControls.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import lombok.Data;
 

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/BgCalibratePara.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import java.io.Serializable;
 import java.util.LinkedList;

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/Boundary.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import lombok.Data;
 

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/CalibrationBlock.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import lombok.Data;
 

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/CalibrationParam.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import lombok.Data;
 

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/CertificateBlock.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import lombok.Data;
 

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/ChartData.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import lombok.Data;
 

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/CoeffData.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import lombok.Data;
 

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/CollectionBlock.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import lombok.Data;
 

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/CommentData.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import lombok.Data;
 

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/CommentInfo.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import lombok.Data;
 

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/ConfigureData.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/EfficiencyData.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import lombok.Data;
 

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/EnergyData.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import lombok.Data;
 

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/FittingBody.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import lombok.Data;
 

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/GEfficiencyBlock.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import lombok.Data;
 

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/GEnergyBlock.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import lombok.Data;
 

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/GResolutionBlock.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import lombok.Data;
 

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/GSpectrumBlock.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import lombok.Data;
 

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/GStoreMiddleProcessData.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import lombok.Data;
 
@@ -182,7 +182,7 @@ public class GStoreMiddleProcessData implements Serializable {
     public List<String> peaks_Nuclide_name;                         //文件名称
     public List<String> peaks_comments;
     // gards_ nucl_lines_ided数据表
-    public Map<String,GStoreMiddleProcessDataNuclLinesIded> nucl_lines_ided_data;
+    public Map<String, GStoreMiddleProcessDataNuclLinesIded> nucl_lines_ided_data;
     //gards_ nucl_ided数据表
     public List<String> nucl_ided_Nuclidename;               // 核素名称
     public List<String> nucl_ided_Type;                      //核素类型                             未知

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/GStoreMiddleProcessDataNuclLinesIded.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import lombok.Data;
 

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/HalfData.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import lombok.Data;
 

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/HeaderBlock.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import lombok.Data;
 

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/HistogramData.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import lombok.Data;
 

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/Information.java

@@ -1,8 +1,6 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import lombok.Data;
-import org.jeecg.common.util.DateUtils;
 
 import java.io.Serializable;
 import java.util.Date;

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/InputData.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import lombok.Data;
 

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/MessageInfo.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import lombok.Data;
 

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/NuclideActMda.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import lombok.Data;
 

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/NuclideLine.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import lombok.Data;
 

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/NuclideLines.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import lombok.Data;
 

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/PHDFile.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Data;

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/ParameterInfo.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import lombok.Data;
 

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/PeakInfo.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 
 import java.io.Serializable;

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/ProcessingBlock.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import lombok.Data;
 

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/QCResult.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import lombok.Data;
 

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/QcCheckItem.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import lombok.Data;
 

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/ResolutionData.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import lombok.Data;
 

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/RlrDataValues.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import lombok.Data;
 

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/SampleBlock.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import lombok.Data;
 

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/Sections.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import lombok.Data;
 

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/SeriseData.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import lombok.Data;
 

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/ShapeData.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import lombok.Data;
 

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/SpecSetup.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/SpectrumData.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/SpectrumFileRecord.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/SpectrumGroup.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import java.io.Serializable;
 import java.util.LinkedList;

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/StatisticsData.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import lombok.Data;
 

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/StatisticsQueryData.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/StcGraph.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import lombok.Data;
 

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/TableAssociation.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import lombok.Data;
 

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/TableDaughter.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import lombok.Data;
 

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/TableNuclideActivity.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import lombok.Data;
 

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/TablePeak.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import lombok.Data;
 

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/TablePeakFit.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import lombok.Data;
 

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/TableQCResult.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import lombok.Data;
 

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/TableResult.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import lombok.Data;
 

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/TableWidget.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import lombok.Data;
 

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/TotaleffBlock.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import lombok.Data;
 

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/XeData.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 import lombok.Data;
 

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/cache/LocalCache.java

@@ -2,14 +2,14 @@ package org.jeecg.common.cache;
 
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
-import org.jeecg.modules.base.vo.PHDFile;
+import org.jeecg.modules.entity.vo.PHDFile;
 import org.springframework.stereotype.Component;
 
 import java.util.concurrent.TimeUnit;
 
 @Component
 public class LocalCache {
-    private Cache<String,PHDFile> phdCache = CacheBuilder.newBuilder()
+    private Cache<String, PHDFile> phdCache = CacheBuilder.newBuilder()
             //设置缓存初始大小，应该合理设置，后续会扩容
             .initialCapacity(10)
             //最大值

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/GammaFileUtil.java

@@ -15,9 +15,8 @@ import org.jeecg.modules.base.entity.rnman.GardsAnalySetting;
 import org.jeecg.modules.base.enums.CalName;
 import org.jeecg.modules.base.enums.CalType;
 import org.jeecg.modules.base.enums.MiddleDataType;
-import org.jeecg.modules.base.vo.*;
 import org.jeecg.modules.entity.*;
-import org.jeecg.modules.entity.vo.TablePeaks;
+import org.jeecg.modules.entity.vo.*;
 import org.jeecg.modules.mapper.SpectrumAnalysisMapper;
 import org.jeecg.modules.native_jni.CalValuesHandler;
 import org.jeecg.modules.native_jni.EnergySpectrumHandler;

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/NameStandUtil.java

@@ -3,7 +3,8 @@ package org.jeecg.common.util;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import org.jeecg.modules.base.enums.DataType;
 import org.jeecg.modules.base.enums.SystemType;
-import org.jeecg.modules.base.vo.PHDFile;
+import org.jeecg.modules.entity.vo.PHDFile;
+import org.springframework.stereotype.Component;
 
 import java.text.ParseException;
 import java.util.HashMap;
@@ -11,6 +12,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
+@Component
 public class NameStandUtil {
 
     public String GetSysTemSubdir(String systemType) {

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/PHDFileUtil.java

@@ -8,7 +8,6 @@ import org.apache.commons.net.ftp.FTP;
 import org.apache.commons.net.ftp.FTPClient;
 import org.apache.commons.net.ftp.FTPFile;
 import org.jeecg.common.properties.SpectrumPathProperties;
-import org.jeecg.modules.base.vo.*;
 import org.jeecg.modules.entity.GardsXeResultsSpectrum;
 import org.jeecg.modules.entity.vo.*;
 import org.jeecg.modules.native_jni.EnergySpectrumHandler;

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/GammaController.java

@@ -1,8 +1,10 @@
 package org.jeecg.modules.controller;
 
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.base.vo.*;
 import org.jeecg.modules.entity.vo.ChangeData;
+import org.jeecg.modules.entity.vo.CoeffData;
+import org.jeecg.modules.entity.vo.ConfigureData;
+import org.jeecg.modules.entity.vo.InputData;
 import org.jeecg.modules.service.IGammaService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -59,7 +61,7 @@ public class GammaController {
     }
 
     @GetMapping("nuclideReview")
-    public Result nuclideReview(Integer sampleId, String fileName, Integer channel, HttpServletRequest request){
+    public Result nuclideReview(Integer sampleId, String fileName, Double channel, HttpServletRequest request){
         return gammaService.nuclideReview(sampleId, fileName, channel, request);
     }
 
@@ -208,8 +210,8 @@ public class GammaController {
     }
 
     @GetMapping("saveToDB")
-    public Result saveToDB(){
-        return null;
+    public Result saveToDB(String fileName, String userName){
+        return gammaService.saveToDB(fileName, userName);
     }
 
 }

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SpectrumAnalysesController.java

@@ -4,11 +4,11 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.api.QueryRequest;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.base.vo.AnalyseData;
-import org.jeecg.modules.base.vo.FittingBody;
-import org.jeecg.modules.base.vo.StatisticsQueryData;
 import org.jeecg.modules.entity.GardsSampleDataSpectrum;
+import org.jeecg.modules.entity.vo.AnalyseData;
 import org.jeecg.modules.entity.vo.BgDataAnlyseResultIn;
+import org.jeecg.modules.entity.vo.FittingBody;
+import org.jeecg.modules.entity.vo.StatisticsQueryData;
 import org.jeecg.modules.service.ISpectrumAnalysisService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.format.annotation.DateTimeFormat;

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/ChangeData.java

@@ -1,7 +1,7 @@
 package org.jeecg.modules.entity.vo;
 
 import lombok.Data;
-import org.jeecg.modules.base.vo.ParameterInfo;
+import org.jeecg.modules.entity.vo.ParameterInfo;
 
 import java.io.Serializable;
 import java.util.List;

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/StructInsertInput.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 
 import java.io.Serializable;

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/StructInsertOutput.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.base.vo;
+package org.jeecg.modules.entity.vo;
 
 
 import java.io.Serializable;

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/GardsAnalySettingSpectrumMapper.java

@@ -0,0 +1,7 @@
+package org.jeecg.modules.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.base.entity.rnman.GardsAnalySetting;
+
+public interface GardsAnalySettingSpectrumMapper extends BaseMapper<GardsAnalySetting> {
+}

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/GardsAnalysesManMapper.java

@@ -2,6 +2,10 @@ package org.jeecg.modules.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.jeecg.modules.base.entity.rnman.GardsAnalyses;
+import org.jeecg.modules.entity.GardsAnalysesSpectrum;
 
 public interface GardsAnalysesManMapper extends BaseMapper<GardsAnalyses> {
+
+    void updateEntity(GardsAnalysesSpectrum analyses);
+
 }

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/GardsCalibrationPairsSpectrumMapper.java

@@ -0,0 +1,7 @@
+package org.jeecg.modules.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.base.entity.rnman.GardsCalibrationPairs;
+
+public interface GardsCalibrationPairsSpectrumMapper extends BaseMapper<GardsCalibrationPairs> {
+}

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/GardsCalibrationSpectrumMapper.java

@@ -0,0 +1,7 @@
+package org.jeecg.modules.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.base.entity.rnman.GardsCalibration;
+
+public interface GardsCalibrationSpectrumMapper extends BaseMapper<GardsCalibration> {
+}

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/GardsNuclIdedSpectrumMapper.java

@@ -0,0 +1,7 @@
+package org.jeecg.modules.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.base.entity.rnman.GardsNuclIded;
+
+public interface GardsNuclIdedSpectrumMapper extends BaseMapper<GardsNuclIded> {
+}

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/GardsNuclLinesIdedSpectrumMapper.java

@@ -0,0 +1,7 @@
+package org.jeecg.modules.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.base.entity.rnman.GardsNuclLinesIded;
+
+public interface GardsNuclLinesIdedSpectrumMapper extends BaseMapper<GardsNuclLinesIded> {
+}

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/GardsPeaksSpectrumMapper.java

@@ -0,0 +1,7 @@
+package org.jeecg.modules.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.base.entity.rnman.GardsPeaks;
+
+public interface GardsPeaksSpectrumMapper extends BaseMapper<GardsPeaks> {
+}

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/GardsQcCheckSpectrumMapper.java

@@ -0,0 +1,7 @@
+package org.jeecg.modules.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.base.entity.rnman.GardsQcCheck;
+
+public interface GardsQcCheckSpectrumMapper extends BaseMapper<GardsQcCheck> {
+}

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/SpectrumAnalysisMapper.java

@@ -7,8 +7,9 @@ import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.base.entity.configuration.GardsNuclLib;
 import org.jeecg.modules.base.entity.configuration.GardsNuclLinesLib;
 import org.jeecg.modules.base.entity.rnman.GardsAnalySetting;
-import org.jeecg.modules.base.vo.*;
 import org.jeecg.modules.entity.*;
+import org.jeecg.modules.entity.vo.*;
+
 import java.util.List;
 
 @Mapper
@@ -138,4 +139,16 @@ public interface SpectrumAnalysisMapper {
 
     void insertXeResult(List<GardsXeResultsSpectrum> xeResults);
 
+    String getIdAnalysisByIdAnalyst(@Param(value = "sampleId") String sampleId, @Param(value = "userName") String userName);
+
+    void deletePeaks(Integer idAnalysis);
+
+    void deleteNuclLines(Integer idAnalysis);
+
+    void deleteNucl(Integer idAnalysis);
+
+    void deleteQCCheck(Integer idAnalysis);
+
+    void deleteAnalySetting(Integer idAnalysis);
+
 }

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/GardsAnalysesManMapper.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.mapper.GardsAnalysesManMapper">
+
+    <update id="updateEntity">
+        UPDATE
+            RNMAN.GARDS_ANALYSES
+        SET ANALYSISBEGIN = to_date(#{analyses.analysisBeginStr},'yyyy/MM/dd HH:mm:ss'),
+            ANALYSISEND = to_date(#{analyses.analysisEndStr},'yyyy/MM/dd HH:mm:ss'),
+            SOFTWARE = #{analyses.software},
+            SWVERSION = #{analyses.swVersion},
+            COMMENTS = #{analyses.comments},
+            SEARCHSTARTCHANNEL = #{analyses.searchStartChannel},
+            SEARCHENDCHANNEL = #{analyses.searchEndChannel},
+            SEARCHTHRESHOLD = #{analyses.searchThreshold},
+            NUMBEROFPEAKS = #{analyses.numberOfPeaks},
+            TOTALCOUNTS = #{analyses.totalCounts},
+            BASELINE_PATH = #{analyses.baselinePath},
+            LC_PATH = #{analyses.lcPath},
+            SCAC_PATH = #{analyses.scacPath}
+        WHERE
+            IDANALYSIS = #{analyses.idAnalysis}
+    </update>
+
+</mapper>

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/SpectrumAnalysisMapper.xml

@@ -109,7 +109,7 @@
         SELECT SAMPLE_ID,NUCLIDE_NAME,CONC,CONC_ERR,MDC,LC FROM RNAUTO.GARDS_XE_RESULTS where SAMPLE_ID = #{sampleId}
     </select>
 
-    <select id="getDBSpectrumFilePath" resultType="org.jeecg.modules.base.vo.SpectrumFileRecord">
+    <select id="getDBSpectrumFilePath" resultType="org.jeecg.modules.entity.vo.SpectrumFileRecord">
         SELECT
             org_sample.SAMPLE_ID sampleId,
             org_sample.INPUT_FILE_NAME sampleFilePath,
@@ -140,7 +140,7 @@
         </where>
     </select>
 
-    <select id="viewComment" resultType="org.jeecg.modules.base.vo.CommentData">
+    <select id="viewComment" resultType="org.jeecg.modules.entity.vo.CommentData">
         SELECT A.ANALYST, A.COMMENTS FROM RNMAN.GARDS_ANALYSES A WHERE A.SAMPLE_ID= #{sampleId}
     </select>
 
@@ -222,7 +222,7 @@
         SELECT DETECTOR_CODE FROM CONFIGURATION.GARDS_DETECTORS WHERE STATION_ID = #{stationId}
     </select>
 
-    <select id="statisticsQueryNuclides" resultType="org.jeecg.modules.base.vo.StatisticsData">
+    <select id="statisticsQueryNuclides" resultType="org.jeecg.modules.entity.vo.StatisticsData">
         SELECT
             GXR.NUCLIDE_NAME,
             GSD.COLLECT_START
@@ -270,7 +270,7 @@
         order by GXR.NUCLIDE_NAME, GSD.COLLECT_START
     </select>
 
-    <select id="statisticsQueryCollection" resultType="org.jeecg.modules.base.vo.StatisticsData">
+    <select id="statisticsQueryCollection" resultType="org.jeecg.modules.entity.vo.StatisticsData">
         select
             gsd.COLLECT_START dateTime,
             round(to_number(GSD.COLLECT_STOP-GSD.COLLECT_START)*24,2) dataValue
@@ -292,7 +292,7 @@
         order by gsd.COLLECT_START
     </select>
 
-    <select id="statisticsQueryAcquisition" resultType="org.jeecg.modules.base.vo.StatisticsData">
+    <select id="statisticsQueryAcquisition" resultType="org.jeecg.modules.entity.vo.StatisticsData">
         select
             gsd.ACQUISITION_START dateTime,
             round(to_number(GSD.ACQUISITION_STOP-GSD.ACQUISITION_START)*24,2) dataValue
@@ -315,7 +315,7 @@
         order by gsd.ACQUISITION_START
     </select>
 
-    <select id="statisticsQueryXeVolumn" resultType="org.jeecg.modules.base.vo.StatisticsData">
+    <select id="statisticsQueryXeVolumn" resultType="org.jeecg.modules.entity.vo.StatisticsData">
         select
             GSD.COLLECT_START dateTime,
             GSA.XE_VOLUME dataValue
@@ -339,7 +339,7 @@
         order by gsd.COLLECT_START
     </select>
 
-    <select id="statisticsQuerySampleVolumn" resultType="org.jeecg.modules.base.vo.StatisticsData">
+    <select id="statisticsQuerySampleVolumn" resultType="org.jeecg.modules.entity.vo.StatisticsData">
         select
             GSD.COLLECT_START dateTime,
             GSD.QUANTITY dataValue
@@ -471,11 +471,11 @@
         WHERE idanalysis = #{idAnalysis}
     </select>
 
-    <select id="getNuclideLines" resultType="org.jeecg.modules.base.vo.NuclideLine">
+    <select id="getNuclideLines" resultType="org.jeecg.modules.entity.vo.NuclideLine">
         SELECT FULLNAME,ENERGY,ENERGY_UNCERT,YIELD,YIELD_UNCERT,KEY_FLAG from CONFIGURATION.GARDS_NUCL_LINES_LIB WHERE NAME = #{name} ORDER BY ENERGY
     </select>
 
-    <select id="getHalf" resultType="org.jeecg.modules.base.vo.HalfData">
+    <select id="getHalf" resultType="org.jeecg.modules.entity.vo.HalfData">
         SELECT
             NAME,
             HALFLIFE
@@ -899,4 +899,28 @@
         </foreach>
     </insert>
 
+    <select id="getIdAnalysisByIdAnalyst" resultType="java.lang.String">
+        SELECT IDANALYSIS FROM RNMAN.GARDS_ANALYSES WHERE SAMPLE_ID = #{sampleId} AND ANALYST = #{userName}
+    </select>
+
+    <delete id="deletePeaks">
+        DELETE FROM RNMAN.GARDS_PEAKS WHERE IDANALYSIS= #{idAnalysis}
+    </delete>
+
+    <delete id="deleteNuclLines">
+        DELETE FROM RNMAN.GARDS_NUCL_LINES_IDED WHERE IDANALYSIS= #{idAnalysis}
+    </delete>
+
+    <delete id="deleteNucl">
+        DELETE FROM RNMAN.GARDS_NUCL_IDED WHERE IDANALYSIS= #{idAnalysis}
+    </delete>
+
+    <delete id="deleteQCCheck">
+        DELETE FROM RNMAN.GARDS_QC_CHECK WHERE IDANALYSIS= #{idAnalysis}
+    </delete>
+
+    <delete id="deleteAnalySetting">
+        DELETE FROM RNMAN.GARDS_ANALY_SETTING WHERE IDANALYSIS= #{idAnalysis}
+    </delete>
+
 </mapper>

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/native_jni/CalValuesHandler.java

@@ -1,8 +1,8 @@
 package org.jeecg.modules.native_jni;
 
-import org.jeecg.modules.base.vo.PeakInfo;
-import org.jeecg.modules.base.vo.StructInsertInput;
-import org.jeecg.modules.base.vo.StructInsertOutput;
+import org.jeecg.modules.entity.vo.PeakInfo;
+import org.jeecg.modules.entity.vo.StructInsertInput;
+import org.jeecg.modules.entity.vo.StructInsertOutput;
 import org.jeecg.modules.native_jni.struct.CalValuesOut;
 
 import java.util.List;

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGammaService.java

@@ -1,7 +1,7 @@
 package org.jeecg.modules.service;
 
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.base.vo.*;
+import org.jeecg.modules.entity.vo.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -24,7 +24,7 @@ public interface IGammaService{
     Result getSelPosNuclide(Integer sampleId, String fileName, int channel, String nuclides, HttpServletRequest request);
 
 
-    Result nuclideReview(Integer sampleId, String fileName, Integer channel, HttpServletRequest request);
+    Result nuclideReview(Integer sampleId, String fileName, Double channel, HttpServletRequest request);
 
     Result changeNuclide(Integer sampleId, String fileName, String nuclideName);
 

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsAnalySettingSpectrumService.java

@@ -0,0 +1,11 @@
+package org.jeecg.modules.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.base.entity.rnman.GardsAnalySetting;
+import org.jeecg.modules.entity.vo.PHDFile;
+
+public interface IGardsAnalySettingSpectrumService extends IService<GardsAnalySetting> {
+
+    boolean saveAnalySettingGamma(PHDFile phd, String idAnalysis);
+
+}

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsAnalysesSpectrumService.java

@@ -0,0 +1,15 @@
+package org.jeecg.modules.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.base.entity.rnman.GardsAnalyses;
+import org.jeecg.modules.entity.vo.GStoreMiddleProcessData;
+import org.jeecg.modules.entity.vo.PHDFile;
+import org.jeecg.modules.entity.GardsAnalysesSpectrum;
+
+public interface IGardsAnalysesSpectrumService extends IService<GardsAnalyses> {
+
+    Integer insertEntity(GStoreMiddleProcessData middleData, PHDFile phd, String userName, String comments);
+
+    void updateEntity(GStoreMiddleProcessData middleData, PHDFile phd, String userName, String comments, String idAnalysis);
+
+}

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsCalibrationPairsOrigSpectrumService.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.base.entity.original.GardsCalibrationPairsOrig;
+import org.jeecg.modules.entity.vo.PHDFile;
 import org.jeecg.modules.native_jni.struct.EnergySpectrumStruct;
 
 import java.util.List;
@@ -10,4 +11,6 @@ public interface IGardsCalibrationPairsOrigSpectrumService extends IService<Gard
 
     Integer saveGardsCalibrationPairsOrig(EnergySpectrumStruct sourceData, Integer sampleId, List<String> readLines);
 
+    boolean saveCalibrationPairsOrigGamma(PHDFile phd, Integer sampleId);
+
 }

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsCalibrationPairsSpectrumService.java

@@ -0,0 +1,12 @@
+package org.jeecg.modules.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.base.entity.rnman.GardsCalibrationPairs;
+import org.jeecg.modules.entity.vo.GStoreMiddleProcessData;
+import org.jeecg.modules.entity.vo.PHDFile;
+
+public interface IGardsCalibrationPairsSpectrumService extends IService<GardsCalibrationPairs> {
+
+    boolean saveGardsCalibrationPairsGamma(GStoreMiddleProcessData middleData, Integer sampleId, String idAnalysis);
+
+}

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsCalibrationSpectrumService.java

@@ -0,0 +1,11 @@
+package org.jeecg.modules.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.base.entity.rnman.GardsCalibration;
+import org.jeecg.modules.entity.vo.GStoreMiddleProcessData;
+
+public interface IGardsCalibrationSpectrumService extends IService<GardsCalibration> {
+
+    boolean saveCalibrationGamma(GStoreMiddleProcessData middleData, Integer sampleId, String idAnalysis);
+
+}

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsNuclIdedSpectrumService.java

@@ -0,0 +1,12 @@
+package org.jeecg.modules.service;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.base.entity.rnman.GardsNuclIded;
+import org.jeecg.modules.entity.vo.GStoreMiddleProcessData;
+
+public interface IGardsNuclIdedSpectrumService extends IService<GardsNuclIded> {
+
+    boolean saveNuclIdedGamma(GStoreMiddleProcessData middleData, Integer sampleId, String idAnalysis);
+
+}

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsNuclLinesIdedSpectrumService.java

@@ -0,0 +1,11 @@
+package org.jeecg.modules.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.base.entity.rnman.GardsNuclLinesIded;
+import org.jeecg.modules.entity.vo.GStoreMiddleProcessData;
+
+public interface IGardsNuclLinesIdedSpectrumService extends IService<GardsNuclLinesIded> {
+
+    boolean saveNuclLinesIdedGamma(GStoreMiddleProcessData middleData, Integer sampleId, String idAnalysis);
+
+}

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsPeaksSpectrumService.java

@@ -0,0 +1,11 @@
+package org.jeecg.modules.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.base.entity.rnman.GardsPeaks;
+import org.jeecg.modules.entity.vo.GStoreMiddleProcessData;
+
+public interface IGardsPeaksSpectrumService extends IService<GardsPeaks> {
+
+    boolean savePeaksGamma(GStoreMiddleProcessData middleData, Integer sampleId, String idAnalysis);
+
+}

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsQcCheckSpectrumService.java

@@ -0,0 +1,12 @@
+package org.jeecg.modules.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.base.entity.rnman.GardsQcCheck;
+import org.jeecg.modules.entity.vo.GStoreMiddleProcessData;
+import org.jeecg.modules.entity.vo.PHDFile;
+
+public interface IGardsQcCheckSpectrumService extends IService<GardsQcCheck> {
+
+    boolean saveQcCheckGamma(GStoreMiddleProcessData middleData, PHDFile phd, String idAnalysis);
+
+}

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsSampleAuxSpectrumService.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.base.entity.original.GardsSampleAux;
+import org.jeecg.modules.entity.vo.PHDFile;
 import org.jeecg.modules.native_jni.struct.EnergySpectrumStruct;
 
 import java.util.List;
@@ -10,4 +11,6 @@ public interface IGardsSampleAuxSpectrumService extends IService<GardsSampleAux>
 
     Integer saveSampleAux(EnergySpectrumStruct sourceData, Integer sampleId, List<String> readLines);
 
+    boolean saveSampleAuxGamma(PHDFile phd, Integer sampleId);
+
 }

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsSampleCertLineSpectrumService.java

@@ -2,10 +2,13 @@ package org.jeecg.modules.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.base.entity.original.GardsSampleCertLine;
+import org.jeecg.modules.entity.vo.PHDFile;
 import org.jeecg.modules.native_jni.struct.EnergySpectrumStruct;
 
 public interface IGardsSampleCertLineSpectrumService extends IService<GardsSampleCertLine> {
 
     Integer saveSampleCertLine(EnergySpectrumStruct sourceData, Integer sampleId);
 
+    boolean saveSampleCertLineGamma(PHDFile phd, Integer sampleId);
+
 }

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsSampleCertSpectrumService.java

@@ -2,10 +2,13 @@ package org.jeecg.modules.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.base.entity.original.GardsSampleCert;
+import org.jeecg.modules.entity.vo.PHDFile;
 import org.jeecg.modules.native_jni.struct.EnergySpectrumStruct;
 
 public interface IGardsSampleCertSpectrumService extends IService<GardsSampleCert> {
 
     Integer saveSampleCert(EnergySpectrumStruct sourceData, Integer sampleId);
 
+    boolean saveSampleCertGamma(PHDFile phd, Integer sampleId);
+
 }

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsSampleDataSpectrumService.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.base.entity.original.GardsSampleData;
+import org.jeecg.modules.entity.vo.PHDFile;
 import org.jeecg.modules.native_jni.struct.EnergySpectrumStruct;
 
 import java.util.List;
@@ -10,4 +11,6 @@ public interface IGardsSampleDataSpectrumService extends IService<GardsSampleDat
 
     Integer saveSampleData(EnergySpectrumStruct sourceData, Integer stationId, Integer detectorId, String filePathName, List<String> readLines);
 
+    boolean saveSampleDataGamma(PHDFile phd, String input_file_name, Integer station_id, Integer detect_id);
+
 }

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsSampleDescriptionSpectrumService.java

@@ -2,10 +2,13 @@ package org.jeecg.modules.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.base.entity.original.GardsSampleDescription;
+import org.jeecg.modules.entity.vo.PHDFile;
 import org.jeecg.modules.native_jni.struct.EnergySpectrumStruct;
 
 public interface IGardsSampleDescriptionSpectrumService extends IService<GardsSampleDescription> {
 
     Integer saveSampleDescription(EnergySpectrumStruct sourceData, Integer sampleId);
 
+    boolean saveSampleDescriptionGamma(PHDFile phd, Integer sampleId);
+
 }

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsSpectrumSpectrumService.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.base.entity.original.GardsSpectrum;
+import org.jeecg.modules.entity.vo.PHDFile;
 import org.jeecg.modules.native_jni.struct.EnergySpectrumStruct;
 
 import java.util.List;
@@ -10,4 +11,6 @@ public interface IGardsSpectrumSpectrumService extends IService<GardsSpectrum> {
 
     Integer saveSpectrum(EnergySpectrumStruct sourceData, Integer sampleId, List<String> readLines, String filePathName);
 
+    boolean saveSpectrumGamma(PHDFile phd, Integer sampleId, String input_file_name);
+
 }

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsTotalEfficiencyPairsSpectrumService.java

@@ -2,10 +2,13 @@ package org.jeecg.modules.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.base.entity.original.GardsTotalEfficiencyPairs;
+import org.jeecg.modules.entity.vo.PHDFile;
 import org.jeecg.modules.native_jni.struct.EnergySpectrumStruct;
 
 public interface IGardsTotalEfficiencyPairsSpectrumService extends IService<GardsTotalEfficiencyPairs> {
 
     Integer saveTotalEfficiencyPairs(EnergySpectrumStruct sourceData, Integer sampleId);
 
+    boolean saveTotalEfficiencyPairsGamma(PHDFile phd, Integer sampleId);
+
 }

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISpectrumAnalysisService.java

@@ -3,7 +3,7 @@ package org.jeecg.modules.service;
 import org.jeecg.common.api.QueryRequest;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.entity.GardsSampleDataSpectrum;
-import org.jeecg.modules.base.vo.*;
+import org.jeecg.modules.entity.vo.*;
 import org.jeecg.modules.entity.vo.BgDataAnlyseResultIn;
 
 import javax.servlet.http.HttpServletRequest;