From caf47a58d5014800cc3a719a19c12ed1015118ee Mon Sep 17 00:00:00 2001
From: qiaoqinzheng <qiaoqinzheng@hivekion.com>
Date: Fri, 10 May 2024 16:12:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=B7=A5=E4=BA=A4=E4=BA=92=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E5=A2=9E=E5=8A=A0=E5=88=A4=E6=96=AD=E5=A6=82=E6=9E=9C?=
 =?UTF-8?q?=E4=B8=8D=E6=98=AF=E6=AD=A3=E5=B8=B8=E8=B0=B1=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E4=BF=A1=E6=81=AF=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/jeecg/modules/service/impl/GammaServiceImpl.java  | 8 ++++++++
 1 file changed, 8 insertions(+)

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 05fd4687..42f90b0b 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
@@ -194,6 +194,10 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
             if (!flag) {
                 return result;
             }
+            if (Objects.nonNull(phd) && !phd.isValid()) {
+                result.error500("This Spectrum is invalid! it's counts are all zero");
+                return result;
+            }
             // 加载phd数据所需的lc，scac，baseline数据
             if (dbName.equals("auto")) {
                 gammaFileUtil.SetBaseInfo(phd, "RNAUTO");
@@ -609,6 +613,10 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
             if (!bRet) {
                 return result;
             }
+            if (Objects.nonNull(phd) && !phd.isValid()) {
+                result.error500("This Spectrum is invalid! it's counts are all zero");
+                return result;
+            }
             if (!redisUtil.hasKey(userName+StringPool.DASH+phd.getHeader().getSystem_type()) || !redisUtil.hasKey(userName+StringPool.DASH+phd.getHeader().getSystem_type()+"-list")) {
                 //读取缓存的全部核素信息
                 Map<String, NuclideLines> allNuclideMap = (Map<String, NuclideLines>) redisUtil.get("AllNuclideMap");