xiaoguangbin/AnalysisSystemForRadionuclide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:1.修改B谱日志写入文件bug

Browse Source
This commit is contained in:
panbaolin 2023-09-25 09:26:57 +08:00
parent efc9261331
commit 3ce210b557
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/ParsingProcessLog.java
View File

@ -1,17 +1,14 @@
package org.jeecg.modules.spectrum; package org.jeecg.modules.spectrum;
import com.google.common.collect.Lists;
import lombok.Setter; import lombok.Setter;
import org.jeecg.common.constant.StringConstant; import org.jeecg.common.constant.StringConstant;
import org.jeecg.common.properties.SpectrumPathProperties; import org.jeecg.common.properties.SpectrumPathProperties;
import org.jeecg.common.util.DateUtils; import org.jeecg.common.util.DateUtils;
import org.jeecg.modules.base.enums.DataType; 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.base.enums.SystemType;
import org.jeecg.modules.native_jni.struct.BgAnalyseResult; import org.jeecg.modules.native_jni.struct.BgAnalyseResult;
import org.jeecg.modules.native_jni.struct.EnergySpectrumStruct; import org.jeecg.modules.native_jni.struct.EnergySpectrumStruct;
import org.jeecg.modules.service.BlockConstant; import org.jeecg.modules.service.BlockConstant;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.List; import java.util.List;
@ -166,12 +163,13 @@ public class ParsingProcessLog {
if(fileNotExist){ if(fileNotExist){
// Gas谱或Det谱文件找不到异常结束 // Gas谱或Det谱文件找不到异常结束
fileNotExistException(); 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){ if(analysisDataStoreFlag == true){
storeFlag = "error"; storeFlag = "error";