|
|
@ -178,7 +178,8 @@ public class BatchDeviceMessageProcessor { |
|
|
processGasAlarm(handVo, alarmRule, context); |
|
|
processGasAlarm(handVo, alarmRule, context); |
|
|
|
|
|
|
|
|
// 7. 电池报警处理
|
|
|
// 7. 电池报警处理
|
|
|
processBatteryAlarm(handVo, context); |
|
|
|
|
|
|
|
|
handVo.setBatteryStatus(EnableStatus.DISABLED.value()); |
|
|
|
|
|
//processBatteryAlarm(handVo, context);
|
|
|
|
|
|
|
|
|
// 8. 围栏报警处理
|
|
|
// 8. 围栏报警处理
|
|
|
processFenceAlarm(handVo, context); |
|
|
processFenceAlarm(handVo, context); |
|
|
@ -643,6 +644,7 @@ public class BatchDeviceMessageProcessor { |
|
|
newAlarm.setCreator("system"); |
|
|
newAlarm.setCreator("system"); |
|
|
newAlarm.setCreateTime(now); |
|
|
newAlarm.setCreateTime(now); |
|
|
newAlarm.setDeptId(handVo.getDeptId()); |
|
|
newAlarm.setDeptId(handVo.getDeptId()); |
|
|
|
|
|
newAlarm.setUnit(handVo.getUnit()); |
|
|
newAlarm.setAlarmLevel(HandAlarmType.ALARM.getType()); |
|
|
newAlarm.setAlarmLevel(HandAlarmType.ALARM.getType()); |
|
|
|
|
|
|
|
|
context.gasAlarmsToCreate.add(newAlarm); |
|
|
context.gasAlarmsToCreate.add(newAlarm); |
|
|
|