From e69b7d48d8055a0adcbc10acfe66e5b72d756c5e Mon Sep 17 00:00:00 2001
From: qiaoqinzheng <qiaoqinzheng@hivekion.com>
Date: Tue, 16 Jan 2024 19:28:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2MDC=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=95=B0=E6=8D=AE=E5=BA=93=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E7=9A=84mdc=E6=95=B0=E6=8D=AE=E7=BC=BA=E5=A4=B1halflife?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=93=E5=8A=A0=E8=BD=BD=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=AF=B9=E5=BA=94mdc=E5=80=BC=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/GammaServiceImpl.java        | 38 +++++++++++++++++--
 1 file changed, 34 insertions(+), 4 deletions(-)

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 8bc2f59d..e2b6c028 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
@@ -214,8 +214,23 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
             }
             //读取redis缓存的计算mdc信息
             Map<String, CalMDCInfo> mdcInfoMap = (Map<String, CalMDCInfo>) redisUtil.get("mdcInfoMap-"+phd.getHeader().getSystem_type());
-            if (CollectionUtils.isNotEmpty(mdcInfoMap)) {
-                phd.setMdcInfoMap(mdcInfoMap);
+            //如果是数据库加载  判断如果mdc计算结果是空的  就加入新的  否则使用数据库加载的mdc数据
+            if (CollectionUtils.isEmpty(phd.getMdcInfoMap())) {
+                if (CollectionUtils.isNotEmpty(mdcInfoMap)) {
+                    phd.setMdcInfoMap(mdcInfoMap);
+                }
+            } else {
+                if (CollectionUtils.isNotEmpty(mdcInfoMap)) {
+                    Map<String, CalMDCInfo> infoMap = phd.getMdcInfoMap();
+                    for (Map.Entry<String, CalMDCInfo> entry:infoMap.entrySet()) {
+                        String nuclName = entry.getKey();
+                        CalMDCInfo info = mdcInfoMap.get(nuclName);
+                        if (Objects.nonNull(info)) {
+                            CalMDCInfo mdcInfo = entry.getValue();
+                            mdcInfo.setHalflife(info.getHalflife());
+                        }
+                    }
+                }
             }
             gammaFileUtil.Qcstate(phd);
             key = fileName + StringPool.DASH + userName;
@@ -538,8 +553,23 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
             }
             //读取redis缓存的计算mdc信息
             Map<String, CalMDCInfo> mdcInfoMap = (Map<String, CalMDCInfo>) redisUtil.get("mdcInfoMap-"+phd.getHeader().getSystem_type());
-            if (CollectionUtils.isNotEmpty(mdcInfoMap)) {
-                phd.setMdcInfoMap(mdcInfoMap);
+            //如果是数据库加载  判断如果mdc计算结果是空的  就加入新的  否则使用数据库加载的mdc数据
+            if (CollectionUtils.isEmpty(phd.getMdcInfoMap())) {
+                if (CollectionUtils.isNotEmpty(mdcInfoMap)) {
+                    phd.setMdcInfoMap(mdcInfoMap);
+                }
+            } else {
+                if (CollectionUtils.isNotEmpty(mdcInfoMap)) {
+                    Map<String, CalMDCInfo> infoMap = phd.getMdcInfoMap();
+                    for (Map.Entry<String, CalMDCInfo> entry:infoMap.entrySet()) {
+                        String nuclName = entry.getKey();
+                        CalMDCInfo info = mdcInfoMap.get(nuclName);
+                        if (Objects.nonNull(info)) {
+                            CalMDCInfo mdcInfo = entry.getValue();
+                            mdcInfo.setHalflife(info.getHalflife());
+                        }
+                    }
+                }
             }
         }
         // 获取当前角色配置的颜色信息