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

计算mdc数值，公式参数部分内容修改

Browse Source 
修改efficiency页面公式存储临时参数部分代码移除
This commit is contained in:
qiaoqinzheng 2023-12-19 16:07:41 +08:00
parent 5ffe064aca
commit be65721097
2 changed files with 9 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java
View File

@ -3116,15 +3116,9 @@ public class GammaFileUtil extends AbstractLogOrReport {
String anylseEnd; String anylseEnd;
anylseBegin = DateUtils.formatDate(new Date(), "yyyy/MM/dd HH:mm:ss"); anylseBegin = DateUtils.formatDate(new Date(), "yyyy/MM/dd HH:mm:ss");
bRet = AnalyseSpectrum(fileAnlyse,nucline); bRet = AnalyseSpectrum(fileAnlyse,nucline);
if (CollectionUtils.isEmpty(fileAnlyse.getEfficiencyParam())) {
fileAnlyse.setEfficiencyParam(fileAnlyse.getUsedEffiPara().getP()); fileAnlyse.setEfficiencyParam(fileAnlyse.getUsedEffiPara().getP());
}
if (CollectionUtils.isEmpty(fileAnlyse.getEfficiencyEnergy())) {
fileAnlyse.setEfficiencyEnergy(fileAnlyse.getUsedEffiKD().getG_energy()); fileAnlyse.setEfficiencyEnergy(fileAnlyse.getUsedEffiKD().getG_energy());
}
if (Objects.isNull(fileAnlyse.getEfficiencyCurRow())) {
fileAnlyse.setEfficiencyCurRow(0); fileAnlyse.setEfficiencyCurRow(0);
}
getNuclideMDCValue(fileAnlyse, fileAnlyse.getMdcInfoMap(), nucline); getNuclideMDCValue(fileAnlyse, fileAnlyse.getMdcInfoMap(), nucline);
anylseEnd = DateUtils.formatDate(new Date(), "yyyy/MM/dd HH:mm:ss"); anylseEnd = DateUtils.formatDate(new Date(), "yyyy/MM/dd HH:mm:ss");
middleData.analyses_analysisBegin = anylseBegin; middleData.analyses_analysisBegin = anylseBegin;

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

@ -1278,15 +1278,9 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
Map<String, NuclideLines> nuclideLinesMap = (Map<String, NuclideLines>) redisUtil.get(userName+StringPool.DASH+phd.getHeader().getSystem_type()); Map<String, NuclideLines> nuclideLinesMap = (Map<String, NuclideLines>) redisUtil.get(userName+StringPool.DASH+phd.getHeader().getSystem_type());
gammaFileUtil.NuclidesIdent(phd, nuclideLinesMap); gammaFileUtil.NuclidesIdent(phd, nuclideLinesMap);
gammaFileUtil.RunQC(phd); gammaFileUtil.RunQC(phd);
if (CollectionUtils.isEmpty(phd.getEfficiencyParam())) {
phd.setEfficiencyParam(phd.getUsedEffiPara().getP()); phd.setEfficiencyParam(phd.getUsedEffiPara().getP());
}
if (CollectionUtils.isEmpty(phd.getEfficiencyEnergy())) {
phd.setEfficiencyEnergy(phd.getUsedEffiKD().getG_energy()); phd.setEfficiencyEnergy(phd.getUsedEffiKD().getG_energy());
}
if (Objects.isNull(phd.getEfficiencyCurRow())) {
phd.setEfficiencyCurRow(0); phd.setEfficiencyCurRow(0);
}
// 重新计算峰值 // 重新计算峰值
gammaFileUtil.getNuclideMDCValue(phd, phd.getMdcInfoMap(), nuclideLinesMap); gammaFileUtil.getNuclideMDCValue(phd, phd.getMdcInfoMap(), nuclideLinesMap);
String warning = "Finish three tasks:\n" + String warning = "Finish three tasks:\n" +
@ -1299,15 +1293,9 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
gammaFileUtil.AnalyseSpectrum(phd, nuclideLinesMap); gammaFileUtil.AnalyseSpectrum(phd, nuclideLinesMap);
// 重新分析各峰值对应的核素信息 // 重新分析各峰值对应的核素信息
// gammaFileUtil.NuclidesIdent(phd, nuclideLinesMap); // gammaFileUtil.NuclidesIdent(phd, nuclideLinesMap);
if (CollectionUtils.isEmpty(phd.getEfficiencyParam())) {
phd.setEfficiencyParam(phd.getUsedEffiPara().getP()); phd.setEfficiencyParam(phd.getUsedEffiPara().getP());
}
if (CollectionUtils.isEmpty(phd.getEfficiencyEnergy())) {
phd.setEfficiencyEnergy(phd.getUsedEffiKD().getG_energy()); phd.setEfficiencyEnergy(phd.getUsedEffiKD().getG_energy());
}
if (Objects.isNull(phd.getEfficiencyCurRow())) {
phd.setEfficiencyCurRow(0); phd.setEfficiencyCurRow(0);
}
// 重新计算峰值 // 重新计算峰值
gammaFileUtil.getNuclideMDCValue(phd, phd.getMdcInfoMap(), nuclideLinesMap); gammaFileUtil.getNuclideMDCValue(phd, phd.getMdcInfoMap(), nuclideLinesMap);
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
@ -3565,10 +3553,6 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
//redis获取缓存的峰核素信息 //redis获取缓存的峰核素信息
Map<String, NuclideLines> nuclideLinesMap = (Map<String, NuclideLines>) redisUtil.get(userName+StringPool.DASH+phd.getHeader().getSystem_type()); Map<String, NuclideLines> nuclideLinesMap = (Map<String, NuclideLines>) redisUtil.get(userName+StringPool.DASH+phd.getHeader().getSystem_type());
DataChangeEfficiency(m_vCurEffi, m_vCurEnergy, m_vCurUncert, m_curParam, funcId, phd, width, curRow, map); DataChangeEfficiency(m_vCurEffi, m_vCurEnergy, m_vCurUncert, m_curParam, funcId, phd, width, curRow, map);
//将本次计算公式的信息赋值给各对应参数用于计算MDC
phd.setEfficiencyParam(m_curParam.getP());
phd.setEfficiencyCurRow(curRow);
phd.setEfficiencyEnergy(m_vCurEnergy);
result.setSuccess(true); result.setSuccess(true);
result.setResult(map); result.setResult(map);
return result; return result;