|
@@ -213,7 +213,7 @@ public class AlarmHandleServiceImpl implements AlarmHandleService {
|
|
|
.state(2)
|
|
|
.groupCode(CommonConst.groupCode)
|
|
|
.projectId(CommonConst.projectId)
|
|
|
- .endTime(DateUtils.parseDate(dateTime))
|
|
|
+ .endTime(DateUtils.parse(dateTime))
|
|
|
.endInfo(JSONObject.toJSONString(paramMap))
|
|
|
.build();
|
|
|
//如果有报警ID,直接报警恢复
|
|
@@ -350,13 +350,13 @@ public class AlarmHandleServiceImpl implements AlarmHandleService {
|
|
|
if (timeSecond >= condition.getTriggerUphold()) {
|
|
|
log.warn("大于持续时间了,产生一条报警[{}]>[{}]", timeSecond, condition.getTriggerUphold());
|
|
|
AlarmRecord alarmRecord = AlarmRecord.builder()
|
|
|
- .category(alarmDefine.getCategory())
|
|
|
+ .objType(alarmDefine.getObjType())
|
|
|
.concern(alarmDefine.getConcern())
|
|
|
.level(alarmDefine.getLevel())
|
|
|
.projectId(CommonConst.projectId)
|
|
|
.state(1)
|
|
|
//报警时间为第一次满足报警条件时候的时间
|
|
|
- .triggerTime(DateUtils.parseDate(alarmState.getAlarmStartTime()))
|
|
|
+ .triggerTime(DateUtils.parse(alarmState.getAlarmStartTime()))
|
|
|
.remark(alarmDefine.getRemark())
|
|
|
.triggerInfo(JSONObject.toJSONString(paramMap))
|
|
|
.condition(condition.toString())
|
|
@@ -367,6 +367,8 @@ public class AlarmHandleServiceImpl implements AlarmHandleService {
|
|
|
.itemId(alarmDefine.getItemId())
|
|
|
.classCode(alarmDefine.getClassCode())
|
|
|
.createUser(CommonConst.systemId)
|
|
|
+ .ibmsClassCode(alarmDefine.getIbmsClassCode())
|
|
|
+ .ibmsSceneCode(alarmDefine.getIbmsSceneCode())
|
|
|
.build();
|
|
|
NettyMessage<AlarmRecord> nettyMessage = new NettyMessage<>(5);
|
|
|
nettyMessage.setContent(Arrays.asList(alarmRecord));
|