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

---
 .../main/java/org/jeecg/common/util/GammaFileUtil.java | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 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 72546a39..6d6f07be 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
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.net.ftp.FTP;
@@ -46,6 +47,7 @@ import java.text.ParseException;
 import java.util.*;
 
 @Component
+@Slf4j
 public class GammaFileUtil extends AbstractLogOrReport {
 
     @Autowired
@@ -1549,8 +1551,12 @@ public class GammaFileUtil extends AbstractLogOrReport {
                     peak.recoilDeltaChan = "1";
                 }
             }
-        } catch (JsonProcessingException e) {
-            throw new RuntimeException(e);
+        } catch (JsonProcessingException e){
+            e.printStackTrace();
+            log.error("AnalyseSpectrum(): {}", e.getMessage());
+        } catch (RuntimeException e) {
+            e.printStackTrace();
+            log.error("AnalyseSpectrum(): {}", e.getMessage());
         } finally {
             if (Objects.nonNull(tmpFile)) {
                 tmpFile.delete();