From e6eb6699a2230168c022f08b72a3dc1e9cdd8af6 Mon Sep 17 00:00:00 2001
From: nieziyan <nzyone@qq.com>
Date: Mon, 23 Oct 2023 10:04:16 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9Aadd=20log?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/jeecg/modules/spectrum/Sample_G_Analysis.java   | 2 ++
 .../src/main/java/org/jeecg/common/util/GammaFileUtil.java   | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_G_Analysis.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_G_Analysis.java
index ffbcab53..b78134d1 100644
--- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_G_Analysis.java
+++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_G_Analysis.java
@@ -112,6 +112,7 @@ public class Sample_G_Analysis {
    }
 
    public void analysis(){
+       log.info("Gamma自动处理分析--Start");
        try {
            /* 准备Gamma分析需要的数据 */
            GStoreMiddleProcessData middleData = new GStoreMiddleProcessData();
@@ -170,6 +171,7 @@ public class Sample_G_Analysis {
        }finally {
 
        }
+       log.info("Gamma自动处理分析--End");
    }
 
    private void storageDataToDatabase(GStoreMiddleProcessData middleData,  Map<String, QcCheckItem> qcItems){
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 afdad0ae..72546a39 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
@@ -1,5 +1,6 @@
 package org.jeecg.common.util;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
@@ -25,6 +26,7 @@ import org.jeecg.modules.native_jni.CalValuesHandler;
 import org.jeecg.modules.native_jni.EnergySpectrumHandler;
 import org.jeecg.modules.native_jni.struct.CalValuesOut;
 import org.jeecg.modules.native_jni.struct.EnergySpectrumStruct;
+import org.jeecgframework.core.util.ApplicationContextUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -1366,6 +1368,9 @@ public class GammaFileUtil extends AbstractLogOrReport {
         try {
             String phdStr = mapper.writeValueAsString(phd);
             String nuclideLinesMap = mapper.writeValueAsString(mapLines);
+            if (ObjectUtil.isNull(analysisProcess)){
+                analysisProcess = ApplicationContextUtil.getContext().getBean(AnalysisProcess.class);
+            }
             String strValue = CalValuesHandler.analyseSpectrum(phdStr, nuclideLinesMap, tmpFile.getAbsolutePath(), analysisProcess);
             Map<String, Object> parseMap = JSON.parseObject(strValue, Map.class);
             for (Map.Entry<String, Object> entry:parseMap.entrySet()) {