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

人工交互模块Beta分析算法返回内容增加message字段提示信息

Browse Source
This commit is contained in:
qiaoqinzheng 2024-03-15 10:55:00 +08:00
parent 4601af9974
commit ba7bd409f3
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/PHDFileUtil.java
View File

@ -1008,6 +1008,7 @@ public class PHDFileUtil extends AbstractLogOrReport {
}
map.put("DetBoundary", boundaryList);
}
map.put("message", analyseResult.error_log);
bRet = false;
return bRet;
} else {
@ -1094,6 +1095,7 @@ public class PHDFileUtil extends AbstractLogOrReport {
}
map.put("DetBoundary", boundaryList);
}
map.put("message", "analyse Success.");
return bRet;
}
}

17
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java
View File

@ -3831,7 +3831,22 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
map.put("savedAnalysisResult", true);
}
} else {
map.clear();
List<Boundary> sampleBoundary = (List<Boundary>) map.get("SampleBoundary");
if(CollectionUtils.isNotEmpty(sampleBoundary)) {
betaDataFile.setSampleBoundary(sampleBoundary);
}
List<Boundary> gasBoundary = (List<Boundary>) map.get("GasBoundary");
if(CollectionUtils.isNotEmpty(gasBoundary)) {
betaDataFile.setGasBoundary(gasBoundary);
}
List<Boundary> detBoundary = (List<Boundary>) map.get("DetBoundary");
if(CollectionUtils.isNotEmpty(detBoundary)) {
betaDataFile.setDetBoundary(detBoundary);
}
List<Boundary> qcBoundary = (List<Boundary>) map.get("QCBoundary");
if(CollectionUtils.isNotEmpty(qcBoundary)) {
betaDataFile.setQcBoundary(qcBoundary);
}
map.put("XeData", Collections.EMPTY_LIST);
}
} catch (Exception e) {