From 59d73089f0eeb6fda634d514bfa1a6eba5eca878 Mon Sep 17 00:00:00 2001
From: xiaoguangbin <xiaoguangbin>
Date: Tue, 8 Oct 2024 15:21:49 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=20=E4=BA=A4?=
 =?UTF-8?q?=E4=BA=92=E5=88=86=E6=9E=90=E6=96=B0beta=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E5=88=BB=E5=BA=A6=E6=95=B0=E6=8D=AE=E4=B8=9A=E5=8A=A1=E3=80=82?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=8E=E6=95=B0=E6=8D=AE=E5=BA=93=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E8=AF=BB=E5=8F=96=E5=88=BB=E5=BA=A6=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jeecg/modules/service/AnalysisManServiceImpl.java  |  2 +-
 .../service/IGardsCalibrationSpectrumService.java      |  5 +----
 .../impl/GardsCalibrationSpectrumServiceImpl.java      |  4 ++--
 .../modules/service/impl/SelfStationServiceImpl.java   | 10 +++++++---
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/AnalysisManServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/AnalysisManServiceImpl.java
index 1e7d1e13..c9ed80d0 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/AnalysisManServiceImpl.java
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/AnalysisManServiceImpl.java
@@ -556,7 +556,7 @@ public class AnalysisManServiceImpl implements AnalysisManService {
         }
         if (CollectionUtils.isNotEmpty(calibrations)) {
             for (GardsCalibration calibration:calibrations) {
-                calibrationSpectrumService.insertCalibration(calibration);
+                calibrationSpectrumService.insertCalibrationGamma(calibration);
             }
         }
         return calibrations;
diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsCalibrationSpectrumService.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsCalibrationSpectrumService.java
index efb6d196..52ca07a5 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsCalibrationSpectrumService.java
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsCalibrationSpectrumService.java
@@ -1,16 +1,13 @@
 package org.jeecg.modules.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.base.entity.rnman.GardsCalibration;
 import org.jeecg.modules.entity.vo.BgDataAnlyseResultIn;
 import org.jeecg.modules.entity.vo.GStoreMiddleProcessData;
 
-import java.util.List;
-
 public interface IGardsCalibrationSpectrumService extends IService<GardsCalibration> {
 
-    void insertCalibration(GardsCalibration calibration);
+    void insertCalibrationGamma(GardsCalibration calibration);
 
     int saveGardsCalibration(BgDataAnlyseResultIn anlyseResultIn, Integer sampleId, Integer gasId, Integer detId, Integer idAnalysis);
 
diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsCalibrationSpectrumServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsCalibrationSpectrumServiceImpl.java
index a7274a70..75d849ca 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsCalibrationSpectrumServiceImpl.java
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsCalibrationSpectrumServiceImpl.java
@@ -27,8 +27,8 @@ public class GardsCalibrationSpectrumServiceImpl extends ServiceImpl<GardsCalibr
 
 
     @Override
-    public void insertCalibration(GardsCalibration calibration) {
-        this.baseMapper.insertCalibration(calibration);
+    public void insertCalibrationGamma(GardsCalibration calibration) {
+        this.baseMapper.insertCalibrationGamma(calibration);
     }
 
     @Override
diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SelfStationServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SelfStationServiceImpl.java
index 28926df1..a91c19ca 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SelfStationServiceImpl.java
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SelfStationServiceImpl.java
@@ -249,6 +249,7 @@ public class SelfStationServiceImpl extends AbstractLogOrReport implements ISelf
                     if (Objects.nonNull(struct)) {
                         selfStationData.setSampleStruct(struct);
                         selfStationData.setSampleTmpPath(sampleFilePath);
+                        selfStationData.setSampleFileName(sampleFileName);
                         selfStationUtil.loadFile(selfStationData, sample.getSampleId(), sample.getStatus(), "sample", map);
                         // 交互库需要获取最新的ROI数据
                         if (dbName.equalsIgnoreCase("RNMAN")) {
@@ -360,6 +361,7 @@ public class SelfStationServiceImpl extends AbstractLogOrReport implements ISelf
                     if (Objects.nonNull(struct)) {
                         selfStationData.setDetStruct(struct);
                         selfStationData.setDetTmpPath(detFilePath);
+                        selfStationData.setDetFileName(detFileName);
                         selfStationUtil.loadFile(selfStationData, detBg.getSampleId(), detBg.getStatus(), "det", map);
 
                         resultMap.put("det", map);
@@ -379,6 +381,7 @@ public class SelfStationServiceImpl extends AbstractLogOrReport implements ISelf
                     if (Objects.nonNull(struct)) {
                         selfStationData.setQcStruct(struct);
                         selfStationData.setQcTmpPath(qcFilePath);
+                        selfStationData.setQcFileName(qcFileName);
                         selfStationUtil.loadFile(selfStationData, qc.getSampleId(), qc.getStatus(), "qc", map);
 
                         resultMap.put("qc", map);
@@ -479,6 +482,7 @@ public class SelfStationServiceImpl extends AbstractLogOrReport implements ISelf
             }
             betaDataFile.setXeResultsSpectrumList(xeResultsSpectrumList);
             betaDataFile.setSaveAnalysisResult(true);
+            selfStationData.setBAnalyed(true);
             resultMap.put("XeData", phdFileUtil.viewXeData(xeResultsSpectrumList));
             resultMap.put("bProcessed", betaDataFile.isBProcessed());
             resultMap.put("savedAnalysisResult", betaDataFile.isSaveAnalysisResult());
@@ -5509,13 +5513,13 @@ public class SelfStationServiceImpl extends AbstractLogOrReport implements ISelf
         String qcTmpPath = selfStationData.getQcTmpPath();
 
         //根据sample文件名称模糊查询sampleId
-        if (StringUtils.isNotBlank(sampleFilePathName) && StringUtils.isNotBlank(sampleFileName)) {
+        if (StringUtils.isBlank(sampleFilePathName) && StringUtils.isNotBlank(sampleFileName)) {
             sampleFilePathName = phdFileUtil.NameStandardBy(sampleFileName, sampleStruct.system_type, sampleStruct.data_type);
         }
-        if (StringUtils.isNotBlank(detFilePathName) && StringUtils.isNotBlank(detFileName)) {
+        if (StringUtils.isBlank(detFilePathName) && StringUtils.isNotBlank(detFileName)) {
             detFilePathName = phdFileUtil.NameStandardBy(detFileName, detStruct.system_type, detStruct.data_type);
         }
-        if (StringUtils.isNotBlank(qcFilePathName) && StringUtils.isNotBlank(qcFileName)) {
+        if (StringUtils.isBlank(qcFilePathName) && StringUtils.isNotBlank(qcFileName)) {
             qcFilePathName = phdFileUtil.NameStandardBy(qcFileName, qcStruct.system_type, qcStruct.data_type);
         }