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

同步代码

Browse Source
This commit is contained in:
qiaoqinzheng 2024-04-17 09:12:32 +08:00
parent 22b31b5daf
commit a8c32e43bd
2 changed files with 37 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1312,7 +1312,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
HashMap<String, Object> map = new HashMap<>(); HashMap<String, Object> map = new HashMap<>();
// 根据boolean 决定是否保留本次数据 如果保留则不需要操作vPeak 并重新拟合线 // 根据boolean 决定是否保留本次数据 如果保留则不需要操作vPeak 并重新拟合线
if (accept) { if (accept) {
Map<String, NuclideLines> nuclideLinesMap = (Map<String, NuclideLines>) redisUtil.get(userName+StringPool.DASH+phd.getHeader().getSystem_type()); Map<String, NuclideLines> nuclideLinesMap = phd.getPhdNuclideMap();//(Map<String, NuclideLines>) redisUtil.get(userName+StringPool.DASH+phd.getHeader().getSystem_type());
if (flag.equalsIgnoreCase("insert")) {// 如果传递的flag标识 是 Insert则进行峰值的插入 if (flag.equalsIgnoreCase("insert")) {// 如果传递的flag标识 是 Insert则进行峰值的插入
//重新赋值index //重新赋值index
for (int k=0; k<newPeak.size(); k++) { for (int k=0; k<newPeak.size(); k++) {
@ -1695,7 +1695,10 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
// 用户当前的核素信息新增核素名称 // 用户当前的核素信息新增核素名称
list_identify.add(nuclideName); list_identify.add(nuclideName);
// 根据要进行修改的列的数据下标 操作Vpeak数据 // 根据要进行修改的列的数据下标 操作Vpeak数据
phd.getVPeak().get(curRow).nuclides.add(nuclideName); List<String> peakNuclides = phd.getVPeak().get(curRow).nuclides;
if (peakNuclides.indexOf(nuclideName) < 0 ) {
peakNuclides.add(nuclideName);
}
// 查询当前用户所关心的核素名称 // 查询当前用户所关心的核素名称
Map<String, NuclideLines> mapNucLines = (Map<String, NuclideLines>) redisUtil.get(userName+StringPool.DASH+phd.getHeader().getSystem_type()); Map<String, NuclideLines> mapNucLines = (Map<String, NuclideLines>) redisUtil.get(userName+StringPool.DASH+phd.getHeader().getSystem_type());
//用户当前缓存的核素信息 //用户当前缓存的核素信息
@ -1714,8 +1717,10 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
} }
t_idx++; t_idx++;
} }
//重新计算核素的MDA值
gammaFileUtil.CalcNuclideMDA(phd, it_line, nuclideName, vPeakIdx); gammaFileUtil.CalcNuclideMDA(phd, it_line, nuclideName, vPeakIdx);
map.put("identify", list_identify); map.put("identify", list_identify);
//格式化核素表单内容
List<PeakInfo> vPeak = gammaFileUtil.InitPeakTable(phd.getVPeak()); List<PeakInfo> vPeak = gammaFileUtil.InitPeakTable(phd.getVPeak());
map.put("table", vPeak); map.put("table", vPeak);
//如果当前缓存的谱核素信息不包含当前核素 //如果当前缓存的谱核素信息不包含当前核素

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

@ -3498,6 +3498,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);
@ -3523,10 +3524,12 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
List<SeriseData> betaList = new LinkedList<>(); List<SeriseData> betaList = new LinkedList<>();
List<String> betaFittingPara = new LinkedList<>(); List<String> betaFittingPara = new LinkedList<>();
List<String> betaFittingParaToUi = new LinkedList<>(); List<String> betaFittingParaToUi = new LinkedList<>();
List<List<Double>> betaNewEnergyListNow = new LinkedList<>();
List<SeriseData> gammaList = new LinkedList<>(); List<SeriseData> gammaList = new LinkedList<>();
List<String> gammaFittingPara = new LinkedList<>(); List<String> gammaFittingPara = new LinkedList<>();
List<String> gammaFittingParaToUi = new LinkedList<>(); List<String> gammaFittingParaToUi = new LinkedList<>();
//根据sample文件名称获取当前文件的缓存信息 List<List<Double>> gammaNewEnergyListNow = new LinkedList<>();
//根据sample文件名称获取当前文件的缓存信息
BetaDataFile sampleBetaData = cache.getIfPresent(sampleFileName + "-" + userName); BetaDataFile sampleBetaData = cache.getIfPresent(sampleFileName + "-" + userName);
//存储重新分析字段的实体类 //存储重新分析字段的实体类
SpectrumGroup spectrum_group = new SpectrumGroup(); SpectrumGroup spectrum_group = new SpectrumGroup();
@ -3541,15 +3544,16 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
betaDataFile.setBetaFittingPara(betaDataFile.getBetaFittingParaNow()); betaDataFile.setBetaFittingPara(betaDataFile.getBetaFittingParaNow());
betaDataFile.setBetaFittingParaToUi(betaDataFile.getBetaFittingParaToUiNow()); betaDataFile.setBetaFittingParaToUi(betaDataFile.getBetaFittingParaToUiNow());
betaDataFile.setBetaNewEnergyList(betaDataFile.getBetaNewEnergyListNow()); betaDataFile.setBetaNewEnergyList(betaDataFile.getBetaNewEnergyListNow());
//将当前文件用到的计算数据同步到需要计算的文件缓存
sampleBetaData.setBetaList(betaList);
sampleBetaData.setBetaFittingPara(betaFittingPara);
sampleBetaData.setBetaFittingParaToUi(betaFittingParaToUi);
sampleBetaData.setBetaNewEnergyList(betaDataFile.getBetaNewEnergyListNow());
//将新的数组封装到各自的数组中 //将新的数组封装到各自的数组中
betaList = betaDataFile.getBetaList(); betaList = betaDataFile.getBetaList();
betaFittingPara = betaDataFile.getBetaFittingPara(); betaFittingPara = betaDataFile.getBetaFittingPara();
betaFittingParaToUi = betaDataFile.getBetaFittingParaToUi(); betaFittingParaToUi = betaDataFile.getBetaFittingParaToUi();
betaNewEnergyListNow = betaDataFile.getBetaNewEnergyListNow();
//将当前文件用到的计算数据同步到需要计算的文件缓存
sampleBetaData.setBetaList(betaList);
sampleBetaData.setBetaFittingPara(betaFittingPara);
sampleBetaData.setBetaFittingParaToUi(betaFittingParaToUi);
sampleBetaData.setBetaNewEnergyList(betaNewEnergyListNow);
} }
List<Double> beCal = new LinkedList<>(); List<Double> beCal = new LinkedList<>();
beCal.add(Double.valueOf(betaFittingParaToUi.get(0))); beCal.add(Double.valueOf(betaFittingParaToUi.get(0)));
@ -3598,15 +3602,16 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
betaDataFile.setGammaFittingPara(betaDataFile.getGammaFittingParaNow()); betaDataFile.setGammaFittingPara(betaDataFile.getGammaFittingParaNow());
betaDataFile.setGammaFittingParaToUi(betaDataFile.getGammaFittingParaToUiNow()); betaDataFile.setGammaFittingParaToUi(betaDataFile.getGammaFittingParaToUiNow());
betaDataFile.setGammaNewEnergyList(betaDataFile.getGammaNewEnergyListNow()); betaDataFile.setGammaNewEnergyList(betaDataFile.getGammaNewEnergyListNow());
//将当前文件用到的计算数据同步到需要计算的文件缓存
sampleBetaData.setGammaList(gammaList);
sampleBetaData.setGammaFittingPara(gammaFittingPara);
sampleBetaData.setGammaFittingParaToUi(gammaFittingParaToUi);
sampleBetaData.setGammaNewEnergyList(betaDataFile.getGammaNewEnergyListNow());
//将新的数组封装到各自的数组中 //将新的数组封装到各自的数组中
gammaList = betaDataFile.getGammaList(); gammaList = betaDataFile.getGammaList();
gammaFittingPara = betaDataFile.getGammaFittingPara(); gammaFittingPara = betaDataFile.getGammaFittingPara();
gammaFittingParaToUi = betaDataFile.getGammaFittingParaToUi(); gammaFittingParaToUi = betaDataFile.getGammaFittingParaToUi();
gammaNewEnergyListNow = betaDataFile.getGammaNewEnergyListNow();
//将当前文件用到的计算数据同步到需要计算的文件缓存
sampleBetaData.setGammaList(gammaList);
sampleBetaData.setGammaFittingPara(gammaFittingPara);
sampleBetaData.setGammaFittingParaToUi(gammaFittingParaToUi);
sampleBetaData.setGammaNewEnergyList(gammaNewEnergyListNow);
} }
List<Double> geCal = new LinkedList<>(); List<Double> geCal = new LinkedList<>();
geCal.add(Double.valueOf(gammaFittingParaToUi.get(0))); geCal.add(Double.valueOf(gammaFittingParaToUi.get(0)));
@ -3736,6 +3741,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);
@ -3866,6 +3872,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);
} }
@ -3991,6 +3998,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);
@ -4002,7 +4010,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
e.printStackTrace(); e.printStackTrace();
} }
result.setSuccess(true); result.setSuccess(true);
result.setResult(mapList.get(currentFileName)); result.setResult(mapList);
return result; return result;
} }
@ -5789,13 +5797,13 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
xeDataList = getXeDataList(xeResultsSpectrumList); xeDataList = getXeDataList(xeResultsSpectrumList);
} }
for (GardsXeResults xeData :xeDataList) { for (GardsXeResults xeData :xeDataList) {
if (xeData.getNuclideName().equals(XeNuclideName.XE_131m)) { if (xeData.getNuclideName().equals(XeNuclideName.XE_131m.getType())) {
xeData.setNidFlag(anlyseResultIn.getXe131mFlag()); xeData.setNidFlag(anlyseResultIn.getXe131mFlag());
} else if (xeData.getNuclideName().equals(XeNuclideName.XE_133)) { } else if (xeData.getNuclideName().equals(XeNuclideName.XE_133.getType())) {
xeData.setNidFlag(anlyseResultIn.getXe133Flag()); xeData.setNidFlag(anlyseResultIn.getXe133Flag());
} else if (xeData.getNuclideName().equals(XeNuclideName.XE_133m)) { } else if (xeData.getNuclideName().equals(XeNuclideName.XE_133m.getType())) {
xeData.setNidFlag(anlyseResultIn.getXe133mFlag()); xeData.setNidFlag(anlyseResultIn.getXe133mFlag());
} else if (xeData.getNuclideName().equals(XeNuclideName.XE_135)) { } else if (xeData.getNuclideName().equals(XeNuclideName.XE_135.getType())) {
xeData.setNidFlag(anlyseResultIn.getXe135Flag()); xeData.setNidFlag(anlyseResultIn.getXe135Flag());
} }
} }
@ -5827,10 +5835,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;
} }