From a27ddf6c2c2cfaeb28f5f88e0056b339ba668685 Mon Sep 17 00:00:00 2001
From: panbaolin <123456>
Date: Tue, 2 Jan 2024 17:12:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:1.=E4=BF=AE=E6=94=B9=E6=9D=A5=E8=87=AA?=
 =?UTF-8?q?=E4=BA=8Efilesource=E7=9A=84SOH=E3=80=81ALERT=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/jeecg/modules/spectrum/AbstractSpectrumHandler.java  | 5 ++++-
 .../main/java/org/jeecg/modules/spectrum/AlertSpectrum.java  | 3 +++
 .../org/jeecg/modules/spectrum/HealthStatusSpectrum.java     | 2 ++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/AbstractSpectrumHandler.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/AbstractSpectrumHandler.java
index d1e9a8ff..63520992 100644
--- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/AbstractSpectrumHandler.java
+++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/AbstractSpectrumHandler.java
@@ -243,7 +243,10 @@ public abstract class AbstractSpectrumHandler extends AbstractChain {
     }
 
     /**
-     * 处理解析失败的文件，上传到undeal目录
+     * 处理解析失败的文件
+     * 1.格式错误移动到errorfile
+     * 2.filerepeat错误直接删除
+     * 3.非filerepeat错误移动到undel
      * @throws FileNotFoundException
      */
     protected void handleParseingFailFile(Exception e) throws FileNotFoundException {
diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/AlertSpectrum.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/AlertSpectrum.java
index cdea2677..84264f8e 100644
--- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/AlertSpectrum.java
+++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/AlertSpectrum.java
@@ -89,6 +89,9 @@ public class AlertSpectrum extends AbstractSpectrumHandler{
             }catch (Exception e){
                 //异常返回文件名称用于报错日志
                 super.returnFileName.append(super.spectrumFile.getName());
+
+                //处理解析失败的文件
+                super.handleParseingFailFile(e);
                 throw e;
             }finally {
                 //把流程日志保存到日志目录
diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/HealthStatusSpectrum.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/HealthStatusSpectrum.java
index 552b392f..13f4af23 100644
--- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/HealthStatusSpectrum.java
+++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/HealthStatusSpectrum.java
@@ -91,6 +91,8 @@ public class HealthStatusSpectrum extends AbstractSpectrumHandler{
             }catch (Exception e){
                 //异常返回文件名称用于报错日志
                 super.returnFileName.append(super.spectrumFile.getName());
+                //处理解析失败的文件
+                super.handleParseingFailFile(e);
                 throw e;
             }
         }