From 6b545ab96cc4586da31bdc1cfea9ee72134745ea Mon Sep 17 00:00:00 2001
From: qiaoqinzheng <qiaoqinzheng@hivekion.com>
Date: Tue, 2 Jan 2024 14:42:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=A4=84=E7=90=86=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E9=80=BB=E8=BE=91=E5=88=A4=E6=96=AD=EF=BC=8C=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E5=88=B0=E8=B0=83=E7=94=A8=E5=88=86=E6=9E=90=E6=AD=A5?=
 =?UTF-8?q?=E9=AA=A4=E5=AF=BC=E8=87=B4=E7=A9=BA=E6=8C=87=E9=92=88=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9=20=E8=87=AA=E5=8A=A8=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E5=A2=9E=E5=8A=A0=E9=80=BB=E8=BE=91=EF=BC=8C=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8dll=E5=88=86=E6=9E=90=E5=90=8E=E5=A6=82=E6=9E=9C?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E4=BA=86=EF=BC=8C=E5=B0=86=E5=88=86=E6=9E=90?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E7=9A=84=E5=86=85=E5=AE=B9=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=88=B0errorLog=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/org/jeecg/modules/spectrum/ParsingProcessLog.java | 2 +-
 .../main/java/org/jeecg/modules/spectrum/Sample_B_Analysis.java | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/ParsingProcessLog.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/ParsingProcessLog.java
index a0dbbbcb..446af1d2 100644
--- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/ParsingProcessLog.java
+++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/ParsingProcessLog.java
@@ -172,7 +172,7 @@ public class ParsingProcessLog extends AbstractAutoLogOrReport{
            this.setDetAndGasIdLog();
            //获取analyseResult
            BgAnalyseResult analyseResult = sample_B_Analysis.analyseResult;
-           if (StringUtils.isNotBlank(analyseResult.error_log) && !analyseResult.error_log.equalsIgnoreCase("no error.")) {
+           if (Objects.nonNull(analyseResult) && !analyseResult.analyse_flag) {
                analysisResultFlag = true;
            }
            //如果分析结果错误
diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_B_Analysis.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_B_Analysis.java
index dac87c66..31b3681a 100644
--- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_B_Analysis.java
+++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_B_Analysis.java
@@ -227,6 +227,7 @@ public class Sample_B_Analysis implements BlockConstant {
         System.out.println(analyseResult);
         this.analyseResult = analyseResult;
         if(Objects.isNull(analyseResult) || !analyseResult.analyse_flag){
+            ErrorLogManager.getInstance().write(new SpectrumErrorEvent(new Date(), analyseResult.error_log, this.phdFileName));
             throw new BAnalyseException("THE PHD file cannot be parsed:"+this.sampleFileFinalPath+","+this.gasFileFinalPath+","+this.detFileFinalPath);
         }
     }