人工交互模块Beta谱加载人工交互分析生成的公式及拟合折线返回参数判断逻辑修改
This commit is contained in:
parent
515b696719
commit
3d4f5275be
|
@ -1930,7 +1930,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
|
||||||
map.put("gammaSpectrum", seriseDataList);
|
map.put("gammaSpectrum", seriseDataList);
|
||||||
|
|
||||||
//判断人工交互的道值与能量对应参数数组是否为空
|
//判断人工交互的道值与能量对应参数数组是否为空
|
||||||
if (CollectionUtils.isNotEmpty(betaDataFile.getGammaList())) {
|
if (Objects.nonNull(betaDataFile.getBgPara()) && CollectionUtils.isNotEmpty(betaDataFile.getGammaList())) {
|
||||||
//存储计算参数道值
|
//存储计算参数道值
|
||||||
List<Double> xs = new LinkedList();
|
List<Double> xs = new LinkedList();
|
||||||
//存储计算参数能量值
|
//存储计算参数能量值
|
||||||
|
@ -2151,7 +2151,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
|
||||||
map.put("EToC", fittingParaToUiStr);
|
map.put("EToC", fittingParaToUiStr);
|
||||||
|
|
||||||
//判断人工交互的道值与能量对应参数数组是否为空
|
//判断人工交互的道值与能量对应参数数组是否为空
|
||||||
if (CollectionUtils.isNotEmpty(betaDataFile.getBetaList())) {
|
if (Objects.nonNull(betaDataFile.getBgPara()) && CollectionUtils.isNotEmpty(betaDataFile.getBetaList())) {
|
||||||
//存储计算参数道值
|
//存储计算参数道值
|
||||||
List<Double> xs = new LinkedList();
|
List<Double> xs = new LinkedList();
|
||||||
//存储计算参数能量值
|
//存储计算参数能量值
|
||||||
|
|
Loading…
Reference in New Issue
Block a user