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

人工交互模块Gamma部分增加核素方法增加判断核素存在不重复添加核素信息

Browse Source 
人工交互模块Beta部分重新分析全部谱信息，赋值位置修改
This commit is contained in:
qiaoqinzheng 2024-04-12 11:50:02 +08:00
parent 9f9466b529
commit ea3cc4ea0e
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3505,10 +3505,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();
@ -3527,11 +3529,12 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
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.setBetaList(betaList);
sampleBetaData.setBetaFittingPara(betaFittingPara); sampleBetaData.setBetaFittingPara(betaFittingPara);
sampleBetaData.setBetaFittingParaToUi(betaFittingParaToUi); sampleBetaData.setBetaFittingParaToUi(betaFittingParaToUi);
sampleBetaData.setBetaNewEnergyList(betaDataFile.getBetaNewEnergyListNow()); 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)));
@ -3584,11 +3587,12 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
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.setGammaList(gammaList);
sampleBetaData.setGammaFittingPara(gammaFittingPara); sampleBetaData.setGammaFittingPara(gammaFittingPara);
sampleBetaData.setGammaFittingParaToUi(gammaFittingParaToUi); sampleBetaData.setGammaFittingParaToUi(gammaFittingParaToUi);
sampleBetaData.setGammaNewEnergyList(betaDataFile.getGammaNewEnergyListNow()); 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)));
@ -3984,7 +3988,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;
} }