diff --git a/consumers/consumerAxySkAlarm.go b/consumers/consumerAxySkAlarm.go index 94504f6..1bba256 100644 --- a/consumers/consumerAxySkAlarm.go +++ b/consumers/consumerAxySkAlarm.go @@ -249,23 +249,23 @@ func (the *consumerAxySkAlarm) isHistoryAlarm(sourceId string, level int, alarmT if !alarmTime.After(hv.Time) { log.Printf("测点[%s]本次触发时刻[%s]%s(实际es=%s) 对比历史有效时刻[%s] 非新", sourceId, - alarmTime.Format("2006-01-02 15:04:05"), + alarmTime.Format("2006-01-02 15:04:05.000"), rawK, hisK, - hv.Time.Format("2006-01-02 15:04:05"), + hv.Time.Format("2006-01-02 15:04:05.000"), ) continue } if hv.AlarmLevel < level { //低等级告警过滤 - log.Printf("测点[%s]本次触发 %s(实际es=%s) > 历史有效等级%d,不再重复触发", sourceId, rawK, hisK, hv.AlarmLevel) + log.Printf("测点[%s]本次触发 %s(实际es=%s) 低于 历史有效等级%d,历史时刻%s,不再重复触发", sourceId, rawK, hisK, hv.AlarmLevel, hv.Time.Format("2006-01-02 15:04:05.000")) continue } - return true, hisK + return false, hisK } } - return false, rawK + return true, rawK } func (the *consumerAxySkAlarm) skAlarmInfo(alarmInfoTemplate *models.EsAlarm, level int, detail string, alarmTime time.Time, triggerTypeCodes []string) []byte {