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

人工交互存储公式数据，det相关存储的数据类型错误问题修改

Browse Source
This commit is contained in:
qiaoqinzheng 2024-02-07 12:29:40 +08:00
parent de2c72a3ec
commit 12f2f1e23e
1 changed files with 31 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -469,8 +469,6 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
} }
//给公用变量赋值sampleId //给公用变量赋值sampleId
betaDataFile.setSampleId(String.valueOf(sampleId)); betaDataFile.setSampleId(String.valueOf(sampleId));
//用于记录文件路径信息
List<String> filePaths = new LinkedList<>();
//判断sample信息是否存在 //判断sample信息是否存在
if (Objects.nonNull(sample)) { if (Objects.nonNull(sample)) {
betaDataFile.setSampleFilePathName(ftpUtil.getFtpRootPath() + spectrumPathProperties.getSaveFilePath() + StringPool.SLASH +dbSpectrumFilePath.getSampleFilePath()); betaDataFile.setSampleFilePathName(ftpUtil.getFtpRootPath() + spectrumPathProperties.getSaveFilePath() + StringPool.SLASH +dbSpectrumFilePath.getSampleFilePath());
@ -933,9 +931,9 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
if (betaDataFile.isSaveAnalysisResult()) { if (betaDataFile.isSaveAnalysisResult()) {
//对分析后的内容进行数据获取 //对分析后的内容进行数据获取
List<GardsROIChannelsSpectrum> channelsSpectrums = betaDataFile.getRoiChannelsSpectrumList(); List<GardsROIChannelsSpectrum> channelsSpectrums = betaDataFile.getRoiChannelsSpectrumList();
List<GardsROIChannelsSpectrum> roiChannelsSpectrumsSample = channelsSpectrums.stream().filter(item -> item.getDataType().equalsIgnoreCase("S")).collect(Collectors.toList()); List<GardsROIChannelsSpectrum> roiChannelsSpectrumsSample = channelsSpectrums.stream().filter(item -> item.getDataType().equalsIgnoreCase(DataTypeAbbr.SAMPLEPHD.getType())).collect(Collectors.toList());
List<GardsROIChannelsSpectrum> roiChannelsSpectrumsGas = channelsSpectrums.stream().filter(item -> item.getDataType().equalsIgnoreCase("G")).collect(Collectors.toList()); List<GardsROIChannelsSpectrum> roiChannelsSpectrumsGas = channelsSpectrums.stream().filter(item -> item.getDataType().equalsIgnoreCase(DataTypeAbbr.GASBKPHD.getType())).collect(Collectors.toList());
List<GardsROIChannelsSpectrum> roiChannelsSpectrumsDet = channelsSpectrums.stream().filter(item -> item.getDataType().equalsIgnoreCase("D")).collect(Collectors.toList()); List<GardsROIChannelsSpectrum> roiChannelsSpectrumsDet = channelsSpectrums.stream().filter(item -> item.getDataType().equalsIgnoreCase(DataTypeAbbr.DETBKPHD.getType())).collect(Collectors.toList());
List<GardsROIResultsSpectrum> resultsSpectrums = betaDataFile.getRoiResultsSpectrumList(); List<GardsROIResultsSpectrum> resultsSpectrums = betaDataFile.getRoiResultsSpectrumList();
List<GardsXeResultsSpectrum> xeResultsSpectrums = betaDataFile.getXeResultsSpectrumList(); List<GardsXeResultsSpectrum> xeResultsSpectrums = betaDataFile.getXeResultsSpectrumList();
for (int i=0; i<xeResultsSpectrums.size(); i++) { for (int i=0; i<xeResultsSpectrums.size(); i++) {
@ -949,20 +947,20 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
List<GardsCalibrationSpectrum> gammaCalibrationParamList = betaDataFile.getGammaCalibrationSpectrumList(); List<GardsCalibrationSpectrum> gammaCalibrationParamList = betaDataFile.getGammaCalibrationSpectrumList();
List<GardsCalibrationSpectrum> gammaCalibrationSpectrumEList = betaDataFile.getGammaCalibrationSpectrumEList(); List<GardsCalibrationSpectrum> gammaCalibrationSpectrumEList = betaDataFile.getGammaCalibrationSpectrumEList();
for (int i=0; i<gammaCalibrationParamList.size(); i++) { for (int i=0; i<gammaCalibrationParamList.size(); i++) {
if (gammaCalibrationParamList.get(i).getDataType().equals("S")) { if (gammaCalibrationParamList.get(i).getDataType().equals(DataTypeAbbr.SAMPLEPHD.getType())) {
gammaCalibrationParamS = gammaCalibrationParamList.get(i); gammaCalibrationParamS = gammaCalibrationParamList.get(i);
} else if (gammaCalibrationParamList.get(i).getDataType().equals("G")) { } else if (gammaCalibrationParamList.get(i).getDataType().equals(DataTypeAbbr.GASBKPHD.getType())) {
gammaCalibrationParamG = gammaCalibrationParamList.get(i); gammaCalibrationParamG = gammaCalibrationParamList.get(i);
} else if (gammaCalibrationParamList.get(i).getDataType().equals("D")) { } else if (gammaCalibrationParamList.get(i).getDataType().equals(DataTypeAbbr.DETBKPHD.getType())) {
gammaCalibrationParamD = gammaCalibrationParamList.get(i); gammaCalibrationParamD = gammaCalibrationParamList.get(i);
} }
} }
for (int i=0; i<gammaCalibrationSpectrumEList.size(); i++) { for (int i=0; i<gammaCalibrationSpectrumEList.size(); i++) {
if (gammaCalibrationSpectrumEList.get(i).getDataType().equals("S")) { if (gammaCalibrationSpectrumEList.get(i).getDataType().equals(DataTypeAbbr.SAMPLEPHD.getType())) {
gammaCalibrationParamES = gammaCalibrationSpectrumEList.get(i); gammaCalibrationParamES = gammaCalibrationSpectrumEList.get(i);
} else if (gammaCalibrationSpectrumEList.get(i).getDataType().equals("G")) { } else if (gammaCalibrationSpectrumEList.get(i).getDataType().equals(DataTypeAbbr.GASBKPHD.getType())) {
gammaCalibrationParamEG = gammaCalibrationSpectrumEList.get(i); gammaCalibrationParamEG = gammaCalibrationSpectrumEList.get(i);
} else if (gammaCalibrationSpectrumEList.get(i).getDataType().equals("D")) { } else if (gammaCalibrationSpectrumEList.get(i).getDataType().equals(DataTypeAbbr.DETBKPHD.getType())) {
gammaCalibrationParamED = gammaCalibrationSpectrumEList.get(i); gammaCalibrationParamED = gammaCalibrationSpectrumEList.get(i);
} }
} }
@ -970,20 +968,20 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
List<GardsCalibrationSpectrum> betaCalibrationParamList = betaDataFile.getBetaCalibrationSpectrumList(); List<GardsCalibrationSpectrum> betaCalibrationParamList = betaDataFile.getBetaCalibrationSpectrumList();
List<GardsCalibrationSpectrum> betaCalibrationSpectrumEList = betaDataFile.getBetaCalibrationSpectrumEList(); List<GardsCalibrationSpectrum> betaCalibrationSpectrumEList = betaDataFile.getBetaCalibrationSpectrumEList();
for (int i=0; i<betaCalibrationParamList.size(); i++) { for (int i=0; i<betaCalibrationParamList.size(); i++) {
if (betaCalibrationParamList.get(i).getDataType().equals("S")) { if (betaCalibrationParamList.get(i).getDataType().equals(DataTypeAbbr.SAMPLEPHD.getType())) {
betaCalibrationParamS = betaCalibrationParamList.get(i); betaCalibrationParamS = betaCalibrationParamList.get(i);
} else if (betaCalibrationParamList.get(i).getDataType().equals("G")) { } else if (betaCalibrationParamList.get(i).getDataType().equals(DataTypeAbbr.GASBKPHD.getType())) {
betaCalibrationParamG = betaCalibrationParamList.get(i); betaCalibrationParamG = betaCalibrationParamList.get(i);
} else if (betaCalibrationParamList.get(i).getDataType().equals("D")) { } else if (betaCalibrationParamList.get(i).getDataType().equals(DataTypeAbbr.DETBKPHD.getType())) {
betaCalibrationParamD = betaCalibrationParamList.get(i); betaCalibrationParamD = betaCalibrationParamList.get(i);
} }
} }
for (int i=0; i<betaCalibrationSpectrumEList.size(); i++) { for (int i=0; i<betaCalibrationSpectrumEList.size(); i++) {
if (betaCalibrationSpectrumEList.get(i).getDataType().equals("S")) { if (betaCalibrationSpectrumEList.get(i).getDataType().equals(DataTypeAbbr.SAMPLEPHD.getType())) {
betaCalibrationParamES = betaCalibrationSpectrumEList.get(i); betaCalibrationParamES = betaCalibrationSpectrumEList.get(i);
} else if (betaCalibrationSpectrumEList.get(i).getDataType().equals("G")) { } else if (betaCalibrationSpectrumEList.get(i).getDataType().equals(DataTypeAbbr.GASBKPHD.getType())) {
betaCalibrationParamEG = betaCalibrationSpectrumEList.get(i); betaCalibrationParamEG = betaCalibrationSpectrumEList.get(i);
} else if (betaCalibrationSpectrumEList.get(i).getDataType().equals("D")) { } else if (betaCalibrationSpectrumEList.get(i).getDataType().equals(DataTypeAbbr.DETBKPHD.getType())) {
betaCalibrationParamED = betaCalibrationSpectrumEList.get(i); betaCalibrationParamED = betaCalibrationSpectrumEList.get(i);
} }
} }
@ -4333,9 +4331,9 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
if (betaDataFile.isSaveAnalysisResult()) { if (betaDataFile.isSaveAnalysisResult()) {
//对分析后的内容进行数据获取 //对分析后的内容进行数据获取
List<GardsROIChannelsSpectrum> channelsSpectrums = betaDataFile.getRoiChannelsSpectrumList(); List<GardsROIChannelsSpectrum> channelsSpectrums = betaDataFile.getRoiChannelsSpectrumList();
List<GardsROIChannelsSpectrum> roiChannelsSpectrumsSample = channelsSpectrums.stream().filter(item -> item.getDataType().equalsIgnoreCase("S")).collect(Collectors.toList()); List<GardsROIChannelsSpectrum> roiChannelsSpectrumsSample = channelsSpectrums.stream().filter(item -> item.getDataType().equalsIgnoreCase(DataTypeAbbr.SAMPLEPHD.getType())).collect(Collectors.toList());
List<GardsROIChannelsSpectrum> roiChannelsSpectrumsGas = channelsSpectrums.stream().filter(item -> item.getDataType().equalsIgnoreCase("G")).collect(Collectors.toList()); List<GardsROIChannelsSpectrum> roiChannelsSpectrumsGas = channelsSpectrums.stream().filter(item -> item.getDataType().equalsIgnoreCase(DataTypeAbbr.GASBKPHD.getType())).collect(Collectors.toList());
List<GardsROIChannelsSpectrum> roiChannelsSpectrumsDet = channelsSpectrums.stream().filter(item -> item.getDataType().equalsIgnoreCase("D")).collect(Collectors.toList()); List<GardsROIChannelsSpectrum> roiChannelsSpectrumsDet = channelsSpectrums.stream().filter(item -> item.getDataType().equalsIgnoreCase(DataTypeAbbr.DETBKPHD.getType())).collect(Collectors.toList());
List<GardsROIResultsSpectrum> resultsSpectrums = betaDataFile.getRoiResultsSpectrumList(); List<GardsROIResultsSpectrum> resultsSpectrums = betaDataFile.getRoiResultsSpectrumList();
List<GardsXeResultsSpectrum> xeResultsSpectrums = betaDataFile.getXeResultsSpectrumList(); List<GardsXeResultsSpectrum> xeResultsSpectrums = betaDataFile.getXeResultsSpectrumList();
for (int i=0; i<xeResultsSpectrums.size(); i++) { for (int i=0; i<xeResultsSpectrums.size(); i++) {
@ -4349,20 +4347,20 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
List<GardsCalibrationSpectrum> gammaCalibrationParamList = betaDataFile.getGammaCalibrationSpectrumList(); List<GardsCalibrationSpectrum> gammaCalibrationParamList = betaDataFile.getGammaCalibrationSpectrumList();
List<GardsCalibrationSpectrum> gammaCalibrationSpectrumEList = betaDataFile.getGammaCalibrationSpectrumEList(); List<GardsCalibrationSpectrum> gammaCalibrationSpectrumEList = betaDataFile.getGammaCalibrationSpectrumEList();
for (int i=0; i<gammaCalibrationParamList.size(); i++) { for (int i=0; i<gammaCalibrationParamList.size(); i++) {
if (gammaCalibrationParamList.get(i).getDataType().equals("S")) { if (gammaCalibrationParamList.get(i).getDataType().equals(DataTypeAbbr.SAMPLEPHD.getType())) {
gammaCalibrationParamS = gammaCalibrationParamList.get(i); gammaCalibrationParamS = gammaCalibrationParamList.get(i);
} else if (gammaCalibrationParamList.get(i).getDataType().equals("G")) { } else if (gammaCalibrationParamList.get(i).getDataType().equals(DataTypeAbbr.GASBKPHD.getType())) {
gammaCalibrationParamG = gammaCalibrationParamList.get(i); gammaCalibrationParamG = gammaCalibrationParamList.get(i);
} else if (gammaCalibrationParamList.get(i).getDataType().equals("D")) { } else if (gammaCalibrationParamList.get(i).getDataType().equals(DataTypeAbbr.DETBKPHD.getType())) {
gammaCalibrationParamD = gammaCalibrationParamList.get(i); gammaCalibrationParamD = gammaCalibrationParamList.get(i);
} }
} }
for (int i=0; i<gammaCalibrationSpectrumEList.size(); i++) { for (int i=0; i<gammaCalibrationSpectrumEList.size(); i++) {
if (gammaCalibrationSpectrumEList.get(i).getDataType().equals("S")) { if (gammaCalibrationSpectrumEList.get(i).getDataType().equals(DataTypeAbbr.SAMPLEPHD.getType())) {
gammaCalibrationParamES = gammaCalibrationSpectrumEList.get(i); gammaCalibrationParamES = gammaCalibrationSpectrumEList.get(i);
} else if (gammaCalibrationSpectrumEList.get(i).getDataType().equals("G")) { } else if (gammaCalibrationSpectrumEList.get(i).getDataType().equals(DataTypeAbbr.GASBKPHD.getType())) {
gammaCalibrationParamEG = gammaCalibrationSpectrumEList.get(i); gammaCalibrationParamEG = gammaCalibrationSpectrumEList.get(i);
} else if (gammaCalibrationSpectrumEList.get(i).getDataType().equals("D")) { } else if (gammaCalibrationSpectrumEList.get(i).getDataType().equals(DataTypeAbbr.DETBKPHD.getType())) {
gammaCalibrationParamED = gammaCalibrationSpectrumEList.get(i); gammaCalibrationParamED = gammaCalibrationSpectrumEList.get(i);
} }
} }
@ -4370,20 +4368,20 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
List<GardsCalibrationSpectrum> betaCalibrationParamList = betaDataFile.getBetaCalibrationSpectrumList(); List<GardsCalibrationSpectrum> betaCalibrationParamList = betaDataFile.getBetaCalibrationSpectrumList();
List<GardsCalibrationSpectrum> betaCalibrationSpectrumEList = betaDataFile.getBetaCalibrationSpectrumEList(); List<GardsCalibrationSpectrum> betaCalibrationSpectrumEList = betaDataFile.getBetaCalibrationSpectrumEList();
for (int i=0; i<betaCalibrationParamList.size(); i++) { for (int i=0; i<betaCalibrationParamList.size(); i++) {
if (betaCalibrationParamList.get(i).getDataType().equals("S")) { if (betaCalibrationParamList.get(i).getDataType().equals(DataTypeAbbr.SAMPLEPHD.getType())) {
betaCalibrationParamS = betaCalibrationParamList.get(i); betaCalibrationParamS = betaCalibrationParamList.get(i);
} else if (betaCalibrationParamList.get(i).getDataType().equals("G")) { } else if (betaCalibrationParamList.get(i).getDataType().equals(DataTypeAbbr.GASBKPHD.getType())) {
betaCalibrationParamG = betaCalibrationParamList.get(i); betaCalibrationParamG = betaCalibrationParamList.get(i);
} else if (betaCalibrationParamList.get(i).getDataType().equals("D")) { } else if (betaCalibrationParamList.get(i).getDataType().equals(DataTypeAbbr.DETBKPHD.getType())) {
betaCalibrationParamD = betaCalibrationParamList.get(i); betaCalibrationParamD = betaCalibrationParamList.get(i);
} }
} }
for (int i=0; i<betaCalibrationSpectrumEList.size(); i++) { for (int i=0; i<betaCalibrationSpectrumEList.size(); i++) {
if (betaCalibrationSpectrumEList.get(i).getDataType().equals("S")) { if (betaCalibrationSpectrumEList.get(i).getDataType().equals(DataTypeAbbr.SAMPLEPHD.getType())) {
betaCalibrationParamES = betaCalibrationSpectrumEList.get(i); betaCalibrationParamES = betaCalibrationSpectrumEList.get(i);
} else if (betaCalibrationSpectrumEList.get(i).getDataType().equals("G")) { } else if (betaCalibrationSpectrumEList.get(i).getDataType().equals(DataTypeAbbr.GASBKPHD.getType())) {
betaCalibrationParamEG = betaCalibrationSpectrumEList.get(i); betaCalibrationParamEG = betaCalibrationSpectrumEList.get(i);
} else if (betaCalibrationSpectrumEList.get(i).getDataType().equals("D")) { } else if (betaCalibrationSpectrumEList.get(i).getDataType().equals(DataTypeAbbr.DETBKPHD.getType())) {
betaCalibrationParamED = betaCalibrationSpectrumEList.get(i); betaCalibrationParamED = betaCalibrationSpectrumEList.get(i);
} }
} }
@ -5702,7 +5700,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
GardsCalibration calibrationG = new GardsCalibration(); GardsCalibration calibrationG = new GardsCalibration();
calibrationG.setSampleId(gasId); calibrationG.setSampleId(gasId);
calibrationG.setIdAnalysis(idAnalysis); calibrationG.setIdAnalysis(idAnalysis);
calibrationG.setSampleType(SystemType.BETA.getType()); calibrationG.setSampleType(SystemType.GAMMA.getType());
calibrationG.setCalType(CalType.ENERGY_CAL.getType()); calibrationG.setCalType(CalType.ENERGY_CAL.getType());
calibrationG.setFunction(FittingType.POLY2.getCode()); calibrationG.setFunction(FittingType.POLY2.getCode());
calibrationG.setFunctionDef(FittingType.POLY2.getDescription()); calibrationG.setFunctionDef(FittingType.POLY2.getDescription());