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:57:57 +08:00
parent 70f3d172b6
commit 1408424893
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

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

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

@ -3811,7 +3811,22 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
map.put("savedAnalysisResult", true); map.put("savedAnalysisResult", true);
} }
} else { } 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); map.put("XeData", Collections.EMPTY_LIST);
} }
} catch (Exception e) { } catch (Exception e) {