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

Merge branch 'mdc' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide into mdc

Browse Source
This commit is contained in:
panbaolin 2024-01-02 14:53:57 +08:00
commit 43381353b8
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;
}
//如果分析结果错误

1
jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_B_Analysis.java
View File

@ -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);
}
}