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

beta功能分析相关接口增加文件的非空判断

Browse Source 
gamma功能删除接口增加删除缓存核素信息方法
This commit is contained in:
qiaoqinzheng 2023-11-02 18:28:39 +08:00
parent f55210c7c2
commit 25ddaf9b28
2 changed files with 214 additions and 207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -867,6 +867,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
String key = fileName + StrUtil.DASHED + username; String key = fileName + StrUtil.DASHED + username;
// 删除指定key的Cache // 删除指定key的Cache
localCache.deletePHDCache(key); localCache.deletePHDCache(key);
redisUtil.del(key);
} }
@Override @Override

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

@ -3323,99 +3323,101 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
gasTmp = phdFileUtil.analyzeFile(gasFilePath, gasFileName); gasTmp = phdFileUtil.analyzeFile(gasFilePath, gasFileName);
//获取det文件 //获取det文件
detTmp = phdFileUtil.analyzeFile(detFilePath, detFileName); detTmp = phdFileUtil.analyzeFile(detFilePath, detFileName);
//调用重新分析算法 获取算法结果 if (Objects.nonNull(sampleTmp) && Objects.nonNull(gasTmp) && Objects.nonNull(detTmp)) {
BgAnalyseResult analyseResult = EnergySpectrumHandler.bgReAnalyse(sampleTmp.getAbsolutePath(), gasTmp.getAbsolutePath(), detTmp.getAbsolutePath(), spectrum_group.BgCalPara); //调用重新分析算法 获取算法结果
//生成分析操作日志 BgAnalyseResult analyseResult = EnergySpectrumHandler.bgReAnalyse(sampleTmp.getAbsolutePath(), gasTmp.getAbsolutePath(), detTmp.getAbsolutePath(), spectrum_group.BgCalPara);
EnergySpectrumStruct sample = phdFileUtil.analyzeFileSourceData(sampleTmp); //生成分析操作日志
EnergySpectrumStruct gas = phdFileUtil.analyzeFileSourceData(gasTmp); EnergySpectrumStruct sample = phdFileUtil.analyzeFileSourceData(sampleTmp);
EnergySpectrumStruct det = phdFileUtil.analyzeFileSourceData(detTmp); EnergySpectrumStruct gas = phdFileUtil.analyzeFileSourceData(gasTmp);
String logName = sampleFileName.replace("PHD", "log"); EnergySpectrumStruct det = phdFileUtil.analyzeFileSourceData(detTmp);
phdFileUtil.OutPutRnLog(analyseResult, sample, gas, det, logName); String logName = sampleFileName.replace("PHD", "log");
//存入分析用到的数据 phdFileUtil.OutPutRnLog(analyseResult, sample, gas, det, logName);
map.put("reAnalyseParam", spectrum_group.BgCalPara); //存入分析用到的数据
//存入计算后得到的xeData数据 map.put("reAnalyseParam", spectrum_group.BgCalPara);
GardsXeResultsSpectrum xe131m = new GardsXeResultsSpectrum(); //存入计算后得到的xeData数据
xe131m.setNuclideName(XeNuclideName.XE_131m.getType()); GardsXeResultsSpectrum xe131m = new GardsXeResultsSpectrum();
xe131m.setConc(analyseResult.Xe131m_con); xe131m.setNuclideName(XeNuclideName.XE_131m.getType());
xe131m.setConcErr(analyseResult.Xe131m_uncer); xe131m.setConc(analyseResult.Xe131m_con);
xe131m.setLc(analyseResult.LC_Xe131m); xe131m.setConcErr(analyseResult.Xe131m_uncer);
xe131m.setMdc(analyseResult.MDC_Xe131m); xe131m.setLc(analyseResult.LC_Xe131m);
xe131m.setNidFlag(analyseResult.XE_131m_NID_FLAG); xe131m.setMdc(analyseResult.MDC_Xe131m);
xeResultsSpectrumList.add(xe131m); xe131m.setNidFlag(analyseResult.XE_131m_NID_FLAG);
GardsXeResultsSpectrum xe133 = new GardsXeResultsSpectrum(); xeResultsSpectrumList.add(xe131m);
xe133.setNuclideName(XeNuclideName.XE_133.getType()); GardsXeResultsSpectrum xe133 = new GardsXeResultsSpectrum();
xe133.setConc(analyseResult.Xe133_con); xe133.setNuclideName(XeNuclideName.XE_133.getType());
xe133.setConcErr(analyseResult.Xe133_uncer); xe133.setConc(analyseResult.Xe133_con);
xe133.setLc(analyseResult.LC_Xe133); xe133.setConcErr(analyseResult.Xe133_uncer);
xe133.setMdc(analyseResult.MDC_Xe133); xe133.setLc(analyseResult.LC_Xe133);
xe133.setNidFlag(analyseResult.XE_133_NID_FLAG); xe133.setMdc(analyseResult.MDC_Xe133);
xeResultsSpectrumList.add(xe133); xe133.setNidFlag(analyseResult.XE_133_NID_FLAG);
GardsXeResultsSpectrum xe133m = new GardsXeResultsSpectrum(); xeResultsSpectrumList.add(xe133);
xe133m.setNuclideName(XeNuclideName.XE_133m.getType()); GardsXeResultsSpectrum xe133m = new GardsXeResultsSpectrum();
xe133m.setConc(analyseResult.Xe133m_con); xe133m.setNuclideName(XeNuclideName.XE_133m.getType());
xe133m.setConcErr(analyseResult.Xe133m_uncer); xe133m.setConc(analyseResult.Xe133m_con);
xe133m.setLc(analyseResult.LC_Xe133m); xe133m.setConcErr(analyseResult.Xe133m_uncer);
xe133m.setMdc(analyseResult.MDC_Xe133m); xe133m.setLc(analyseResult.LC_Xe133m);
xe133m.setNidFlag(analyseResult.XE_133m_NID_FLAG); xe133m.setMdc(analyseResult.MDC_Xe133m);
xeResultsSpectrumList.add(xe133m); xe133m.setNidFlag(analyseResult.XE_133m_NID_FLAG);
GardsXeResultsSpectrum xe135 = new GardsXeResultsSpectrum(); xeResultsSpectrumList.add(xe133m);
xe135.setNuclideName(XeNuclideName.XE_135.getType()); GardsXeResultsSpectrum xe135 = new GardsXeResultsSpectrum();
xe135.setConc(analyseResult.Xe135_con); xe135.setNuclideName(XeNuclideName.XE_135.getType());
xe135.setConcErr(analyseResult.Xe135_uncer); xe135.setConc(analyseResult.Xe135_con);
xe135.setLc(analyseResult.LC_Xe135); xe135.setConcErr(analyseResult.Xe135_uncer);
xe135.setMdc(analyseResult.MDC_Xe135); xe135.setLc(analyseResult.LC_Xe135);
xe135.setNidFlag(analyseResult.XE_135_NID_FLAG); xe135.setMdc(analyseResult.MDC_Xe135);
xeResultsSpectrumList.add(xe135); xe135.setNidFlag(analyseResult.XE_135_NID_FLAG);
xeMap.put("XeData", xeResultsSpectrumList); xeResultsSpectrumList.add(xe135);
//新计算得到的边界值 xeMap.put("XeData", xeResultsSpectrumList);
if (CollectionUtils.isNotEmpty(analyseResult.S_ROI_B_Boundary_start)) { //新计算得到的边界值
List<Boundary> boundaryList = new LinkedList<>(); if (CollectionUtils.isNotEmpty(analyseResult.S_ROI_B_Boundary_start)) {
for (int i=0; i<analyseResult.S_ROI_B_Boundary_start.size(); i++) { List<Boundary> boundaryList = new LinkedList<>();
Boundary boundary = new Boundary(); for (int i=0; i<analyseResult.S_ROI_B_Boundary_start.size(); i++) {
boundary.setMinX(analyseResult.S_ROI_B_Boundary_start.get(i)); Boundary boundary = new Boundary();
boundary.setMaxX(analyseResult.S_ROI_B_Boundary_stop.get(i)); boundary.setMinX(analyseResult.S_ROI_B_Boundary_start.get(i));
boundary.setMinY(analyseResult.S_ROI_G_Boundary_start.get(i)); boundary.setMaxX(analyseResult.S_ROI_B_Boundary_stop.get(i));
boundary.setMaxY(analyseResult.S_ROI_G_Boundary_stop.get(i)); boundary.setMinY(analyseResult.S_ROI_G_Boundary_start.get(i));
boundaryList.add(boundary); boundary.setMaxY(analyseResult.S_ROI_G_Boundary_stop.get(i));
boundaryList.add(boundary);
}
xeMap.put("SampleBoundary", boundaryList);
} }
xeMap.put("SampleBoundary", boundaryList); if (CollectionUtils.isNotEmpty(analyseResult.G_ROI_B_Boundary_start)) {
} List<Boundary> boundaryList = new LinkedList<>();
if (CollectionUtils.isNotEmpty(analyseResult.G_ROI_B_Boundary_start)) { for (int i=0; i<analyseResult.G_ROI_B_Boundary_start.size(); i++) {
List<Boundary> boundaryList = new LinkedList<>(); Boundary boundary = new Boundary();
for (int i=0; i<analyseResult.G_ROI_B_Boundary_start.size(); i++) { boundary.setMinX(analyseResult.G_ROI_B_Boundary_start.get(i));
Boundary boundary = new Boundary(); boundary.setMaxX(analyseResult.G_ROI_B_Boundary_stop.get(i));
boundary.setMinX(analyseResult.G_ROI_B_Boundary_start.get(i)); boundary.setMinY(analyseResult.G_ROI_G_Boundary_start.get(i));
boundary.setMaxX(analyseResult.G_ROI_B_Boundary_stop.get(i)); boundary.setMaxY(analyseResult.G_ROI_G_Boundary_stop.get(i));
boundary.setMinY(analyseResult.G_ROI_G_Boundary_start.get(i)); boundaryList.add(boundary);
boundary.setMaxY(analyseResult.G_ROI_G_Boundary_stop.get(i)); }
boundaryList.add(boundary); xeMap.put("GasBoundary", boundaryList);
} }
xeMap.put("GasBoundary", boundaryList); if (CollectionUtils.isNotEmpty(analyseResult.D_ROI_B_Boundary_start)) {
} List<Boundary> boundaryList = new LinkedList<>();
if (CollectionUtils.isNotEmpty(analyseResult.D_ROI_B_Boundary_start)) { for (int i=0; i<analyseResult.D_ROI_B_Boundary_start.size(); i++) {
List<Boundary> boundaryList = new LinkedList<>(); Boundary boundary = new Boundary();
for (int i=0; i<analyseResult.D_ROI_B_Boundary_start.size(); i++) { boundary.setMinX(analyseResult.D_ROI_B_Boundary_start.get(i));
Boundary boundary = new Boundary(); boundary.setMaxX(analyseResult.D_ROI_B_Boundary_stop.get(i));
boundary.setMinX(analyseResult.D_ROI_B_Boundary_start.get(i)); boundary.setMinY(analyseResult.D_ROI_G_Boundary_start.get(i));
boundary.setMaxX(analyseResult.D_ROI_B_Boundary_stop.get(i)); boundary.setMaxY(analyseResult.D_ROI_G_Boundary_stop.get(i));
boundary.setMinY(analyseResult.D_ROI_G_Boundary_start.get(i)); boundaryList.add(boundary);
boundary.setMaxY(analyseResult.D_ROI_G_Boundary_stop.get(i)); }
boundaryList.add(boundary); xeMap.put("DetBoundary", boundaryList);
} }
xeMap.put("DetBoundary", boundaryList); if (analyseData.isQcData()) {
} if (StringUtils.isNotBlank(qcFilePath)) {
if (analyseData.isQcData()) { EnergySpectrumStruct struct = phdFileUtil.analyzeFileSourceData(qcFilePath, qcFileName);
if (StringUtils.isNotBlank(qcFilePath)) { if (Objects.nonNull(struct)) {
EnergySpectrumStruct struct = phdFileUtil.analyzeFileSourceData(qcFilePath, qcFileName); phdFileUtil.CalQCBoundary(betaList, gammaList, betaFittingParaToUi, gammaFittingParaToUi, struct, xeMap);
if (Objects.nonNull(struct)) { }
phdFileUtil.CalQCBoundary(betaList, gammaList, betaFittingParaToUi, gammaFittingParaToUi, struct, xeMap);
} }
} }
//将重新计算的参数以及重新计算后的xeData的数据缓存到本地缓存中
cache.put(sampleFileName + "-" + userName + "-reAnalyseParam", map);
cache.put(sampleFileName + "-" + userName + "-xeData", xeMap);
betaCache.setBetaCache(cache);
} }
//将重新计算的参数以及重新计算后的xeData的数据缓存到本地缓存中
cache.put(sampleFileName + "-" + userName + "-reAnalyseParam", map);
cache.put(sampleFileName + "-" + userName + "-xeData", xeMap);
betaCache.setBetaCache(cache);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} finally { } finally {
@ -3539,100 +3541,102 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
sampleTmp = phdFileUtil.analyzeFile(sampleFilePath, sampleFileName); sampleTmp = phdFileUtil.analyzeFile(sampleFilePath, sampleFileName);
gasTmp = phdFileUtil.analyzeFile(gasFilePath, gasFileName); gasTmp = phdFileUtil.analyzeFile(gasFilePath, gasFileName);
detTmp = phdFileUtil.analyzeFile(detFilePath, detFileName); detTmp = phdFileUtil.analyzeFile(detFilePath, detFileName);
BgAnalyseResult analyseResult = EnergySpectrumHandler.bgReAnalyse(sampleTmp.getAbsolutePath(), gasTmp.getAbsolutePath(), detTmp.getAbsolutePath(), spectrum_group.BgCalPara); if (Objects.nonNull(sampleTmp) && Objects.nonNull(gasTmp) && Objects.nonNull(detTmp)) {
//生成分析操作日志 BgAnalyseResult analyseResult = EnergySpectrumHandler.bgReAnalyse(sampleTmp.getAbsolutePath(), gasTmp.getAbsolutePath(), detTmp.getAbsolutePath(), spectrum_group.BgCalPara);
EnergySpectrumStruct sample = phdFileUtil.analyzeFileSourceData(sampleTmp); //生成分析操作日志
EnergySpectrumStruct gas = phdFileUtil.analyzeFileSourceData(gasTmp); EnergySpectrumStruct sample = phdFileUtil.analyzeFileSourceData(sampleTmp);
EnergySpectrumStruct det = phdFileUtil.analyzeFileSourceData(detTmp); EnergySpectrumStruct gas = phdFileUtil.analyzeFileSourceData(gasTmp);
String logName = sampleFileName.replace("PHD", "log"); EnergySpectrumStruct det = phdFileUtil.analyzeFileSourceData(detTmp);
phdFileUtil.OutPutRnLog(analyseResult, sample, gas, det, logName); String logName = sampleFileName.replace("PHD", "log");
//存入重新分析的参数 phdFileUtil.OutPutRnLog(analyseResult, sample, gas, det, logName);
map.put("reAnalyseParam", spectrum_group.BgCalPara); //存入重新分析的参数
//存入xeData数据 map.put("reAnalyseParam", spectrum_group.BgCalPara);
List<GardsXeResultsSpectrum> xeResultsSpectrumList = new LinkedList<>(); //存入xeData数据
GardsXeResultsSpectrum xe131m = new GardsXeResultsSpectrum(); List<GardsXeResultsSpectrum> xeResultsSpectrumList = new LinkedList<>();
xe131m.setNuclideName(XeNuclideName.XE_131m.getType()); GardsXeResultsSpectrum xe131m = new GardsXeResultsSpectrum();
xe131m.setConc(analyseResult.Xe131m_con); xe131m.setNuclideName(XeNuclideName.XE_131m.getType());
xe131m.setConcErr(analyseResult.Xe131m_uncer); xe131m.setConc(analyseResult.Xe131m_con);
xe131m.setLc(analyseResult.LC_Xe131m); xe131m.setConcErr(analyseResult.Xe131m_uncer);
xe131m.setMdc(analyseResult.MDC_Xe131m); xe131m.setLc(analyseResult.LC_Xe131m);
xe131m.setNidFlag(analyseResult.XE_131m_NID_FLAG); xe131m.setMdc(analyseResult.MDC_Xe131m);
xeResultsSpectrumList.add(xe131m); xe131m.setNidFlag(analyseResult.XE_131m_NID_FLAG);
GardsXeResultsSpectrum xe133 = new GardsXeResultsSpectrum(); xeResultsSpectrumList.add(xe131m);
xe133.setNuclideName(XeNuclideName.XE_133.getType()); GardsXeResultsSpectrum xe133 = new GardsXeResultsSpectrum();
xe133.setConc(analyseResult.Xe133_con); xe133.setNuclideName(XeNuclideName.XE_133.getType());
xe133.setConcErr(analyseResult.Xe133_uncer); xe133.setConc(analyseResult.Xe133_con);
xe133.setLc(analyseResult.LC_Xe133); xe133.setConcErr(analyseResult.Xe133_uncer);
xe133.setMdc(analyseResult.MDC_Xe133); xe133.setLc(analyseResult.LC_Xe133);
xe133.setNidFlag(analyseResult.XE_133_NID_FLAG); xe133.setMdc(analyseResult.MDC_Xe133);
xeResultsSpectrumList.add(xe133); xe133.setNidFlag(analyseResult.XE_133_NID_FLAG);
GardsXeResultsSpectrum xe133m = new GardsXeResultsSpectrum(); xeResultsSpectrumList.add(xe133);
xe133m.setNuclideName(XeNuclideName.XE_133m.getType()); GardsXeResultsSpectrum xe133m = new GardsXeResultsSpectrum();
xe133m.setConc(analyseResult.Xe133m_con); xe133m.setNuclideName(XeNuclideName.XE_133m.getType());
xe133m.setConcErr(analyseResult.Xe133m_uncer); xe133m.setConc(analyseResult.Xe133m_con);
xe133m.setLc(analyseResult.LC_Xe133m); xe133m.setConcErr(analyseResult.Xe133m_uncer);
xe133m.setMdc(analyseResult.MDC_Xe133m); xe133m.setLc(analyseResult.LC_Xe133m);
xe133m.setNidFlag(analyseResult.XE_133m_NID_FLAG); xe133m.setMdc(analyseResult.MDC_Xe133m);
xeResultsSpectrumList.add(xe133m); xe133m.setNidFlag(analyseResult.XE_133m_NID_FLAG);
GardsXeResultsSpectrum xe135 = new GardsXeResultsSpectrum(); xeResultsSpectrumList.add(xe133m);
xe135.setNuclideName(XeNuclideName.XE_135.getType()); GardsXeResultsSpectrum xe135 = new GardsXeResultsSpectrum();
xe135.setConc(analyseResult.Xe135_con); xe135.setNuclideName(XeNuclideName.XE_135.getType());
xe135.setConcErr(analyseResult.Xe135_uncer); xe135.setConc(analyseResult.Xe135_con);
xe135.setLc(analyseResult.LC_Xe135); xe135.setConcErr(analyseResult.Xe135_uncer);
xe135.setMdc(analyseResult.MDC_Xe135); xe135.setLc(analyseResult.LC_Xe135);
xe135.setNidFlag(analyseResult.XE_135_NID_FLAG); xe135.setMdc(analyseResult.MDC_Xe135);
xeResultsSpectrumList.add(xe135); xe135.setNidFlag(analyseResult.XE_135_NID_FLAG);
xeMap.put("XeData", xeResultsSpectrumList); xeResultsSpectrumList.add(xe135);
//新计算得到的边界值 xeMap.put("XeData", xeResultsSpectrumList);
if (CollectionUtils.isNotEmpty(analyseResult.S_ROI_B_Boundary_start)) { //新计算得到的边界值
List<Boundary> boundaryList = new LinkedList<>(); if (CollectionUtils.isNotEmpty(analyseResult.S_ROI_B_Boundary_start)) {
for (int i=0; i<analyseResult.S_ROI_B_Boundary_start.size(); i++) { List<Boundary> boundaryList = new LinkedList<>();
Boundary boundary = new Boundary(); for (int i=0; i<analyseResult.S_ROI_B_Boundary_start.size(); i++) {
boundary.setMinX(analyseResult.S_ROI_B_Boundary_start.get(i)); Boundary boundary = new Boundary();
boundary.setMaxX(analyseResult.S_ROI_B_Boundary_stop.get(i)); boundary.setMinX(analyseResult.S_ROI_B_Boundary_start.get(i));
boundary.setMinY(analyseResult.S_ROI_G_Boundary_start.get(i)); boundary.setMaxX(analyseResult.S_ROI_B_Boundary_stop.get(i));
boundary.setMaxY(analyseResult.S_ROI_G_Boundary_stop.get(i)); boundary.setMinY(analyseResult.S_ROI_G_Boundary_start.get(i));
boundaryList.add(boundary); boundary.setMaxY(analyseResult.S_ROI_G_Boundary_stop.get(i));
boundaryList.add(boundary);
}
xeMap.put("SampleBoundary", boundaryList);
} }
xeMap.put("SampleBoundary", boundaryList); if (CollectionUtils.isNotEmpty(analyseResult.G_ROI_B_Boundary_start)) {
} List<Boundary> boundaryList = new LinkedList<>();
if (CollectionUtils.isNotEmpty(analyseResult.G_ROI_B_Boundary_start)) { for (int i=0; i<analyseResult.G_ROI_B_Boundary_start.size(); i++) {
List<Boundary> boundaryList = new LinkedList<>(); Boundary boundary = new Boundary();
for (int i=0; i<analyseResult.G_ROI_B_Boundary_start.size(); i++) { boundary.setMinX(analyseResult.G_ROI_B_Boundary_start.get(i));
Boundary boundary = new Boundary(); boundary.setMaxX(analyseResult.G_ROI_B_Boundary_stop.get(i));
boundary.setMinX(analyseResult.G_ROI_B_Boundary_start.get(i)); boundary.setMinY(analyseResult.G_ROI_G_Boundary_start.get(i));
boundary.setMaxX(analyseResult.G_ROI_B_Boundary_stop.get(i)); boundary.setMaxY(analyseResult.G_ROI_G_Boundary_stop.get(i));
boundary.setMinY(analyseResult.G_ROI_G_Boundary_start.get(i)); boundaryList.add(boundary);
boundary.setMaxY(analyseResult.G_ROI_G_Boundary_stop.get(i)); }
boundaryList.add(boundary); xeMap.put("GasBoundary", boundaryList);
} }
xeMap.put("GasBoundary", boundaryList); if (CollectionUtils.isNotEmpty(analyseResult.D_ROI_B_Boundary_start)) {
} List<Boundary> boundaryList = new LinkedList<>();
if (CollectionUtils.isNotEmpty(analyseResult.D_ROI_B_Boundary_start)) { for (int i=0; i<analyseResult.D_ROI_B_Boundary_start.size(); i++) {
List<Boundary> boundaryList = new LinkedList<>(); Boundary boundary = new Boundary();
for (int i=0; i<analyseResult.D_ROI_B_Boundary_start.size(); i++) { boundary.setMinX(analyseResult.D_ROI_B_Boundary_start.get(i));
Boundary boundary = new Boundary(); boundary.setMaxX(analyseResult.D_ROI_B_Boundary_stop.get(i));
boundary.setMinX(analyseResult.D_ROI_B_Boundary_start.get(i)); boundary.setMinY(analyseResult.D_ROI_G_Boundary_start.get(i));
boundary.setMaxX(analyseResult.D_ROI_B_Boundary_stop.get(i)); boundary.setMaxY(analyseResult.D_ROI_G_Boundary_stop.get(i));
boundary.setMinY(analyseResult.D_ROI_G_Boundary_start.get(i)); boundaryList.add(boundary);
boundary.setMaxY(analyseResult.D_ROI_G_Boundary_stop.get(i)); }
boundaryList.add(boundary); xeMap.put("DetBoundary", boundaryList);
} }
xeMap.put("DetBoundary", boundaryList); if (analyseData.isQcData()) {
} if (StringUtils.isNotBlank(qcFilePath)) {
if (analyseData.isQcData()) { EnergySpectrumStruct struct = phdFileUtil.analyzeFileSourceData(qcFilePath, qcFileName);
if (StringUtils.isNotBlank(qcFilePath)) { if (Objects.nonNull(struct)) {
EnergySpectrumStruct struct = phdFileUtil.analyzeFileSourceData(qcFilePath, qcFileName); phdFileUtil.CalQCBoundary(betaList, gammaList, betaFittingParaToUi, gammaFittingParaToUi, struct, xeMap);
if (Objects.nonNull(struct)) { }
phdFileUtil.CalQCBoundary(betaList, gammaList, betaFittingParaToUi, gammaFittingParaToUi, struct, xeMap);
} }
} }
//将重新计算的参数以及重新计算后的xeData的数据缓存到本地缓存中
cache.put(sampleFileName + "-" + userName + "-reAnalyseParam", map);
cache.put(sampleFileName + "-" + userName + "-xeData", xeMap);
betaCache.setBetaCache(cache);
analyseResultMap.put(sampleFileName, xeResultsSpectrumList);
} }
//将重新计算的参数以及重新计算后的xeData的数据缓存到本地缓存中
cache.put(sampleFileName + "-" + userName + "-reAnalyseParam", map);
cache.put(sampleFileName + "-" + userName + "-xeData", xeMap);
betaCache.setBetaCache(cache);
analyseResultMap.put(sampleFileName, xeResultsSpectrumList);
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
@ -3876,41 +3880,43 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
if (CollectionUtils.isNotEmpty(reAnalyseParam)) { if (CollectionUtils.isNotEmpty(reAnalyseParam)) {
BgCalPara = (BgCalibratePara) reAnalyseParam.get("reAnalyseParam"); BgCalPara = (BgCalibratePara) reAnalyseParam.get("reAnalyseParam");
} }
//调用分析方法 if(Objects.nonNull(sampleTmp) && Objects.nonNull(gasTmp) && Objects.nonNull(detTmp)) {
phdFileUtil.analyzeSpectrum(sampleTmp, gasTmp, detTmp, BgCalPara, map); //调用分析方法
//分析qc文件信息并重新计算qc边界值 phdFileUtil.analyzeSpectrum(sampleTmp, gasTmp, detTmp, BgCalPara, map);
if (StringUtils.isNotBlank(qcPath)) { //分析qc文件信息并重新计算qc边界值
EnergySpectrumStruct struct = phdFileUtil.analyzeFileSourceData(qcPath, qcFileName); if (StringUtils.isNotBlank(qcPath)) {
if (Objects.nonNull(struct)) { EnergySpectrumStruct struct = phdFileUtil.analyzeFileSourceData(qcPath, qcFileName);
phdFileUtil.CalQCBoundary(betaList, gammaList, betaFittingParaToUi, gammaFittingParaToUi, struct, map); if (Objects.nonNull(struct)) {
} phdFileUtil.CalQCBoundary(betaList, gammaList, betaFittingParaToUi, gammaFittingParaToUi, struct, map);
}
List<GardsXeResultsSpectrum> xeDataList = (List<GardsXeResultsSpectrum>) map.get("XeData");
if (CollectionUtils.isNotEmpty(xeDataList)){
for (GardsXeResultsSpectrum xeData:xeDataList) {
Double conc = xeData.getConc();
Double mdc = xeData.getMdc();
if (conc < 0){
xeData.setColor("red");
xeData.setNidFlag(0);
} else if (0<conc && conc < mdc) {
xeData.setColor("#ffcc30");
xeData.setNidFlag(0);
} else if (conc > mdc) {
xeData.setColor("green");
xeData.setNidFlag(1);
} }
xeData.setMdc(Double.valueOf(String.format("%."+(6 - String.valueOf(Math.abs(xeData.getMdc())).substring(0, String.valueOf(Math.abs(xeData.getMdc())).lastIndexOf(StringPool.DOT)).length())+"f", xeData.getMdc())));
xeData.setConc(Double.valueOf(String.format("%."+(6 - String.valueOf(Math.abs(xeData.getConc())).substring(0, String.valueOf(Math.abs(xeData.getConc())).lastIndexOf(StringPool.DOT)).length())+"f", xeData.getConc())));
xeData.setConcErr(Double.valueOf(String.format("%."+((6 - String.valueOf(Math.abs(xeData.getConcErr())).substring(0, String.valueOf(Math.abs(xeData.getConcErr())).lastIndexOf(StringPool.DOT)).length()))+"f", xeData.getConcErr())));
} }
List<GardsXeResultsSpectrum> xeDataList = (List<GardsXeResultsSpectrum>) map.get("XeData");
if (CollectionUtils.isNotEmpty(xeDataList)){
for (GardsXeResultsSpectrum xeData:xeDataList) {
Double conc = xeData.getConc();
Double mdc = xeData.getMdc();
if (conc < 0){
xeData.setColor("red");
xeData.setNidFlag(0);
} else if (0<conc && conc < mdc) {
xeData.setColor("#ffcc30");
xeData.setNidFlag(0);
} else if (conc > mdc) {
xeData.setColor("green");
xeData.setNidFlag(1);
}
xeData.setMdc(Double.valueOf(String.format("%."+(6 - String.valueOf(Math.abs(xeData.getMdc())).substring(0, String.valueOf(Math.abs(xeData.getMdc())).lastIndexOf(StringPool.DOT)).length())+"f", xeData.getMdc())));
xeData.setConc(Double.valueOf(String.format("%."+(6 - String.valueOf(Math.abs(xeData.getConc())).substring(0, String.valueOf(Math.abs(xeData.getConc())).lastIndexOf(StringPool.DOT)).length())+"f", xeData.getConc())));
xeData.setConcErr(Double.valueOf(String.format("%."+((6 - String.valueOf(Math.abs(xeData.getConcErr())).substring(0, String.valueOf(Math.abs(xeData.getConcErr())).lastIndexOf(StringPool.DOT)).length()))+"f", xeData.getConcErr())));
}
}
//更新分析后的缓存信息
cache.put(sampleFileName + "-" + userName + "-xeData", map);
betaCache.setBetaCache(cache);
map.put("bProcessed", true);
map.put("savedAnalysisResult", true);
mapList.put(sampleFileName, map);
} }
//更新分析后的缓存信息
cache.put(sampleFileName + "-" + userName + "-xeData", map);
betaCache.setBetaCache(cache);
map.put("bProcessed", true);
map.put("savedAnalysisResult", true);
mapList.put(sampleFileName, map);
} }
} }
} catch (Exception e) { } catch (Exception e) {