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

人工交互分析beta部分saveToDB接口增加相关文件不存在情况判断

Browse Source
This commit is contained in:
qiaoqinzheng 2023-12-08 17:43:44 +08:00
parent 7a39ca87ce
commit ebf432cf9c
1 changed files with 221 additions and 199 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3682,15 +3682,35 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
//获取ROI Limit数据 //获取ROI Limit数据
// getROILimit(anlyseResultIn); // getROILimit(anlyseResultIn);
//根据sample文件名称模糊查询sampleId //根据sample文件名称模糊查询sampleId
if (StringUtils.isNotBlank(betaDataFile.getSampleFilePathName())) {
anlyseResultIn.setSampleFilePath(betaDataFile.getSampleFilePathName().substring(0, betaDataFile.getSampleFilePathName().lastIndexOf(StringPool.SLASH))); anlyseResultIn.setSampleFilePath(betaDataFile.getSampleFilePathName().substring(0, betaDataFile.getSampleFilePathName().lastIndexOf(StringPool.SLASH)));
}
if (StringUtils.isNotBlank(betaDataFile.getGasFilePathName())) {
anlyseResultIn.setGasFilePath(betaDataFile.getGasFilePathName().substring(0, betaDataFile.getGasFilePathName().lastIndexOf(StringPool.SLASH))); anlyseResultIn.setGasFilePath(betaDataFile.getGasFilePathName().substring(0, betaDataFile.getGasFilePathName().lastIndexOf(StringPool.SLASH)));
}
if (StringUtils.isNotBlank(betaDataFile.getDetFilePathName())) {
anlyseResultIn.setDetFilePath(betaDataFile.getDetFilePathName().substring(0, betaDataFile.getDetFilePathName().lastIndexOf(StringPool.SLASH))); anlyseResultIn.setDetFilePath(betaDataFile.getDetFilePathName().substring(0, betaDataFile.getDetFilePathName().lastIndexOf(StringPool.SLASH)));
}
if (StringUtils.isNotBlank(betaDataFile.getQcFilePathName())) {
anlyseResultIn.setQcFilePath(betaDataFile.getQcFilePathName().substring(0, betaDataFile.getQcFilePathName().lastIndexOf(StringPool.SLASH))); anlyseResultIn.setQcFilePath(betaDataFile.getQcFilePathName().substring(0, betaDataFile.getQcFilePathName().lastIndexOf(StringPool.SLASH)));
}
//处理文件名称 //处理文件名称
String sampleFilePathName = phdFileUtil.NameStandardBy(anlyseResultIn.getSampleFilePath(), anlyseResultIn.getSampleFileName()); String sampleFilePathName = "";
String gasFilePathName = phdFileUtil.NameStandardBy(anlyseResultIn.getGasFilePath(), anlyseResultIn.getGasFileName()); String gasFilePathName = "";
String detFilePathName = phdFileUtil.NameStandardBy(anlyseResultIn.getDetFilePath(), anlyseResultIn.getDetFileName()); String detFilePathName = "";
String qcFilePathName = phdFileUtil.NameStandardBy(anlyseResultIn.getQcFilePath(), anlyseResultIn.getQcFileName()); String qcFilePathName = "";
if (StringUtils.isNotBlank(anlyseResultIn.getSampleFilePath()) && StringUtils.isNotBlank(anlyseResultIn.getSampleFileName())) {
sampleFilePathName = phdFileUtil.NameStandardBy(anlyseResultIn.getSampleFilePath(), anlyseResultIn.getSampleFileName());
}
if (StringUtils.isNotBlank(anlyseResultIn.getGasFilePath()) && StringUtils.isNotBlank(anlyseResultIn.getGasFileName())) {
gasFilePathName = phdFileUtil.NameStandardBy(anlyseResultIn.getGasFilePath(), anlyseResultIn.getGasFileName());
}
if (StringUtils.isNotBlank(anlyseResultIn.getDetFilePath()) && StringUtils.isNotBlank(anlyseResultIn.getDetFileName())) {
detFilePathName = phdFileUtil.NameStandardBy(anlyseResultIn.getDetFilePath(), anlyseResultIn.getDetFileName());
}
if (StringUtils.isNotBlank(anlyseResultIn.getQcFilePath()) && StringUtils.isNotBlank(anlyseResultIn.getQcFileName())) {
qcFilePathName = phdFileUtil.NameStandardBy(anlyseResultIn.getQcFilePath(), anlyseResultIn.getQcFileName());
}
//判断当前分析员是否有过历史分析当前文件 //判断当前分析员是否有过历史分析当前文件
Integer isExist = spectrumAnalysisMapper.SampleIsExist(sampleFilePathName, anlyseResultIn.getUserName()); Integer isExist = spectrumAnalysisMapper.SampleIsExist(sampleFilePathName, anlyseResultIn.getUserName());
//如果当前分析员在当天没有排班任务 并且 没有历史分析过当前文件 则不允许进行保存操作 //如果当前分析员在当天没有排班任务 并且 没有历史分析过当前文件 则不允许进行保存操作
@ -5109,6 +5129,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
//Gamma Energy Calibration页面 如果点击过fitting使BGammaEnergyValid并且有勾选 //Gamma Energy Calibration页面 如果点击过fitting使BGammaEnergyValid并且有勾选
//如果三个sampleData,GasData,DetData数据都是被勾选状态 则需要传递新的参数重新分析 否则不需要改变数据分析当前文件内容 //如果三个sampleData,GasData,DetData数据都是被勾选状态 则需要传递新的参数重新分析 否则不需要改变数据分析当前文件内容
BgAnalyseResult bgAnalyseResult = null; BgAnalyseResult bgAnalyseResult = null;
if (Objects.nonNull(sampleTmp) && Objects.nonNull(gasTmp) && Objects.nonNull(detTmp)) {
if (Objects.isNull(BgCalPara)) { if (Objects.isNull(BgCalPara)) {
bgAnalyseResult = EnergySpectrumHandler.bgAnalyse(sampleTmp.getAbsolutePath(), gasTmp.getAbsolutePath(), detTmp.getAbsolutePath()); bgAnalyseResult = EnergySpectrumHandler.bgAnalyse(sampleTmp.getAbsolutePath(), gasTmp.getAbsolutePath(), detTmp.getAbsolutePath());
} else { } else {
@ -5306,6 +5327,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
} }
anlyseResultIn.setRoiResultsSpectrumList(roiResultsSpectrumList); anlyseResultIn.setRoiResultsSpectrumList(roiResultsSpectrumList);
} }
}
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }