From 21b40f9ba8352bfed6b28fc19fcfe08d8b7b44fc Mon Sep 17 00:00:00 2001
From: qiaoqinzheng <qiaoqinzheng@hivekion.com>
Date: Wed, 15 Nov 2023 18:19:12 +0800
Subject: [PATCH] =?UTF-8?q?beta=E5=8A=9F=E8=83=BDloadByDB=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=9B=9E=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?analysisId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/jeecg/modules/entity/GardsSampleDataSpectrum.java | 3 +++
 .../org/jeecg/modules/mapper/xml/SpectrumAnalysisMapper.xml    | 1 +
 .../modules/service/impl/SpectrumAnalysisServiceImpl.java      | 3 +++
 3 files changed, 7 insertions(+)

diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/GardsSampleDataSpectrum.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/GardsSampleDataSpectrum.java
index a5ce048a..367e36a6 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/GardsSampleDataSpectrum.java
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/GardsSampleDataSpectrum.java
@@ -34,6 +34,9 @@ public class GardsSampleDataSpectrum extends GardsSampleData {
     @TableField(exist = false)
     private String analyst;
 
+    @TableField(exist = false)
+    private Integer analysitId;
+
     @TableField(exist = false)
     @Excel(name = "NO" ,orderNum = "1")
     private Integer no;
diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/SpectrumAnalysisMapper.xml b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/SpectrumAnalysisMapper.xml
index ee38731f..d2bd52d1 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/SpectrumAnalysisMapper.xml
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/SpectrumAnalysisMapper.xml
@@ -42,6 +42,7 @@
                c.acquisition_start acquisitionStart,
                c.acquisition_real_sec acquisitionRealSec,
                c.acquisition_live_sec acquisitionLiveSec,
+               d.IDANALYSIS analysitId,
                d.analyst analyst,
                c.status status,
                c.input_file_name inputFileName
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 99df5c97..166bc21f 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
@@ -2984,6 +2984,9 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
                 }
                 //根据sample文件名称获取当前文件的缓存信息
                 BetaDataFile sampleBetaData = cache.getIfPresent(sampleFileName + "-" + userName);
+                if (Objects.isNull(sampleBetaData)) {
+                    sampleBetaData = new BetaDataFile();
+                }
                 //将当前文件用到的计算数据同步到需要计算的文件缓存
                 sampleBetaData.setBetaList(betaList);
                 sampleBetaData.setBetaFittingPara(betaFittingPara);