From 9a403638f60a98a631de181aa159bb64cad9fde1 Mon Sep 17 00:00:00 2001
From: xiaoguangbin <xiaoguangbin>
Date: Wed, 9 Oct 2024 10:31:39 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=96=B0beta=20s?=
 =?UTF-8?q?avetodb=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../GardsCalibrationPairsOrigSpectrumServiceImpl.java  |  1 -
 .../modules/service/impl/SelfStationServiceImpl.java   | 10 +++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

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 7e0d3833..7883c2c2 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
@@ -82,7 +82,6 @@ public class GardsCalibrationPairsOrigSpectrumServiceImpl extends ServiceImpl<Ga
                 calibrationPairsOrig.setCaltype(CalType.EFFICIENCY_CAL.getType());
                 calibrationPairsOrig.setInput("PHD");
                 calibrationPairsOrig.setIdCalPoint(i);
-                calibrationPairsOrig.setXValue(sourceData.b_e_energy.get(i));
                 calibrationPairsOrig.setYValue(sourceData.b_e_efficiency.get(i));
                 calibrationPairsOrig.setUncYValue(sourceData.b_e_uncertainty.get(i));
                 calibrationPairsOrigList.add(calibrationPairsOrig);
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 a91c19ca..390433d7 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
@@ -5538,19 +5538,19 @@ public class SelfStationServiceImpl extends AbstractLogOrReport implements ISelf
         phd.setId_sample(sampleData.getSampleId().toString());
 
         // 判断文件是否存储过  如果没有则解析文件并进行存储
-        if (!this.OriginalDataStore(sampleStruct, sampleTmpPath, sampleFilePathName) ){
+        if (!this.OriginalDataStore(sampleStruct, sampleFilePathName) ){
             result.error500("sampleFile save failed");
             return result;
         }
         if (StrUtil.isNotBlank(detFilePathName)){
-            if (!this.OriginalDataStore(detStruct, detTmpPath, detFilePathName) ){
+            if (!this.OriginalDataStore(detStruct, detFilePathName) ){
                 result.error500("detFile save failed");
                 return result;
             }
             detId = spectrumAnalysisMapper.getSampleId(detFilePathName);
         }
         if (StringUtils.isNotBlank(qcFilePathName)) {
-            if (!this.OriginalDataStore(qcStruct, qcTmpPath, qcFilePathName) ){
+            if (!this.OriginalDataStore(qcStruct, qcFilePathName) ){
                 result.error500("qcFile save failed");
                 return result;
             }
@@ -5692,7 +5692,7 @@ public class SelfStationServiceImpl extends AbstractLogOrReport implements ISelf
     }
 
     @Transactional
-    public boolean OriginalDataStore(EnergySpectrumStruct sourceData, String tmpPath, String filePathName) {
+    public boolean OriginalDataStore(EnergySpectrumStruct sourceData, String filePathName) {
         //根据新的文件路径名称查询数据是否存在
         GardsSampleData isExist = spectrumAnalysisMapper.findSampleByFile(filePathName);
         //如果数据已经存入过数据库 则 修改状态后返回
@@ -5702,7 +5702,7 @@ public class SelfStationServiceImpl extends AbstractLogOrReport implements ISelf
             return true;
         }
         //读取文件内容
-        File file = new File(tmpPath);
+        File file = new File(filePathName);
         try {
             //获取文件中块名信息
             List<String> readLines = getFileBlockList(file);