From 42d8b1bb45614cbdf67ef29c4591635e6e2cda6c Mon Sep 17 00:00:00 2001
From: qiaoqinzheng <qiaoqinzheng@hivekion.com>
Date: Fri, 10 Nov 2023 10:55:06 +0800
Subject: [PATCH] =?UTF-8?q?gamma=E5=8A=9F=E8=83=BD=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E5=88=B0=E6=95=B0=E6=8D=AE=E5=BA=93=E5=90=8E=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E4=BA=86=E4=B8=B4=E6=97=B6=E6=96=87=E4=BB=B6=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9=20gamma?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=88=B0=E6=95=B0=E6=8D=AE=E5=BA=93=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E5=AD=97=E6=AE=B5=E7=A9=BA=E5=80=BC=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/jeecg/common/util/GammaFileUtil.java  |  2 --
 ...GardsNuclLinesIdedSpectrumServiceImpl.java | 23 ++++++++++---------
 2 files changed, 12 insertions(+), 13 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 33d5ce24..6d854878 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
@@ -3027,8 +3027,6 @@ public class GammaFileUtil extends AbstractLogOrReport {
                 }
             } catch (FileNotFoundException e) {
                 throw new RuntimeException(e);
-            } finally {
-                sampleTmp.delete();
             }
         }
 
diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsNuclLinesIdedSpectrumServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsNuclLinesIdedSpectrumServiceImpl.java
index a89e1c81..ffa833b1 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsNuclLinesIdedSpectrumServiceImpl.java
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsNuclLinesIdedSpectrumServiceImpl.java
@@ -2,6 +2,7 @@ package org.jeecg.modules.service.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.modules.base.entity.rnman.GardsNuclLinesIded;
 import org.jeecg.modules.entity.vo.GStoreMiddleProcessData;
@@ -34,18 +35,18 @@ public class GardsNuclLinesIdedSpectrumServiceImpl extends ServiceImpl<GardsNucl
                 nuclLinesIded.setNuclidefullname(map.get(key).nuclideFullname.get(i));
                 nuclLinesIded.setIdPeak(Integer.valueOf(map.get(key).idPeak.get(i)));
                 nuclLinesIded.setEnergy(Double.valueOf(map.get(key).Energy.get(i)));
-                nuclLinesIded.setUncEnergy(Double.valueOf(map.get(key).uncEnergy.get(i)));
-                nuclLinesIded.setAbundance(Double.valueOf(map.get(key).Abundance.get(i)));
-                nuclLinesIded.setUncAbundance(Double.valueOf(map.get(key).uncAbundance.get(i)));
+                nuclLinesIded.setUncEnergy(StringUtils.isBlank(map.get(key).uncEnergy.get(i))?null:Double.valueOf(map.get(key).uncEnergy.get(i)));
+                nuclLinesIded.setAbundance(StringUtils.isBlank(map.get(key).Abundance.get(i))?null:Double.valueOf(map.get(key).Abundance.get(i)));
+                nuclLinesIded.setUncAbundance(StringUtils.isBlank(map.get(key).uncAbundance.get(i))?null:Double.valueOf(map.get(key).uncAbundance.get(i)));
                 nuclLinesIded.setActivity(map.get(key).Activity.get(i));
-                nuclLinesIded.setUncActivity(Double.valueOf(map.get(key).uncActivity.get(i)));
-                nuclLinesIded.setEffic(Double.valueOf(map.get(key).Effic.get(i)));
-                nuclLinesIded.setUnEffic(Double.valueOf(map.get(key).uncEffic.get(i)));
-                nuclLinesIded.setMda(Double.valueOf(map.get(key).Mda.get(i)));
-                nuclLinesIded.setKeyFlag(Double.valueOf(map.get(key).key_flag.get(i)));
-                nuclLinesIded.setCscRatio(Double.valueOf(map.get(key).csc_ratio.get(i)));
-                nuclLinesIded.setCscRatioErr(Double.valueOf(map.get(key).csc_ratio_err.get(i)));
-                nuclLinesIded.setCscModFlag(Double.valueOf(map.get(key).csc_mod_flag.get(i)));
+                nuclLinesIded.setUncActivity(StringUtils.isBlank(map.get(key).uncActivity.get(i))?null:Double.valueOf(map.get(key).uncActivity.get(i)));
+                nuclLinesIded.setEffic(StringUtils.isBlank(map.get(key).Effic.get(i))?null:Double.valueOf(map.get(key).Effic.get(i)));
+                nuclLinesIded.setUnEffic(StringUtils.isBlank(map.get(key).uncEffic.get(i))?null:Double.valueOf(map.get(key).uncEffic.get(i)));
+                nuclLinesIded.setMda(StringUtils.isBlank(map.get(key).Mda.get(i))?null:Double.valueOf(map.get(key).Mda.get(i)));
+                nuclLinesIded.setKeyFlag(StringUtils.isBlank(map.get(key).key_flag.get(i))?null:Double.valueOf(map.get(key).key_flag.get(i)));
+                nuclLinesIded.setCscRatio(StringUtils.isBlank(map.get(key).csc_ratio.get(i))?null:Double.valueOf(map.get(key).csc_ratio.get(i)));
+                nuclLinesIded.setCscRatioErr(StringUtils.isBlank(map.get(key).csc_ratio_err.get(i))?null:Double.valueOf(map.get(key).csc_ratio_err.get(i)));
+                nuclLinesIded.setCscModFlag(StringUtils.isBlank(map.get(key).csc_mod_flag.get(i))?null:Double.valueOf(map.get(key).csc_mod_flag.get(i)));
                 nuclLinesIded.setMdc(map.get(key).MDC.get(i));
                 nuclLinesIded.setConcentration(map.get(key).Concentration.get(i));
                 nuclLinesIdedList.add(nuclLinesIded);