|
@@ -230,26 +230,29 @@ public class AlarmRecordWrapper {
|
|
|
copyBasicInfo(alarmRecordItem, alarmRecordItemVO);
|
|
|
/* 报警条件 */
|
|
|
JSONObject condition = alarmRecordItem.getCondition();
|
|
|
- AlarmConditionStrItem alarmConditionStrItem = new AlarmConditionStrItem();
|
|
|
- // 报警规则
|
|
|
- String rules = condition.getString("rules");
|
|
|
- List<String> rulesList = JSONArray.parseArray(rules, String.class);
|
|
|
- alarmConditionStrItem.setRules(rulesList);
|
|
|
- // 报警触发时间转换为分钟
|
|
|
- Integer triggerUphold = condition.getInteger("triggerUphold");
|
|
|
- if (triggerUphold != null) {
|
|
|
- triggerUphold = triggerUphold / 60;
|
|
|
+ if (condition != null) {
|
|
|
+ AlarmConditionStrItem alarmConditionStrItem = new AlarmConditionStrItem();
|
|
|
+ // 报警规则
|
|
|
+ String rules = condition.getString("rules");
|
|
|
+ List<String> rulesList = JSONArray.parseArray(rules, String.class);
|
|
|
+ alarmConditionStrItem.setRules(rulesList);
|
|
|
+ // 报警触发时间转换为分钟
|
|
|
+ Integer triggerUphold = condition.getInteger("triggerUphold");
|
|
|
+ if (triggerUphold != null) {
|
|
|
+ triggerUphold = triggerUphold / 60;
|
|
|
+ }
|
|
|
+ String lastTimeInfo = "持续%s分钟满足报警触发规则,则产生报警";
|
|
|
+ alarmConditionStrItem.setLastTimeInfo(
|
|
|
+ String.format(lastTimeInfo, triggerUphold == null ? "--" : triggerUphold));
|
|
|
+ EnumAlarmLevel alarmLevel = EnumAlarmLevel.getByType(alarmRecordItem.getLevel());
|
|
|
+ if (alarmLevel != null) {
|
|
|
+ alarmConditionStrItem.setAlarmLevel(new SimpleObjVO(
|
|
|
+ alarmLevel.getType(), alarmLevel.getDesc()
|
|
|
+ ));
|
|
|
+ }
|
|
|
+ alarmRecordItemVO.setAlarmCondition(alarmConditionStrItem);
|
|
|
}
|
|
|
- String lastTimeInfo = "持续%s分钟满足报警触发规则,则产生报警";
|
|
|
- alarmConditionStrItem.setLastTimeInfo(
|
|
|
- String.format(lastTimeInfo, triggerUphold == null ? "--" : triggerUphold));
|
|
|
- EnumAlarmLevel alarmLevel = EnumAlarmLevel.getByType(alarmRecordItem.getLevel());
|
|
|
- if (alarmLevel != null) {
|
|
|
- alarmConditionStrItem.setAlarmLevel(new SimpleObjVO(
|
|
|
- alarmLevel.getType(), alarmLevel.getDesc()
|
|
|
- ));
|
|
|
- }
|
|
|
- alarmRecordItemVO.setAlarmCondition(alarmConditionStrItem);
|
|
|
+
|
|
|
return alarmRecordItemVO;
|
|
|
}
|
|
|
|