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

人工交互模块Beta部分分析失败后将核素数据列表清空

Browse Source
This commit is contained in:
qiaoqinzheng 2024-04-12 15:34:00 +08:00
parent ea3cc4ea0e
commit a025eb5098
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3480,6 +3480,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
} }
betaDataFile.setBProcessed(false); betaDataFile.setBProcessed(false);
betaDataFile.setSaveAnalysisResult(false); betaDataFile.setSaveAnalysisResult(false);
betaDataFile.setXeResultsSpectrumList(Collections.EMPTY_LIST);
xeMap.put("XeData", Collections.EMPTY_LIST); xeMap.put("XeData", Collections.EMPTY_LIST);
xeMap.put("bProcessed", false); xeMap.put("bProcessed", false);
xeMap.put("savedAnalysisResult", false); xeMap.put("savedAnalysisResult", false);
@ -3722,6 +3723,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
} }
sampleBetaData.setBProcessed(false); sampleBetaData.setBProcessed(false);
sampleBetaData.setSaveAnalysisResult(false); sampleBetaData.setSaveAnalysisResult(false);
sampleBetaData.setXeResultsSpectrumList(Collections.EMPTY_LIST);
xeMap.put("XeData", Collections.EMPTY_LIST); xeMap.put("XeData", Collections.EMPTY_LIST);
xeMap.put("bProcessed", false); xeMap.put("bProcessed", false);
xeMap.put("savedAnalysisResult", false); xeMap.put("savedAnalysisResult", false);
@ -3852,6 +3854,7 @@ 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); betaDataFile.setSaveAnalysisResult(false);
betaDataFile.setXeResultsSpectrumList(Collections.EMPTY_LIST);
map.put("bProcessed", false); map.put("bProcessed", false);
map.put("savedAnalysisResult", false); map.put("savedAnalysisResult", false);
} }
@ -3977,6 +3980,7 @@ 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); betaDataFile.setSaveAnalysisResult(false);
betaDataFile.setXeResultsSpectrumList(Collections.EMPTY_LIST);
map.put("bProcessed", false); map.put("bProcessed", false);
map.put("savedAnalysisResult", false); map.put("savedAnalysisResult", false);
mapList.put(sampleFileName, map); mapList.put(sampleFileName, map);
@ -5826,10 +5830,12 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
public List<GardsXeResults> getXeDataList(List<GardsXeResultsSpectrum> xeResultsSpectrumList) { public List<GardsXeResults> getXeDataList(List<GardsXeResultsSpectrum> xeResultsSpectrumList) {
List<GardsXeResults> xeDataList = new LinkedList<>(); List<GardsXeResults> xeDataList = new LinkedList<>();
for (GardsXeResultsSpectrum xeResultsSpectrum:xeResultsSpectrumList) { if (CollectionUtils.isNotEmpty(xeResultsSpectrumList)) {
GardsXeResults xeResults = new GardsXeResults(); for (GardsXeResultsSpectrum xeResultsSpectrum:xeResultsSpectrumList) {
BeanUtil.copyProperties(xeResultsSpectrum, xeResults); GardsXeResults xeResults = new GardsXeResults();
xeDataList.add(xeResults); BeanUtil.copyProperties(xeResultsSpectrum, xeResults);
xeDataList.add(xeResults);
}
} }
return xeDataList; return xeDataList;
} }