From 12f2f1e23e1f6b84d8ffe194bbb6ff7f5f2a82e6 Mon Sep 17 00:00:00 2001
From: qiaoqinzheng <qiaoqinzheng@hivekion.com>
Date: Wed, 7 Feb 2024 12:29:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=B7=A5=E4=BA=A4=E4=BA=92=E5=AD=98?=
 =?UTF-8?q?=E5=82=A8=E5=85=AC=E5=BC=8F=E6=95=B0=E6=8D=AE=EF=BC=8Cdet?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=AD=98=E5=82=A8=E7=9A=84=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SpectrumAnalysisServiceImpl.java     | 64 +++++++++----------
 1 file changed, 31 insertions(+), 33 deletions(-)

diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java
index 03765e22..1c289c2f 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java
@@ -469,8 +469,6 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
                         }
                         //给公用变量赋值sampleId
                         betaDataFile.setSampleId(String.valueOf(sampleId));
-                        //用于记录文件路径信息
-                        List<String> filePaths = new LinkedList<>();
                         //判断sample信息是否存在
                         if (Objects.nonNull(sample)) {
                             betaDataFile.setSampleFilePathName(ftpUtil.getFtpRootPath() + spectrumPathProperties.getSaveFilePath() + StringPool.SLASH +dbSpectrumFilePath.getSampleFilePath());
@@ -933,9 +931,9 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
         if (betaDataFile.isSaveAnalysisResult()) {
             //对分析后的内容进行数据获取
             List<GardsROIChannelsSpectrum> channelsSpectrums =  betaDataFile.getRoiChannelsSpectrumList();
-            List<GardsROIChannelsSpectrum> roiChannelsSpectrumsSample = channelsSpectrums.stream().filter(item -> item.getDataType().equalsIgnoreCase("S")).collect(Collectors.toList());
-            List<GardsROIChannelsSpectrum> roiChannelsSpectrumsGas = channelsSpectrums.stream().filter(item -> item.getDataType().equalsIgnoreCase("G")).collect(Collectors.toList());
-            List<GardsROIChannelsSpectrum> roiChannelsSpectrumsDet = channelsSpectrums.stream().filter(item -> item.getDataType().equalsIgnoreCase("D")).collect(Collectors.toList());
+            List<GardsROIChannelsSpectrum> roiChannelsSpectrumsSample = channelsSpectrums.stream().filter(item -> item.getDataType().equalsIgnoreCase(DataTypeAbbr.SAMPLEPHD.getType())).collect(Collectors.toList());
+            List<GardsROIChannelsSpectrum> roiChannelsSpectrumsGas = channelsSpectrums.stream().filter(item -> item.getDataType().equalsIgnoreCase(DataTypeAbbr.GASBKPHD.getType())).collect(Collectors.toList());
+            List<GardsROIChannelsSpectrum> roiChannelsSpectrumsDet = channelsSpectrums.stream().filter(item -> item.getDataType().equalsIgnoreCase(DataTypeAbbr.DETBKPHD.getType())).collect(Collectors.toList());
             List<GardsROIResultsSpectrum> resultsSpectrums =  betaDataFile.getRoiResultsSpectrumList();
             List<GardsXeResultsSpectrum> xeResultsSpectrums =  betaDataFile.getXeResultsSpectrumList();
             for (int i=0; i<xeResultsSpectrums.size(); i++) {
@@ -949,20 +947,20 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
             List<GardsCalibrationSpectrum> gammaCalibrationParamList = betaDataFile.getGammaCalibrationSpectrumList();
             List<GardsCalibrationSpectrum> gammaCalibrationSpectrumEList = betaDataFile.getGammaCalibrationSpectrumEList();
             for (int i=0; i<gammaCalibrationParamList.size(); i++) {
-                if (gammaCalibrationParamList.get(i).getDataType().equals("S")) {
+                if (gammaCalibrationParamList.get(i).getDataType().equals(DataTypeAbbr.SAMPLEPHD.getType())) {
                     gammaCalibrationParamS = gammaCalibrationParamList.get(i);
-                } else if (gammaCalibrationParamList.get(i).getDataType().equals("G")) {
+                } else if (gammaCalibrationParamList.get(i).getDataType().equals(DataTypeAbbr.GASBKPHD.getType())) {
                     gammaCalibrationParamG = gammaCalibrationParamList.get(i);
-                } else if (gammaCalibrationParamList.get(i).getDataType().equals("D")) {
+                } else if (gammaCalibrationParamList.get(i).getDataType().equals(DataTypeAbbr.DETBKPHD.getType())) {
                     gammaCalibrationParamD = gammaCalibrationParamList.get(i);
                 }
             }
             for (int i=0; i<gammaCalibrationSpectrumEList.size(); i++) {
-                if (gammaCalibrationSpectrumEList.get(i).getDataType().equals("S")) {
+                if (gammaCalibrationSpectrumEList.get(i).getDataType().equals(DataTypeAbbr.SAMPLEPHD.getType())) {
                     gammaCalibrationParamES = gammaCalibrationSpectrumEList.get(i);
-                } else if (gammaCalibrationSpectrumEList.get(i).getDataType().equals("G")) {
+                } else if (gammaCalibrationSpectrumEList.get(i).getDataType().equals(DataTypeAbbr.GASBKPHD.getType())) {
                     gammaCalibrationParamEG = gammaCalibrationSpectrumEList.get(i);
-                } else if (gammaCalibrationSpectrumEList.get(i).getDataType().equals("D")) {
+                } else if (gammaCalibrationSpectrumEList.get(i).getDataType().equals(DataTypeAbbr.DETBKPHD.getType())) {
                     gammaCalibrationParamED = gammaCalibrationSpectrumEList.get(i);
                 }
             }
@@ -970,20 +968,20 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
             List<GardsCalibrationSpectrum> betaCalibrationParamList = betaDataFile.getBetaCalibrationSpectrumList();
             List<GardsCalibrationSpectrum> betaCalibrationSpectrumEList = betaDataFile.getBetaCalibrationSpectrumEList();
             for (int i=0; i<betaCalibrationParamList.size(); i++) {
-                if (betaCalibrationParamList.get(i).getDataType().equals("S")) {
+                if (betaCalibrationParamList.get(i).getDataType().equals(DataTypeAbbr.SAMPLEPHD.getType())) {
                     betaCalibrationParamS = betaCalibrationParamList.get(i);
-                } else if (betaCalibrationParamList.get(i).getDataType().equals("G")) {
+                } else if (betaCalibrationParamList.get(i).getDataType().equals(DataTypeAbbr.GASBKPHD.getType())) {
                     betaCalibrationParamG = betaCalibrationParamList.get(i);
-                } else if (betaCalibrationParamList.get(i).getDataType().equals("D")) {
+                } else if (betaCalibrationParamList.get(i).getDataType().equals(DataTypeAbbr.DETBKPHD.getType())) {
                     betaCalibrationParamD = betaCalibrationParamList.get(i);
                 }
             }
             for (int i=0; i<betaCalibrationSpectrumEList.size(); i++) {
-                if (betaCalibrationSpectrumEList.get(i).getDataType().equals("S")) {
+                if (betaCalibrationSpectrumEList.get(i).getDataType().equals(DataTypeAbbr.SAMPLEPHD.getType())) {
                     betaCalibrationParamES = betaCalibrationSpectrumEList.get(i);
-                } else if (betaCalibrationSpectrumEList.get(i).getDataType().equals("G")) {
+                } else if (betaCalibrationSpectrumEList.get(i).getDataType().equals(DataTypeAbbr.GASBKPHD.getType())) {
                     betaCalibrationParamEG = betaCalibrationSpectrumEList.get(i);
-                } else if (betaCalibrationSpectrumEList.get(i).getDataType().equals("D")) {
+                } else if (betaCalibrationSpectrumEList.get(i).getDataType().equals(DataTypeAbbr.DETBKPHD.getType())) {
                     betaCalibrationParamED = betaCalibrationSpectrumEList.get(i);
                 }
             }
@@ -4333,9 +4331,9 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
         if (betaDataFile.isSaveAnalysisResult()) {
             //对分析后的内容进行数据获取
             List<GardsROIChannelsSpectrum> channelsSpectrums =  betaDataFile.getRoiChannelsSpectrumList();
-            List<GardsROIChannelsSpectrum> roiChannelsSpectrumsSample = channelsSpectrums.stream().filter(item -> item.getDataType().equalsIgnoreCase("S")).collect(Collectors.toList());
-            List<GardsROIChannelsSpectrum> roiChannelsSpectrumsGas = channelsSpectrums.stream().filter(item -> item.getDataType().equalsIgnoreCase("G")).collect(Collectors.toList());
-            List<GardsROIChannelsSpectrum> roiChannelsSpectrumsDet = channelsSpectrums.stream().filter(item -> item.getDataType().equalsIgnoreCase("D")).collect(Collectors.toList());
+            List<GardsROIChannelsSpectrum> roiChannelsSpectrumsSample = channelsSpectrums.stream().filter(item -> item.getDataType().equalsIgnoreCase(DataTypeAbbr.SAMPLEPHD.getType())).collect(Collectors.toList());
+            List<GardsROIChannelsSpectrum> roiChannelsSpectrumsGas = channelsSpectrums.stream().filter(item -> item.getDataType().equalsIgnoreCase(DataTypeAbbr.GASBKPHD.getType())).collect(Collectors.toList());
+            List<GardsROIChannelsSpectrum> roiChannelsSpectrumsDet = channelsSpectrums.stream().filter(item -> item.getDataType().equalsIgnoreCase(DataTypeAbbr.DETBKPHD.getType())).collect(Collectors.toList());
             List<GardsROIResultsSpectrum> resultsSpectrums =  betaDataFile.getRoiResultsSpectrumList();
             List<GardsXeResultsSpectrum> xeResultsSpectrums =  betaDataFile.getXeResultsSpectrumList();
             for (int i=0; i<xeResultsSpectrums.size(); i++) {
@@ -4349,20 +4347,20 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
             List<GardsCalibrationSpectrum> gammaCalibrationParamList = betaDataFile.getGammaCalibrationSpectrumList();
             List<GardsCalibrationSpectrum> gammaCalibrationSpectrumEList = betaDataFile.getGammaCalibrationSpectrumEList();
             for (int i=0; i<gammaCalibrationParamList.size(); i++) {
-                if (gammaCalibrationParamList.get(i).getDataType().equals("S")) {
+                if (gammaCalibrationParamList.get(i).getDataType().equals(DataTypeAbbr.SAMPLEPHD.getType())) {
                     gammaCalibrationParamS = gammaCalibrationParamList.get(i);
-                } else if (gammaCalibrationParamList.get(i).getDataType().equals("G")) {
+                } else if (gammaCalibrationParamList.get(i).getDataType().equals(DataTypeAbbr.GASBKPHD.getType())) {
                     gammaCalibrationParamG = gammaCalibrationParamList.get(i);
-                } else if (gammaCalibrationParamList.get(i).getDataType().equals("D")) {
+                } else if (gammaCalibrationParamList.get(i).getDataType().equals(DataTypeAbbr.DETBKPHD.getType())) {
                     gammaCalibrationParamD = gammaCalibrationParamList.get(i);
                 }
             }
             for (int i=0; i<gammaCalibrationSpectrumEList.size(); i++) {
-                if (gammaCalibrationSpectrumEList.get(i).getDataType().equals("S")) {
+                if (gammaCalibrationSpectrumEList.get(i).getDataType().equals(DataTypeAbbr.SAMPLEPHD.getType())) {
                     gammaCalibrationParamES = gammaCalibrationSpectrumEList.get(i);
-                } else if (gammaCalibrationSpectrumEList.get(i).getDataType().equals("G")) {
+                } else if (gammaCalibrationSpectrumEList.get(i).getDataType().equals(DataTypeAbbr.GASBKPHD.getType())) {
                     gammaCalibrationParamEG = gammaCalibrationSpectrumEList.get(i);
-                } else if (gammaCalibrationSpectrumEList.get(i).getDataType().equals("D")) {
+                } else if (gammaCalibrationSpectrumEList.get(i).getDataType().equals(DataTypeAbbr.DETBKPHD.getType())) {
                     gammaCalibrationParamED = gammaCalibrationSpectrumEList.get(i);
                 }
             }
@@ -4370,20 +4368,20 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
             List<GardsCalibrationSpectrum> betaCalibrationParamList = betaDataFile.getBetaCalibrationSpectrumList();
             List<GardsCalibrationSpectrum> betaCalibrationSpectrumEList = betaDataFile.getBetaCalibrationSpectrumEList();
             for (int i=0; i<betaCalibrationParamList.size(); i++) {
-                if (betaCalibrationParamList.get(i).getDataType().equals("S")) {
+                if (betaCalibrationParamList.get(i).getDataType().equals(DataTypeAbbr.SAMPLEPHD.getType())) {
                     betaCalibrationParamS = betaCalibrationParamList.get(i);
-                } else if (betaCalibrationParamList.get(i).getDataType().equals("G")) {
+                } else if (betaCalibrationParamList.get(i).getDataType().equals(DataTypeAbbr.GASBKPHD.getType())) {
                     betaCalibrationParamG = betaCalibrationParamList.get(i);
-                } else if (betaCalibrationParamList.get(i).getDataType().equals("D")) {
+                } else if (betaCalibrationParamList.get(i).getDataType().equals(DataTypeAbbr.DETBKPHD.getType())) {
                     betaCalibrationParamD = betaCalibrationParamList.get(i);
                 }
             }
             for (int i=0; i<betaCalibrationSpectrumEList.size(); i++) {
-                if (betaCalibrationSpectrumEList.get(i).getDataType().equals("S")) {
+                if (betaCalibrationSpectrumEList.get(i).getDataType().equals(DataTypeAbbr.SAMPLEPHD.getType())) {
                     betaCalibrationParamES = betaCalibrationSpectrumEList.get(i);
-                } else if (betaCalibrationSpectrumEList.get(i).getDataType().equals("G")) {
+                } else if (betaCalibrationSpectrumEList.get(i).getDataType().equals(DataTypeAbbr.GASBKPHD.getType())) {
                     betaCalibrationParamEG = betaCalibrationSpectrumEList.get(i);
-                } else if (betaCalibrationSpectrumEList.get(i).getDataType().equals("D")) {
+                } else if (betaCalibrationSpectrumEList.get(i).getDataType().equals(DataTypeAbbr.DETBKPHD.getType())) {
                     betaCalibrationParamED = betaCalibrationSpectrumEList.get(i);
                 }
             }
@@ -5702,7 +5700,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
             GardsCalibration calibrationG = new GardsCalibration();
             calibrationG.setSampleId(gasId);
             calibrationG.setIdAnalysis(idAnalysis);
-            calibrationG.setSampleType(SystemType.BETA.getType());
+            calibrationG.setSampleType(SystemType.GAMMA.getType());
             calibrationG.setCalType(CalType.ENERGY_CAL.getType());
             calibrationG.setFunction(FittingType.POLY2.getCode());
             calibrationG.setFunctionDef(FittingType.POLY2.getDescription());