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

人工交互模块Beta部分分析算法，失败的情况下BProcessd,savedAnalysisResult参数修改为false并传递给前端

Browse Source
This commit is contained in:
qiaoqinzheng 2024-03-15 11:47:50 +08:00
parent f8da6c3aae
commit 953dd61988
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3444,9 +3444,11 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
} }
betaDataFile.setXeResultsSpectrumList(xeResultsSpectrumList); betaDataFile.setXeResultsSpectrumList(xeResultsSpectrumList);
betaDataFile.setBProcessed(true); betaDataFile.setBProcessed(true);
betaDataFile.setSaveAnalysisResult(true);
betaDataFile.setBgPara(spectrum_group.BgCalPara); betaDataFile.setBgPara(spectrum_group.BgCalPara);
} }
xeMap.put("bProcessed", true); xeMap.put("bProcessed", true);
xeMap.put("savedAnalysisResult", true);
} else { } else {
List<Boundary> sampleBoundary = (List<Boundary>) xeMap.get("SampleBoundary"); List<Boundary> sampleBoundary = (List<Boundary>) xeMap.get("SampleBoundary");
if(CollectionUtils.isNotEmpty(sampleBoundary)) { if(CollectionUtils.isNotEmpty(sampleBoundary)) {
@ -3465,8 +3467,10 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
betaDataFile.setQcBoundary(qcBoundary); betaDataFile.setQcBoundary(qcBoundary);
} }
betaDataFile.setBProcessed(false); betaDataFile.setBProcessed(false);
betaDataFile.setSaveAnalysisResult(false);
xeMap.put("XeData", Collections.EMPTY_LIST); xeMap.put("XeData", Collections.EMPTY_LIST);
xeMap.put("bProcessed", false); xeMap.put("bProcessed", false);
xeMap.put("savedAnalysisResult", false);
} }
} }
} catch (Exception e) { } catch (Exception e) {
@ -3677,9 +3681,11 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
} }
sampleBetaData.setXeResultsSpectrumList(xeResultsSpectrumList); sampleBetaData.setXeResultsSpectrumList(xeResultsSpectrumList);
sampleBetaData.setBProcessed(true); sampleBetaData.setBProcessed(true);
sampleBetaData.setSaveAnalysisResult(true);
sampleBetaData.setBgPara(spectrum_group.BgCalPara); sampleBetaData.setBgPara(spectrum_group.BgCalPara);
} }
xeMap.put("bProcessed", true); xeMap.put("bProcessed", true);
xeMap.put("savedAnalysisResult", true);
analyseResultMap.put(sampleFileName, xeMap); analyseResultMap.put(sampleFileName, xeMap);
} else { } else {
List<Boundary> sampleBoundary = (List<Boundary>) xeMap.get("SampleBoundary"); List<Boundary> sampleBoundary = (List<Boundary>) xeMap.get("SampleBoundary");
@ -3699,8 +3705,10 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
sampleBetaData.setQcBoundary(qcBoundary); sampleBetaData.setQcBoundary(qcBoundary);
} }
sampleBetaData.setBProcessed(false); sampleBetaData.setBProcessed(false);
sampleBetaData.setSaveAnalysisResult(false);
xeMap.put("XeData", Collections.EMPTY_LIST); xeMap.put("XeData", Collections.EMPTY_LIST);
xeMap.put("bProcessed", false); xeMap.put("bProcessed", false);
xeMap.put("savedAnalysisResult", false);
analyseResultMap.put(sampleFileName, xeMap); analyseResultMap.put(sampleFileName, xeMap);
} }
} }
@ -3804,7 +3812,9 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
betaDataFile.setXeResultsSpectrumList(xeDataList); betaDataFile.setXeResultsSpectrumList(xeDataList);
} }
betaDataFile.setBProcessed(true); betaDataFile.setBProcessed(true);
betaDataFile.setSaveAnalysisResult(true);
map.put("bProcessed", true); map.put("bProcessed", true);
map.put("savedAnalysisResult", true);
} }
} else { } else {
List<Boundary> sampleBoundary = (List<Boundary>) map.get("SampleBoundary"); List<Boundary> sampleBoundary = (List<Boundary>) map.get("SampleBoundary");
@ -3825,7 +3835,9 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
} }
map.put("XeData", Collections.EMPTY_LIST); map.put("XeData", Collections.EMPTY_LIST);
betaDataFile.setBProcessed(false); betaDataFile.setBProcessed(false);
betaDataFile.setSaveAnalysisResult(false);
map.put("bProcessed", false); map.put("bProcessed", false);
map.put("savedAnalysisResult", false);
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
@ -3925,7 +3937,9 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
betaDataFile.setXeResultsSpectrumList(xeDataList); betaDataFile.setXeResultsSpectrumList(xeDataList);
} }
betaDataFile.setBProcessed(true); betaDataFile.setBProcessed(true);
betaDataFile.setSaveAnalysisResult(true);
map.put("bProcessed", true); map.put("bProcessed", true);
map.put("savedAnalysisResult", true);
mapList.put(sampleFileName, map); mapList.put(sampleFileName, map);
} else { } else {
List<Boundary> sampleBoundary = (List<Boundary>) map.get("SampleBoundary"); List<Boundary> sampleBoundary = (List<Boundary>) map.get("SampleBoundary");
@ -3946,7 +3960,9 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
} }
map.put("XeData", Collections.EMPTY_LIST); map.put("XeData", Collections.EMPTY_LIST);
betaDataFile.setBProcessed(false); betaDataFile.setBProcessed(false);
betaDataFile.setSaveAnalysisResult(false);
map.put("bProcessed", false); map.put("bProcessed", false);
map.put("savedAnalysisResult", false);
mapList.put(sampleFileName, map); mapList.put(sampleFileName, map);
} }
} }