From 3ce210b557803b506c2700983acb84605c0165c9 Mon Sep 17 00:00:00 2001 From: panbaolin <123456> Date: Mon, 25 Sep 2023 09:26:57 +0800 Subject: [PATCH] =?UTF-8?q?fix:1.=E4=BF=AE=E6=94=B9B=E8=B0=B1=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E5=86=99=E5=85=A5=E6=96=87=E4=BB=B6bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jeecg/modules/spectrum/ParsingProcessLog.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) 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 7234d754..258a9464 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 @@ -1,17 +1,14 @@ package org.jeecg.modules.spectrum; -import com.google.common.collect.Lists; import lombok.Setter; import org.jeecg.common.constant.StringConstant; import org.jeecg.common.properties.SpectrumPathProperties; import org.jeecg.common.util.DateUtils; import org.jeecg.modules.base.enums.DataType; -import org.jeecg.modules.base.enums.SampleStatus; import org.jeecg.modules.base.enums.SystemType; import org.jeecg.modules.native_jni.struct.BgAnalyseResult; import org.jeecg.modules.native_jni.struct.EnergySpectrumStruct; import org.jeecg.modules.service.BlockConstant; - import java.io.ByteArrayInputStream; import java.nio.charset.StandardCharsets; import java.util.List; @@ -166,12 +163,13 @@ public class ParsingProcessLog { if(fileNotExist){ // Gas谱或Det谱文件找不到异常结束 fileNotExistException(); + }else{ + this.readCalibrationData(); + this.reading_roi_limits(); + this.reading_roi_ratios(); + this.reading_B_G_Efficiency(); + this.NCC_analysis(); } - this.readCalibrationData(); - this.reading_roi_limits(); - this.reading_roi_ratios(); - this.reading_B_G_Efficiency(); - this.NCC_analysis(); if(analysisDataStoreFlag == true){ storeFlag = "error";