From 842e2744e7d70ccc91078571010f7a9298ebdf6a Mon Sep 17 00:00:00 2001
From: qiaoqinzheng <qiaoqinzheng@hivekion.com>
Date: Mon, 20 Nov 2023 16:05:28 +0800
Subject: [PATCH] =?UTF-8?q?gamma=E8=87=AA=E5=8A=A8=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E5=AD=98=E5=82=A8=E6=97=B6=E9=83=A8=E5=88=86=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=98=AFnan=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=20beta=E5=8A=9F=E8=83=BD=E6=9F=A5=E8=AF=A2QC=20Result?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E6=96=87=E4=BB=B6=E5=90=8D=E7=A7=B0=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/org/jeecg/common/util/GammaFileUtil.java    | 4 ++--
 .../modules/service/impl/SpectrumAnalysisServiceImpl.java     | 2 +-
 .../src/main/java/org/jeecg/common/CalculateStationData.java  | 2 --
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java
index 5ec46a17..af22bced 100644
--- a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java
+++ b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java
@@ -3430,8 +3430,8 @@ public class GammaFileUtil extends AbstractLogOrReport {
                 dvctUPPERTAIL.add(fileAnlyse.getVPeak().get(m).upperTail);
                 dvctUPPERTAILALPHA.add(fileAnlyse.getVPeak().get(m).upperTailAlpha);
                 dvctBWWIDTHCHAN.add(fileAnlyse.getVPeak().get(m).BWWidthChan);
-                dvctRECOILBETACHAN.add(fileAnlyse.getVPeak().get(m).recoilBetaChan.equalsIgnoreCase("nan")?Double.NaN:Double.valueOf(fileAnlyse.getVPeak().get(m).recoilBetaChan));
-                dvctRECOILDELTACHAN.add(fileAnlyse.getVPeak().get(m).recoilDeltaChan.equalsIgnoreCase("nan")?Double.NaN:Double.valueOf(fileAnlyse.getVPeak().get(m).recoilDeltaChan));
+                dvctRECOILBETACHAN.add(fileAnlyse.getVPeak().get(m).recoilBetaChan.equalsIgnoreCase("nan")?null:Double.valueOf(fileAnlyse.getVPeak().get(m).recoilBetaChan));
+                dvctRECOILDELTACHAN.add(fileAnlyse.getVPeak().get(m).recoilDeltaChan.equalsIgnoreCase("nan")?null:Double.valueOf(fileAnlyse.getVPeak().get(m).recoilDeltaChan));
                 dvctSTEPRAIO.add(fileAnlyse.getVPeak().get(m).stepRatio);
                 dvctBACKGROUNDAREA.add(fileAnlyse.getVPeak().get(m).backgroundArea);
                 dvctMEANBACKCOUNT.add(fileAnlyse.getVPeak().get(m).meanBackCount);
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 04becf71..b7fbf2e8 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
@@ -1605,7 +1605,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
         OutputStream fos = null;
         try {
             String fileName = sampleFileName.substring(0, sampleFileName.lastIndexOf(StringPool.DOT) - 1);
-            fileName = fileName + "_QC Result.txt";
+            fileName = fileName + "_QC_Result.txt";
             // 设置响应类型
             response.setContentType("application/octet-stream");
             response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
diff --git a/jeecg-module-station-operation/src/main/java/org/jeecg/common/CalculateStationData.java b/jeecg-module-station-operation/src/main/java/org/jeecg/common/CalculateStationData.java
index 4104f4b0..42561b89 100644
--- a/jeecg-module-station-operation/src/main/java/org/jeecg/common/CalculateStationData.java
+++ b/jeecg-module-station-operation/src/main/java/org/jeecg/common/CalculateStationData.java
@@ -814,8 +814,6 @@ public class CalculateStationData {
      * @param stationInfos 台站信息列表
      */
     public void mutiThreadGetStationInfo(List<StationInfo> stationInfos, RateParam mRateParam) {
-        // 声明当前开始执行时间
-        Date startTime = new Date();
         //声明一个数组用于接收最后的结果情况
         Map<String, StationInfo> finallySta = Objects.nonNull(redisUtil.get("dataStationInfoList"))? (Map<String, StationInfo>) redisUtil.get("dataStationInfoList"):new HashMap<>();
         //声明一个线程池