From bd3115d7a7ff67e2b5990ca1656babbba76b9e43 Mon Sep 17 00:00:00 2001
From: lucas <lu.kai@free-sun.com.cn>
Date: Mon, 1 Sep 2025 10:50:38 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=B0=83=E6=95=B4=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 consumers/consumerAxySkAlarm.go | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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 {