fix: 核素分析规则 增加核素识别报警,求平均值的周期和系数都整合到规则中
This commit is contained in:
parent
accc1d798e
commit
6d0531894d
|
@ -153,7 +153,7 @@ public class CalculateConcServiceImpl implements CalculateConcService {
|
||||||
for (String nuclide : nuclides) {
|
for (String nuclide : nuclides) {
|
||||||
String val = autoResult.get(nuclide);
|
String val = autoResult.get(nuclide);
|
||||||
if(StrUtil.isBlank(val)) continue;
|
if(StrUtil.isBlank(val)) continue;
|
||||||
AlarmAnalysisNuclideAvg analysisNuclideAvg = new AlarmAnalysisNuclideAvg(station, nuclide, val, analysisRule.getId());
|
AlarmAnalysisNuclideAvg analysisNuclideAvg = new AlarmAnalysisNuclideAvg(station, nuclide, val);
|
||||||
analysisNuclideAvg.setDataSourceType(CommonConstant.ARMDARR);
|
analysisNuclideAvg.setDataSourceType(CommonConstant.ARMDARR);
|
||||||
autoAvgs.add(analysisNuclideAvg);
|
autoAvgs.add(analysisNuclideAvg);
|
||||||
}
|
}
|
||||||
|
@ -164,7 +164,7 @@ public class CalculateConcServiceImpl implements CalculateConcService {
|
||||||
for (String nuclide : nuclides) {
|
for (String nuclide : nuclides) {
|
||||||
String val = manResult.get(nuclide);
|
String val = manResult.get(nuclide);
|
||||||
if(StrUtil.isBlank(val)) continue;
|
if(StrUtil.isBlank(val)) continue;
|
||||||
AlarmAnalysisNuclideAvg analysisNuclideAvg = new AlarmAnalysisNuclideAvg(station, nuclide, val, analysisRule.getId());
|
AlarmAnalysisNuclideAvg analysisNuclideAvg = new AlarmAnalysisNuclideAvg(station, nuclide, val);
|
||||||
analysisNuclideAvg.setDataSourceType(CommonConstant.ARMDRRR);
|
analysisNuclideAvg.setDataSourceType(CommonConstant.ARMDRRR);
|
||||||
manAvgs.add(analysisNuclideAvg);
|
manAvgs.add(analysisNuclideAvg);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user