From 07e872718a926aa27ba31e097631f700ff600e13 Mon Sep 17 00:00:00 2001
From: qiaoqinzheng <qiaoqinzheng@hivekion.com>
Date: Tue, 26 Sep 2023 16:54:05 +0800
Subject: [PATCH] =?UTF-8?q?GardsNuclLinesIded=E5=AD=97=E6=AE=B5=E4=B8=8E?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E5=AF=B9=E5=BA=94=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=20Gamma=E9=A1=B5=E9=9D=A2save=20To=20DB?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E9=83=A8=E5=88=86=E5=AD=98=E5=82=A8=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E4=BF=AE=E6=94=B9=20GammaFileUtil=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=8F=91=E7=94=9F=E6=94=B9=E5=8F=98=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E8=BF=98=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/entity/rnman/GardsNuclLinesIded.java |  2 +-
 .../org/jeecg/common/util/GammaFileUtil.java  |  3 +-
 ...librationPairsOrigSpectrumServiceImpl.java | 96 ++++++++++---------
 .../GardsNuclIdedSpectrumServiceImpl.java     | 13 ++-
 .../impl/GardsPeaksSpectrumServiceImpl.java   |  8 +-
 ...talEfficiencyPairsSpectrumServiceImpl.java | 28 +++---
 6 files changed, 78 insertions(+), 72 deletions(-)

diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsNuclLinesIded.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsNuclLinesIded.java
index 036063cb..65ac9d67 100644
--- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsNuclLinesIded.java
+++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsNuclLinesIded.java
@@ -35,7 +35,7 @@ public class GardsNuclLinesIded implements Serializable {
     /**
      *  核素名称
      */
-    @TableField(value = "NUCLIDE_NAME")
+    @TableField(value = "NUCLIDENAME")
     private String nuclideName;
 
     @TableField(value = "MODDATE")
diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/GammaFileUtil.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/GammaFileUtil.java
index 3696217d..a8a8d7b6 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/GammaFileUtil.java
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/GammaFileUtil.java
@@ -1934,8 +1934,7 @@ public class GammaFileUtil {
                 return -1;
             }
         }
-        //return 0;
-        return 1;
+        return 0;
     }
 
     public void UpdateEfficiency(PHDFile phd) {
diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsCalibrationPairsOrigSpectrumServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsCalibrationPairsOrigSpectrumServiceImpl.java
index e1a61e64..41f335e4 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsCalibrationPairsOrigSpectrumServiceImpl.java
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsCalibrationPairsOrigSpectrumServiceImpl.java
@@ -112,57 +112,63 @@ public class GardsCalibrationPairsOrigSpectrumServiceImpl extends ServiceImpl<Ga
     @Transactional
     public Integer saveCalibrationPairsOrigGamma(PHDFile phd, Integer sampleId) {
         List<GardsCalibrationPairsOrig> calibrationPairsOrigList = new LinkedList<>();
-        if (Objects.nonNull(phd.getMapEnerKD().get(CalName.CalPHD.getType()).getG_energy())) {
-            int t_size = phd.getMapEnerKD().get(CalName.CalPHD.getType()).getG_energy().size();
-            if(t_size > 0) {
-                GEnergyBlock g_ener = phd.getMapEnerKD().get(CalName.CalPHD.getType());
-                for (int i=0; i<t_size; i++) {
-                    GardsCalibrationPairsOrig calibrationPairsOrig = new GardsCalibrationPairsOrig();
-                    calibrationPairsOrig.setSampleId(sampleId);
-                    calibrationPairsOrig.setSampleType(SystemType.GAMMA.getType());
-                    calibrationPairsOrig.setCaltype(CalType.ENERGY_CAL.getType());
-                    calibrationPairsOrig.setInput(CalName.CalPHD.getType());
-                    calibrationPairsOrig.setIdCalPoint(i);
-                    calibrationPairsOrig.setXValue(g_ener.getCentroid_channel().get(i));
-                    calibrationPairsOrig.setYValue(g_ener.getG_energy().get(i));
-                    calibrationPairsOrig.setUncYValue(g_ener.getUncertainty().get(i));
-                    calibrationPairsOrigList.add(calibrationPairsOrig);
+        if (CollectionUtils.isNotEmpty(phd.getMapEnerKD())) {
+            if (Objects.nonNull(phd.getMapEnerKD().get(CalName.CalPHD.getType()).getG_energy())) {
+                int t_size = phd.getMapEnerKD().get(CalName.CalPHD.getType()).getG_energy().size();
+                if(t_size > 0) {
+                    GEnergyBlock g_ener = phd.getMapEnerKD().get(CalName.CalPHD.getType());
+                    for (int i=0; i<t_size; i++) {
+                        GardsCalibrationPairsOrig calibrationPairsOrig = new GardsCalibrationPairsOrig();
+                        calibrationPairsOrig.setSampleId(sampleId);
+                        calibrationPairsOrig.setSampleType(SystemType.GAMMA.getType());
+                        calibrationPairsOrig.setCaltype(CalType.ENERGY_CAL.getType());
+                        calibrationPairsOrig.setInput(CalName.CalPHD.getType());
+                        calibrationPairsOrig.setIdCalPoint(i);
+                        calibrationPairsOrig.setXValue(g_ener.getCentroid_channel().get(i));
+                        calibrationPairsOrig.setYValue(g_ener.getG_energy().get(i));
+                        calibrationPairsOrig.setUncYValue(g_ener.getUncertainty().get(i));
+                        calibrationPairsOrigList.add(calibrationPairsOrig);
+                    }
                 }
             }
         }
-        if (Objects.nonNull(phd.getMapResoKD().get(CalName.CalPHD.getType()).getG_energy())) {
-            int t_size = phd.getMapResoKD().get(CalName.CalPHD.getType()).getG_energy().size();
-            if(t_size > 0) {
-                GResolutionBlock g_reso = phd.getMapResoKD().get(CalName.CalPHD.getType());
-                for (int i=0; i<t_size; i++) {
-                    GardsCalibrationPairsOrig calibrationPairsOrig = new GardsCalibrationPairsOrig();
-                    calibrationPairsOrig.setSampleId(sampleId);
-                    calibrationPairsOrig.setSampleType(SystemType.GAMMA.getType());
-                    calibrationPairsOrig.setCaltype(CalType.RESOLUTION_CAL.getType());
-                    calibrationPairsOrig.setInput(CalName.CalPHD.getType());
-                    calibrationPairsOrig.setIdCalPoint(i);
-                    calibrationPairsOrig.setXValue(g_reso.getG_energy().get(i));
-                    calibrationPairsOrig.setYValue(g_reso.getFWHM().get(i));
-                    calibrationPairsOrig.setUncYValue(g_reso.getUncertainty().get(i));
-                    calibrationPairsOrigList.add(calibrationPairsOrig);
+        if (CollectionUtils.isNotEmpty(phd.getMapResoKD())) {
+            if (Objects.nonNull(phd.getMapResoKD().get(CalName.CalPHD.getType()).getG_energy())) {
+                int t_size = phd.getMapResoKD().get(CalName.CalPHD.getType()).getG_energy().size();
+                if(t_size > 0) {
+                    GResolutionBlock g_reso = phd.getMapResoKD().get(CalName.CalPHD.getType());
+                    for (int i=0; i<t_size; i++) {
+                        GardsCalibrationPairsOrig calibrationPairsOrig = new GardsCalibrationPairsOrig();
+                        calibrationPairsOrig.setSampleId(sampleId);
+                        calibrationPairsOrig.setSampleType(SystemType.GAMMA.getType());
+                        calibrationPairsOrig.setCaltype(CalType.RESOLUTION_CAL.getType());
+                        calibrationPairsOrig.setInput(CalName.CalPHD.getType());
+                        calibrationPairsOrig.setIdCalPoint(i);
+                        calibrationPairsOrig.setXValue(g_reso.getG_energy().get(i));
+                        calibrationPairsOrig.setYValue(g_reso.getFWHM().get(i));
+                        calibrationPairsOrig.setUncYValue(g_reso.getUncertainty().get(i));
+                        calibrationPairsOrigList.add(calibrationPairsOrig);
+                    }
                 }
             }
         }
-        if (Objects.nonNull(phd.getMapEffiKD().get(CalName.CalPHD.getType()).getG_energy())) {
-            int t_size = phd.getMapEffiKD().get(CalName.CalPHD.getType()).getG_energy().size();
-            if(t_size > 0) {
-                GEfficiencyBlock g_effi = phd.getMapEffiKD().get(CalName.CalPHD.getType());
-                for (int i=0; i<t_size; i++){
-                    GardsCalibrationPairsOrig calibrationPairsOrig = new GardsCalibrationPairsOrig();
-                    calibrationPairsOrig.setSampleId(sampleId);
-                    calibrationPairsOrig.setSampleType(SystemType.GAMMA.getType());
-                    calibrationPairsOrig.setCaltype(CalType.EFFICIENCY_CAL.getType());
-                    calibrationPairsOrig.setInput(CalName.CalPHD.getType());
-                    calibrationPairsOrig.setIdCalPoint(i);
-                    calibrationPairsOrig.setXValue(g_effi.getG_energy().get(i));
-                    calibrationPairsOrig.setYValue(g_effi.getEfficiency().get(i));
-                    calibrationPairsOrig.setUncYValue(g_effi.getUncertainty().get(i));
-                    calibrationPairsOrigList.add(calibrationPairsOrig);
+        if (CollectionUtils.isNotEmpty(phd.getMapEffiKD())) {
+            if (Objects.nonNull(phd.getMapEffiKD().get(CalName.CalPHD.getType()).getG_energy())) {
+                int t_size = phd.getMapEffiKD().get(CalName.CalPHD.getType()).getG_energy().size();
+                if(t_size > 0) {
+                    GEfficiencyBlock g_effi = phd.getMapEffiKD().get(CalName.CalPHD.getType());
+                    for (int i=0; i<t_size; i++){
+                        GardsCalibrationPairsOrig calibrationPairsOrig = new GardsCalibrationPairsOrig();
+                        calibrationPairsOrig.setSampleId(sampleId);
+                        calibrationPairsOrig.setSampleType(SystemType.GAMMA.getType());
+                        calibrationPairsOrig.setCaltype(CalType.EFFICIENCY_CAL.getType());
+                        calibrationPairsOrig.setInput(CalName.CalPHD.getType());
+                        calibrationPairsOrig.setIdCalPoint(i);
+                        calibrationPairsOrig.setXValue(g_effi.getG_energy().get(i));
+                        calibrationPairsOrig.setYValue(g_effi.getEfficiency().get(i));
+                        calibrationPairsOrig.setUncYValue(g_effi.getUncertainty().get(i));
+                        calibrationPairsOrigList.add(calibrationPairsOrig);
+                    }
                 }
             }
         }
diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsNuclIdedSpectrumServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsNuclIdedSpectrumServiceImpl.java
index 302365f7..439d9de3 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsNuclIdedSpectrumServiceImpl.java
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsNuclIdedSpectrumServiceImpl.java
@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.modules.base.entity.rnman.GardsNuclIded;
 import org.jeecg.modules.entity.vo.GStoreMiddleProcessData;
-import org.jeecg.modules.entity.GardsNuclIdedSpectrum;
 import org.jeecg.modules.mapper.GardsNuclIdedSpectrumMapper;
 import org.jeecg.modules.service.IGardsNuclIdedSpectrumService;
 import org.springframework.stereotype.Service;
@@ -30,18 +29,18 @@ public class GardsNuclIdedSpectrumServiceImpl extends ServiceImpl<GardsNuclIdedS
                 nuclIded.setSampleId(sampleId);
                 nuclIded.setIdAnalysis(Integer.valueOf(idAnalysis));
                 nuclIded.setNuclideName(middleData.nucl_ided_Nuclidename.get(i));
-                nuclIded.setType(middleData.nucl_ided_Type.get(i));
+                nuclIded.setType(null);
                 nuclIded.setHalflife(middleData.nucl_ided_Halflife.get(i));
-                nuclIded.setAveActiv(middleData.nucl_ided_ave_activ.get(i));
-                nuclIded.setAveActivErr(Double.valueOf(middleData.nucl_ided_ave_activ_err.get(i)));
+                nuclIded.setAveActiv(null);
+                nuclIded.setAveActivErr(null);
                 nuclIded.setActivKey(Double.valueOf(middleData.nucl_ided_activ_key.get(i)));
                 nuclIded.setActivKeyErr(Double.valueOf(middleData.nucl_ided_activ_key_err.get(i)));
                 nuclIded.setMda(middleData.nucl_ided_mda.get(i));
-                nuclIded.setMdaErr(Double.valueOf(middleData.nucl_ided_mda_err.get(i)));
-                nuclIded.setNidFlag(Integer.valueOf(middleData.nucl_ided_nid_flag.get(i)));
+                nuclIded.setMdaErr(null);
+                nuclIded.setNidFlag(null);
                 nuclIded.setCscRatio(Double.valueOf(middleData.nucl_ided_csc_ratio.get(i)));
                 nuclIded.setCscRatioErr(Double.valueOf(middleData.nucl_ided_csc_ratio_err.get(i)));
-                nuclIded.setCscModFlag(Integer.valueOf(middleData.nucl_ided_csc_mod_flag.get(i)));
+                nuclIded.setCscModFlag(null);
                 nuclIded.setMdc(middleData.nucl_ided_MDC.get(i));
                 nuclIded.setConcentration(middleData.nucl_ided_Concentration.get(i));
                 nuclIded.setKeyEnergy(middleData.nucl_ided_Key_Energy.get(i));
diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsPeaksSpectrumServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsPeaksSpectrumServiceImpl.java
index bee934a0..911d4595 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsPeaksSpectrumServiceImpl.java
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsPeaksSpectrumServiceImpl.java
@@ -49,15 +49,15 @@ public class GardsPeaksSpectrumServiceImpl extends ServiceImpl<GardsPeaksSpectru
                 peaks.setUpperTail(Double.valueOf(middleData.peaks_upperTail.get(i)));
                 peaks.setUpperTailAlpha(Double.valueOf(middleData.peaks_upperTailAlpha.get(i)));
                 peaks.setBwwidthchan(Double.valueOf(middleData.peaks_BWWidthChan.get(i)));
-                peaks.setRecoilbetachan(Double.valueOf(middleData.peaks_recoilBetaChan.get(i)));
-                peaks.setRecoildeltachan(Double.valueOf(middleData.peaks_recoilDeltaChan.get(i)));
+                peaks.setRecoilbetachan(null);
+                peaks.setRecoildeltachan(null);
                 peaks.setStepraio(Double.valueOf(middleData.peaks_stepRatio.get(i)));
                 peaks.setBackgroundarea(Double.valueOf(middleData.peaks_backgroundArea.get(i)));
                 peaks.setMeanbackcount(Double.valueOf(middleData.peaks_meanBackCount.get(i)));
                 peaks.setLc(Double.valueOf(middleData.peaks_Lc.get(i)));
                 peaks.setLd(Double.valueOf(middleData.peaks_Ld.get(i)));
-                peaks.setNetCountRate(Double.valueOf(middleData.peaks_netCountRate.get(i)));
-                peaks.setUncNetCountRate(Double.valueOf(middleData.peaks_uncNetCountRate.get(i)));
+                peaks.setNetCountRate(null);
+                peaks.setUncNetCountRate(null);
                 peaks.setPeakcomments(middleData.peaks_comments.get(i));
                 peaksList.add(peaks);
             }
diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsTotalEfficiencyPairsSpectrumServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsTotalEfficiencyPairsSpectrumServiceImpl.java
index ab1ec118..a5fb09d2 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsTotalEfficiencyPairsSpectrumServiceImpl.java
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsTotalEfficiencyPairsSpectrumServiceImpl.java
@@ -43,20 +43,22 @@ public class GardsTotalEfficiencyPairsSpectrumServiceImpl extends ServiceImpl<Ga
     @Transactional
     public Integer saveTotalEfficiencyPairsGamma(PHDFile phd, Integer sampleId) {
         List<GardsTotalEfficiencyPairs> totalEfficiencyPairsList = new LinkedList<>();
-        int t_size = Objects.nonNull(phd.getMapTotEKD().get(CalName.CalPHD.getType()).getG_energy())?phd.getMapTotEKD().get(CalName.CalPHD.getType()).getG_energy().size():0;
-        if(t_size > 0) {
-            TotaleffBlock g_tote = phd.getMapTotEKD().get(CalName.CalPHD.getType());
-            for (int i=0; i<t_size; i++){
-                GardsTotalEfficiencyPairs totalEfficiencyPairs = new GardsTotalEfficiencyPairs();
-                totalEfficiencyPairs.setSampleId(sampleId);
-                totalEfficiencyPairs.setEfficEnergy(String.valueOf(g_tote.getG_energy().get(i)));
-                totalEfficiencyPairs.setTotalEfficiency(g_tote.getTotal_efficiency().get(i));
-                totalEfficiencyPairs.setTotalEfficError(g_tote.getUncertainty().get(i));
-                totalEfficiencyPairsList.add(totalEfficiencyPairs);
+        if (CollectionUtils.isNotEmpty(phd.getMapTotEKD())) {
+            int t_size = Objects.nonNull(phd.getMapTotEKD().get(CalName.CalPHD.getType()).getG_energy())?phd.getMapTotEKD().get(CalName.CalPHD.getType()).getG_energy().size():0;
+            if(t_size > 0) {
+                TotaleffBlock g_tote = phd.getMapTotEKD().get(CalName.CalPHD.getType());
+                for (int i=0; i<t_size; i++){
+                    GardsTotalEfficiencyPairs totalEfficiencyPairs = new GardsTotalEfficiencyPairs();
+                    totalEfficiencyPairs.setSampleId(sampleId);
+                    totalEfficiencyPairs.setEfficEnergy(String.valueOf(g_tote.getG_energy().get(i)));
+                    totalEfficiencyPairs.setTotalEfficiency(g_tote.getTotal_efficiency().get(i));
+                    totalEfficiencyPairs.setTotalEfficError(g_tote.getUncertainty().get(i));
+                    totalEfficiencyPairsList.add(totalEfficiencyPairs);
+                }
+            }
+            if (CollectionUtils.isNotEmpty(totalEfficiencyPairsList)) {
+                this.saveBatch(totalEfficiencyPairsList);
             }
-        }
-        if (CollectionUtils.isNotEmpty(totalEfficiencyPairsList)) {
-            this.saveBatch(totalEfficiencyPairsList);
         }
         return totalEfficiencyPairsList.size();
     }