|
@@ -211,7 +211,7 @@ public class AlarmHandleServiceImpl implements AlarmHandleService {
|
|
|
}
|
|
|
log.info("triggerResult:[{}],endResult:[{}]", triggerResult, endResult);
|
|
|
if (triggerResult && endResult) {
|
|
|
- log.error("报警触发条件和报警恢复条件同时满足,请检查,报警定义详情【{}】", alarmDefine.toString());
|
|
|
+ log.error("报警触发条件和报警恢复条件同时满足,请检查,报警定义详情【{}】", alarmDefine);
|
|
|
}
|
|
|
synchronized (defineId.intern()) {
|
|
|
//报警产生值满足(这里的满足不考虑报警持续时间)
|
|
@@ -800,6 +800,7 @@ public class AlarmHandleServiceImpl implements AlarmHandleService {
|
|
|
.objId(alarmDefine.getObjId())
|
|
|
.classCode(alarmDefine.getClassCode())
|
|
|
.createUser(systemId)
|
|
|
+ .treatState(1)
|
|
|
.build();
|
|
|
NettyMessage<AlarmRecord> nettyMessage = new NettyMessage<>(5, alarmDefine.getProjectId());
|
|
|
nettyMessage.setContent(Collections.singletonList(alarmRecord));
|