|
@@ -373,7 +373,7 @@ public class AlarmHandleServiceImpl {
|
|
String alarmId = alarmRecordDO.getAlarmId();
|
|
String alarmId = alarmRecordDO.getAlarmId();
|
|
alarmRedisCache.lock(RedisConstant.alarmRecordLockPrefix + alarmId, alarmId, 10);
|
|
alarmRedisCache.lock(RedisConstant.alarmRecordLockPrefix + alarmId, alarmId, 10);
|
|
// 发送报警恢复消息
|
|
// 发送报警恢复消息
|
|
- sendAlarmRecoverMessage(defineId, alarmSuspendStartTime, paramMap, alarmId, alarmDefine.getItemCode());
|
|
|
|
|
|
+ sendAlarmRecoverMessage(alarmDefine.getProjectId(), alarmSuspendStartTime, paramMap, alarmId, alarmDefine.getItemCode());
|
|
// 取消过期任务
|
|
// 取消过期任务
|
|
cancelRelatedExpireJob(alarmId);
|
|
cancelRelatedExpireJob(alarmId);
|
|
// 报警恢复,报警状态重置回默认
|
|
// 报警恢复,报警状态重置回默认
|
|
@@ -413,7 +413,7 @@ public class AlarmHandleServiceImpl {
|
|
dmpMessage.setGroupCode(groupCode);
|
|
dmpMessage.setGroupCode(groupCode);
|
|
dmpMessage.setExts(JSONObject.parseObject(JSONObject.toJSONString(alarmRecoverRecord)));
|
|
dmpMessage.setExts(JSONObject.parseObject(JSONObject.toJSONString(alarmRecoverRecord)));
|
|
rabbitTemplate.convertAndSend(RabbitConfig.exchangeAlarm, RabbitConfig.alarmMsgRoutingKey,
|
|
rabbitTemplate.convertAndSend(RabbitConfig.exchangeAlarm, RabbitConfig.alarmMsgRoutingKey,
|
|
- JSON.toJSONString(dmpMessage));
|
|
|
|
|
|
+ dmpMessage);
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -697,6 +697,6 @@ public class AlarmHandleServiceImpl {
|
|
dmpMessage.setExts(message);
|
|
dmpMessage.setExts(message);
|
|
alarmRedisCache.lock(RedisConstant.alarmRecordLockPrefix + alarmId, alarmId, 10);
|
|
alarmRedisCache.lock(RedisConstant.alarmRecordLockPrefix + alarmId, alarmId, 10);
|
|
rabbitTemplate.convertAndSend(RabbitConfig.exchangeAlarm, RabbitConfig.alarmMsgRoutingKey,
|
|
rabbitTemplate.convertAndSend(RabbitConfig.exchangeAlarm, RabbitConfig.alarmMsgRoutingKey,
|
|
- JSON.toJSONString(dmpMessage));
|
|
|
|
|
|
+ dmpMessage);
|
|
}
|
|
}
|
|
}
|
|
}
|