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

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

Browse Source
This commit is contained in:
qiaoqinzheng 2024-03-15 11:34:57 +08:00
parent 8d7bee4735
commit f8da6c3aae
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3248,17 +3248,11 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
return result; return result;
} }
map = BetaGammaAnalyzeCurrentProcess(analyseData, betaDataFile); map = BetaGammaAnalyzeCurrentProcess(analyseData, betaDataFile);
map.put("bProcessed", true);
map.put("savedAnalysisResult", true);
result.setSuccess(true); result.setSuccess(true);
result.setResult(map); result.setResult(map);
} else if ("AllSpectrum".equals(analyseData.getApplyType())) { } else if ("AllSpectrum".equals(analyseData.getApplyType())) {
//获取当前选中的文件名称 //获取当前选中的文件名称
map = BetaGammaAnalyzeAllProcess(analyseData, userName, currentFileName); map = BetaGammaAnalyzeAllProcess(analyseData, userName, currentFileName);
if (CollectionUtils.isNotEmpty(map)) {
map.put("bProcessed", true);
map.put("savedAnalysisResult", true);
}
result.setSuccess(true); result.setSuccess(true);
result.setResult(map); result.setResult(map);
} }
@ -3450,9 +3444,9 @@ 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);
} 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)) {
@ -3470,7 +3464,9 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
if(CollectionUtils.isNotEmpty(qcBoundary)) { if(CollectionUtils.isNotEmpty(qcBoundary)) {
betaDataFile.setQcBoundary(qcBoundary); betaDataFile.setQcBoundary(qcBoundary);
} }
betaDataFile.setBProcessed(false);
xeMap.put("XeData", Collections.EMPTY_LIST); xeMap.put("XeData", Collections.EMPTY_LIST);
xeMap.put("bProcessed", false);
} }
} }
} catch (Exception e) { } catch (Exception e) {
@ -3681,9 +3677,9 @@ 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);
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");
@ -3702,7 +3698,9 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
if(CollectionUtils.isNotEmpty(qcBoundary)) { if(CollectionUtils.isNotEmpty(qcBoundary)) {
sampleBetaData.setQcBoundary(qcBoundary); sampleBetaData.setQcBoundary(qcBoundary);
} }
sampleBetaData.setBProcessed(false);
xeMap.put("XeData", Collections.EMPTY_LIST); xeMap.put("XeData", Collections.EMPTY_LIST);
xeMap.put("bProcessed", false);
analyseResultMap.put(sampleFileName, xeMap); analyseResultMap.put(sampleFileName, xeMap);
} }
} }
@ -3806,9 +3804,7 @@ 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");
@ -3828,6 +3824,8 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
betaDataFile.setQcBoundary(qcBoundary); betaDataFile.setQcBoundary(qcBoundary);
} }
map.put("XeData", Collections.EMPTY_LIST); map.put("XeData", Collections.EMPTY_LIST);
betaDataFile.setBProcessed(false);
map.put("bProcessed", false);
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
@ -3927,9 +3925,7 @@ 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");
@ -3949,6 +3945,8 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
betaDataFile.setQcBoundary(qcBoundary); betaDataFile.setQcBoundary(qcBoundary);
} }
map.put("XeData", Collections.EMPTY_LIST); map.put("XeData", Collections.EMPTY_LIST);
betaDataFile.setBProcessed(false);
map.put("bProcessed", false);
mapList.put(sampleFileName, map); mapList.put(sampleFileName, map);
} }
} }