From ef137b10d23ed996e95289c14e569d46a18554c2 Mon Sep 17 00:00:00 2001
From: qiaoqinzheng <qiaoqinzheng@hivekion.com>
Date: Thu, 2 Nov 2023 13:48:01 +0800
Subject: [PATCH] =?UTF-8?q?gamma=E5=8A=9F=E8=83=BD=E6=9F=A5=E7=9C=8BSpectr?=
 =?UTF-8?q?um=E9=83=A8=E5=88=86=E5=AD=97=E6=AE=B5=E7=A9=BA=E6=8C=87?=
 =?UTF-8?q?=E9=92=88=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86=20gamma=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E6=9F=A5=E7=9C=8BNuclide=20Review=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=95=B0=E5=80=BC=E4=B8=8D=E5=AD=98=E5=9C=A8=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  |  8 +++----
 .../service/impl/GammaServiceImpl.java        | 24 +++++++++++++++----
 2 files changed, 24 insertions(+), 8 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 bc1af40f..53128de3 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
@@ -4280,7 +4280,7 @@ public class GammaFileUtil extends AbstractLogOrReport {
             for(int i=0; i<g_ener.getG_energy().size(); i++) {
                 String g_energy = RightFill(String.format("%.9f", g_ener.getG_energy().get(i)), 16);
                 String centroid_channel = RightFill(String.format("%.9f", g_ener.getCentroid_channel().get(i)), 16);
-                String uncertainty = RightFill(String.format("%.9f", g_ener.getUncertainty().get(i).isNaN() ? 0.5 : g_ener.getUncertainty().get(i)), 16);
+                String uncertainty = RightFill(String.format("%.9f", Objects.nonNull(g_ener.getUncertainty().get(i)) ? (g_ener.getUncertainty().get(i).isNaN()?0.5 : g_ener.getUncertainty().get(i)):0.5), 16);
                 String energy = "%s %s %s";
                 spectrum.append(rowFormat(energy, g_energy, centroid_channel, uncertainty));
                 //换行
@@ -4297,7 +4297,7 @@ public class GammaFileUtil extends AbstractLogOrReport {
             for(int i=0; i<g_reso.getFWHM().size(); i++) {
                 String g_energy = RightFill(String.format("%.9f", g_reso.getG_energy().get(i)), 16);
                 String fwhm = RightFill(String.format("%.9f", g_reso.getFWHM().get(i)), 16);
-                String uncertainty = RightFill(String.format("%.9f", g_reso.getUncertainty().get(i).isNaN() ? 0.5 : g_reso.getUncertainty().get(i)), 16);
+                String uncertainty = RightFill(String.format("%.9f", Objects.nonNull(g_reso.getUncertainty().get(i))? (g_reso.getUncertainty().get(i).isNaN() ? 0.5 : g_reso.getUncertainty().get(i)):0.5), 16);
                 String reso = "%s %s %s";
                 spectrum.append(rowFormat(reso, g_energy, fwhm, uncertainty));
                 //换行
@@ -4314,7 +4314,7 @@ public class GammaFileUtil extends AbstractLogOrReport {
             for(int i=0; i<g_effi.getEfficiency().size(); i++) {
                 String g_energy = RightFill(String.format("%.9f", g_effi.getG_energy().get(i)), 16);
                 String g_efficiency = RightFill(String.format("%.9f", g_effi.getEfficiency().get(i)), 16);
-                String uncertainty = RightFill(String.format("%.9f", g_effi.getUncertainty().get(i).isNaN() ? 0.5 : g_effi.getUncertainty().get(i)), 16);
+                String uncertainty = RightFill(String.format("%.9f", Objects.nonNull(g_effi.getUncertainty().get(i))?(g_effi.getUncertainty().get(i).isNaN() ? 0.5 : g_effi.getUncertainty().get(i)):0.5), 16);
                 String efficiency = "%s %s %s";
                 spectrum.append(rowFormat(efficiency, g_energy, g_efficiency, uncertainty));
                 spectrum.append(System.lineSeparator());
@@ -4331,7 +4331,7 @@ public class GammaFileUtil extends AbstractLogOrReport {
                 for(int i=0; i<g_totE.getRecord_count(); i++) {
                     String g_energy = RightFill(String.format("%.9f", g_totE.getG_energy().get(i)), 16);
                     String total_efficiency = RightFill(String.format("%.9f", g_totE.getTotal_efficiency().get(i)), 16);
-                    String uncertainty = RightFill(String.format("%.9f", g_totE.getUncertainty().get(i).isNaN() ? 0.5 : g_totE.getUncertainty().get(i)), 16);
+                    String uncertainty = RightFill(String.format("%.9f", Objects.nonNull(g_totE.getUncertainty().get(i))?(g_totE.getUncertainty().get(i).isNaN() ? 0.5 : g_totE.getUncertainty().get(i)):0.5), 16);
                     String totalEff = "%s %s %s";
                     spectrum.append(rowFormat(totalEff, g_energy, total_efficiency, uncertainty));
                     //换行
diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java
index 60b3469a..c8577f24 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java
@@ -1840,10 +1840,26 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
         List<GardsNuclLinesLib> nuclideTableList = spectrumAnalysisMapper.getNuclideTable(name, span);
         if (CollectionUtils.isNotEmpty(nuclideTableList)) {
             nuclideTableList.stream().forEach(item-> {
-                item.setEnergy(Double.valueOf(NumberFormatUtil.numberFormat(String.valueOf(item.getEnergy()))));
-                item.setEnergyUncert(Double.valueOf(NumberFormatUtil.numberFormat(String.valueOf(item.getEnergyUncert()))));
-                item.setYield(Double.valueOf(NumberFormatUtil.numberFormat(String.valueOf(item.getYield()))));
-                item.setYieldUncert(Double.valueOf(NumberFormatUtil.numberFormat(String.valueOf(item.getYieldUncert()))));
+                if (Objects.nonNull(item.getEnergy())) {
+                    item.setEnergy(Double.valueOf(NumberFormatUtil.numberFormat(String.valueOf(item.getEnergy()))));
+                } else {
+                    item.setEnergy(0.0);
+                }
+                if (Objects.nonNull(item.getEnergyUncert())) {
+                    item.setEnergyUncert(Double.valueOf(NumberFormatUtil.numberFormat(String.valueOf(item.getEnergyUncert()))));
+                } else {
+                    item.setEnergyUncert(0.0);
+                }
+                if (Objects.nonNull(item.getYield())) {
+                    item.setYield(Double.valueOf(NumberFormatUtil.numberFormat(String.valueOf(item.getYield()))));
+                } else {
+                    item.setYield(0.0);
+                }
+                if (Objects.nonNull(item.getYieldUncert())) {
+                    item.setYieldUncert(Double.valueOf(NumberFormatUtil.numberFormat(String.valueOf(item.getYieldUncert()))));
+                } else {
+                    item.setYieldUncert(0.0);
+                }
             });
             map.put("table", nuclideTableList);
             gammaFileUtil.InitChart(nuclideTableList, phd, map, colorMap);