From 781d2892624ad5a52ff95c8acef5aa109d03d26f Mon Sep 17 00:00:00 2001
From: qiaoqinzheng <qiaoqinzheng@hivekion.com>
Date: Thu, 16 Nov 2023 18:15:08 +0800
Subject: [PATCH] =?UTF-8?q?beta=E5=88=86=E6=9E=90=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B=E6=9B=B4=E6=96=B0=E8=BE=B9?=
 =?UTF-8?q?=E7=95=8C=E5=80=BC=EF=BC=8C=E4=B8=8D=E6=9B=B4=E6=96=B0XeData?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/jeecg/common/util/PHDFileUtil.java    | 38 ++++++++++++++++++-
 .../impl/SpectrumAnalysisServiceImpl.java     | 14 +++----
 2 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/PHDFileUtil.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/PHDFileUtil.java
index adf82185..47c0697b 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/PHDFileUtil.java
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/PHDFileUtil.java
@@ -679,7 +679,43 @@ public class PHDFileUtil extends AbstractLogOrReport {
             analyseResult = EnergySpectrumHandler.bgReAnalyse(sampleTmp.getAbsolutePath(), gasTmp.getAbsolutePath(), detTmp.getAbsolutePath(), BgCalPara);
         }
         if (StringUtils.isNotBlank(analyseResult.error_log) && !analyseResult.error_log.equalsIgnoreCase("no error.")) {
-            System.out.println(analyseResult.error_log);
+            //新计算得到的边界值
+            if (CollectionUtils.isNotEmpty(analyseResult.S_ROI_B_Boundary_start)) {
+                List<Boundary> boundaryList = new LinkedList<>();
+                for (int i=0; i<analyseResult.S_ROI_B_Boundary_start.size(); i++) {
+                    Boundary boundary = new Boundary();
+                    boundary.setMinX(analyseResult.S_ROI_B_Boundary_start.get(i));
+                    boundary.setMaxX(analyseResult.S_ROI_B_Boundary_stop.get(i));
+                    boundary.setMinY(analyseResult.S_ROI_G_Boundary_start.get(i));
+                    boundary.setMaxY(analyseResult.S_ROI_G_Boundary_stop.get(i));
+                    boundaryList.add(boundary);
+                }
+                map.put("SampleBoundary", boundaryList);
+            }
+            if (CollectionUtils.isNotEmpty(analyseResult.G_ROI_B_Boundary_start)) {
+                List<Boundary> boundaryList = new LinkedList<>();
+                for (int i=0; i<analyseResult.G_ROI_B_Boundary_start.size(); i++) {
+                    Boundary boundary = new Boundary();
+                    boundary.setMinX(analyseResult.G_ROI_B_Boundary_start.get(i));
+                    boundary.setMaxX(analyseResult.G_ROI_B_Boundary_stop.get(i));
+                    boundary.setMinY(analyseResult.G_ROI_G_Boundary_start.get(i));
+                    boundary.setMaxY(analyseResult.G_ROI_G_Boundary_stop.get(i));
+                    boundaryList.add(boundary);
+                }
+                map.put("GasBoundary", boundaryList);
+            }
+            if (CollectionUtils.isNotEmpty(analyseResult.D_ROI_B_Boundary_start)) {
+                List<Boundary> boundaryList = new LinkedList<>();
+                for (int i=0; i<analyseResult.D_ROI_B_Boundary_start.size(); i++) {
+                    Boundary boundary = new Boundary();
+                    boundary.setMinX(analyseResult.D_ROI_B_Boundary_start.get(i));
+                    boundary.setMaxX(analyseResult.D_ROI_B_Boundary_stop.get(i));
+                    boundary.setMinY(analyseResult.D_ROI_G_Boundary_start.get(i));
+                    boundary.setMaxY(analyseResult.D_ROI_G_Boundary_stop.get(i));
+                    boundaryList.add(boundary);
+                }
+                map.put("DetBoundary", boundaryList);
+            }
             bRet = false;
             return bRet;
         } else {
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 ad48ef96..1358a0a7 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
@@ -2942,15 +2942,15 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
             if (Objects.nonNull(sampleTmp) && Objects.nonNull(gasTmp) && Objects.nonNull(detTmp)) {
                 //调用分析方法进行分析操作
                 boolean bRet = phdFileUtil.analyzeSpectrum(sampleTmp, gasTmp, detTmp, spectrum_group.BgCalPara, xeMap, betaDataFile);
-                if (bRet) {
-                    if (analyseData.isQcData()) {
-                        if (StringUtils.isNotBlank(betaDataFile.getQcFilePathName())) {
-                            EnergySpectrumStruct struct = betaDataFile.getQcStruct();
-                            if (Objects.nonNull(struct)) {
-                                phdFileUtil.CalQCBoundary(betaList, gammaList, betaFittingParaToUi, gammaFittingParaToUi, struct, xeMap, betaDataFile);
-                            }
+                if (analyseData.isQcData()) {
+                    if (StringUtils.isNotBlank(betaDataFile.getQcFilePathName())) {
+                        EnergySpectrumStruct struct = betaDataFile.getQcStruct();
+                        if (Objects.nonNull(struct)) {
+                            phdFileUtil.CalQCBoundary(betaList, gammaList, betaFittingParaToUi, gammaFittingParaToUi, struct, xeMap, betaDataFile);
                         }
                     }
+                }
+                if (bRet) {
                     List<Boundary> sampleBoundary = (List<Boundary>) xeMap.get("SampleBoundary");
                     if(CollectionUtils.isNotEmpty(sampleBoundary)) {
                         betaDataFile.setSampleBoundary(sampleBoundary);