fix: 核素分析规则 增加核素识别报警,求平均值的周期和系数都整合到规则中
This commit is contained in:
parent
8768a2b566
commit
635545cb86
|
@ -153,9 +153,9 @@ public class AlarmAnalysisRuleServiceImpl extends ServiceImpl<AlarmAnalysisRuleM
|
||||||
String id = alarmAnalysisRule.getId();
|
String id = alarmAnalysisRule.getId();
|
||||||
String name = alarmAnalysisRule.getName();
|
String name = alarmAnalysisRule.getName();
|
||||||
String original = getById(id).getName();
|
String original = getById(id).getName();
|
||||||
if (null != alarmAnalysisRule.getIdentifyNuclides()) {
|
if (null != alarmAnalysisRule.getIdentifyNuclides() && !alarmAnalysisRule.getConditions().contains("4")) {
|
||||||
alarmAnalysisRule.setConditions(alarmAnalysisRule.getConditions() + ",4");
|
alarmAnalysisRule.setConditions(alarmAnalysisRule.getConditions() + ",4");
|
||||||
} else {
|
} else if(null == alarmAnalysisRule.getIdentifyNuclides() && !alarmAnalysisRule.getConditions().contains("4")) {
|
||||||
alarmAnalysisRule.setConditions(alarmAnalysisRule.getConditions().replace("4", ""));
|
alarmAnalysisRule.setConditions(alarmAnalysisRule.getConditions().replace("4", ""));
|
||||||
}
|
}
|
||||||
if (!StrUtil.equalsIgnoreCase(name,original)){
|
if (!StrUtil.equalsIgnoreCase(name,original)){
|
||||||
|
|
Loading…
Reference in New Issue
Block a user