From ca3cd39881dcbd6a248dc3861fe0d4f9b2642eeb Mon Sep 17 00:00:00 2001
From: qiaoqinzheng <qiaoqinzheng@hivekion.com>
Date: Mon, 6 Nov 2023 11:01:42 +0800
Subject: [PATCH] =?UTF-8?q?beta=E6=96=87=E4=BB=B6=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E8=B5=8B=E5=80=BC=E4=BD=8D=E7=BD=AE=E9=94=99=E8=AF=AF=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       | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 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 4df64877..c48d8997 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
@@ -387,13 +387,14 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
                     betaDataFile = new BetaDataFile();
                     //给公用变量赋值sampleId
                     betaDataFile.setSampleId(String.valueOf(sampleId));
+
                     if (Objects.nonNull(sample)) {
                         sampleTmp = ftpUtil.downloadFile(betaDataFile.getSampleFilePathName(), "betaGamma");
                         if (Objects.nonNull(sampleTmp)) {
-                            EnergySpectrumStruct struct = EnergySpectrumHandler.getSourceData(sampleTmp.getAbsolutePath());
-                            betaDataFile.setSampleStruct(struct);
                             betaDataFile.setSampleFilePathName(StringPool.SLASH + ftpUtil.getFtpRootPath() + spectrumPathProperties.getSaveFilePath() + StringPool.SLASH +dbSpectrumFilePath.getSampleFilePath());
                             betaDataFile.setSampleFileName(sampleFileName);
+                            EnergySpectrumStruct struct = EnergySpectrumHandler.getSourceData(sampleTmp.getAbsolutePath());
+                            betaDataFile.setSampleStruct(struct);
                             sampleMap = phdFileUtil.getSourceData(struct, sample.getSampleId(), sample.getStatus(), "sample", betaDataFile);
                             resultMap.put("sample",sampleMap);
                         }
@@ -401,10 +402,10 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
                     if (Objects.nonNull(gasBg)) {
                         gasTmp = ftpUtil.downloadFile(betaDataFile.getGasFilePathName(), "betaGamma");
                         if (Objects.nonNull(gasTmp)) {
-                            EnergySpectrumStruct struct = EnergySpectrumHandler.getSourceData(gasTmp.getAbsolutePath());
-                            betaDataFile.setGasStruct(struct);
                             betaDataFile.setGasFilePathName(StringPool.SLASH + ftpUtil.getFtpRootPath() + spectrumPathProperties.getSaveFilePath() + StringPool.SLASH +dbSpectrumFilePath.getGasBgFilePath());
                             betaDataFile.setGasFileName(gasFileName);
+                            EnergySpectrumStruct struct = EnergySpectrumHandler.getSourceData(gasTmp.getAbsolutePath());
+                            betaDataFile.setGasStruct(struct);
                             gasBgMap = phdFileUtil.getSourceData(struct, gasBg.getSampleId(), gasBg.getStatus(), "gas", betaDataFile);
                             resultMap.put("gasBg",gasBgMap);
                         }
@@ -412,10 +413,10 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
                     if (Objects.nonNull(detBg)) {
                         detTmp = ftpUtil.downloadFile(betaDataFile.getDetFilePathName(), "betaGamma");
                         if (Objects.nonNull(detTmp)) {
-                            EnergySpectrumStruct struct = EnergySpectrumHandler.getSourceData(detTmp.getAbsolutePath());
-                            betaDataFile.setDetStruct(struct);
                             betaDataFile.setDetFilePathName(StringPool.SLASH + ftpUtil.getFtpRootPath() + spectrumPathProperties.getSaveFilePath() + StringPool.SLASH +dbSpectrumFilePath.getDetBgFilePath());
                             betaDataFile.setDetFileName(detFileName);
+                            EnergySpectrumStruct struct = EnergySpectrumHandler.getSourceData(detTmp.getAbsolutePath());
+                            betaDataFile.setDetStruct(struct);
                             detBgMap = phdFileUtil.getSourceData(struct, detBg.getSampleId(), detBg.getStatus(), "det", betaDataFile);
                             resultMap.put("detBg",detBgMap);
                         }
@@ -423,10 +424,10 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
                     if (Objects.nonNull(qc)) {
                         qcTmp = ftpUtil.downloadFile(betaDataFile.getQcFilePathName(), "betaGamma");
                         if (Objects.nonNull(qcTmp)) {
-                            EnergySpectrumStruct struct = EnergySpectrumHandler.getSourceData(qcTmp.getAbsolutePath());
-                            betaDataFile.setQcStruct(struct);
                             betaDataFile.setQcFilePathName(StringPool.SLASH + ftpUtil.getFtpRootPath() + spectrumPathProperties.getSaveFilePath() + StringPool.SLASH +dbQcFilePath);
                             betaDataFile.setQcFileName(qcFileName);
+                            EnergySpectrumStruct struct = EnergySpectrumHandler.getSourceData(qcTmp.getAbsolutePath());
+                            betaDataFile.setQcStruct(struct);
                             qcMap = phdFileUtil.getSourceData(struct, qc.getSampleId(), qc.getStatus(), "qc", betaDataFile);
                             resultMap.put("qc",qcMap);
                         }