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

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

diff --git a/consumers/consumerAxySkAlarm.go b/consumers/consumerAxySkAlarm.go
index 9226f21..94504f6 100644
--- a/consumers/consumerAxySkAlarm.go
+++ b/consumers/consumerAxySkAlarm.go
@@ -116,7 +116,8 @@ func (the *consumerAxySkAlarm) updateTriggerStationConfig() {
                     FROM t_alarm_trigger as at
                     left join t_sensor s
                     on at.struct_id=s.structure
-                    and at.factor_id=s.factor;`
+                    and at.factor_id=s.factor
+					order by s.id,at.alarm_level;`
 	err := the.infoPg.Query(&the.stationAlarmTrigger, sql)
 	if err != nil {
 		log.Printf("查询数据库异常:err-> %s", err.Error())
@@ -203,14 +204,14 @@ func (the *consumerAxySkAlarm) judgeSK() string {
 				alarmInfoTemplate = stationAlarmInfo.Alarm3008
 			}
 			if isAlarm && alarmInfoTemplate != nil {
-				conditionStr := fmt.Sprintf("st:%d,f:%d,level:%d",
-					trigger.StructId, trigger.FactorId, level)
-				onceTriggerStationAlarmMap[sid] = conditionStr
 				//判断历史有没有
 				isHisAlarm, hisK := the.isHistoryAlarm(sid, level, alarmTime)
 				if isHisAlarm {
 					continue
 				}
+				conditionStr := fmt.Sprintf("st:%d,f:%d,level:%d",
+					trigger.StructId, trigger.FactorId, level)
+				onceTriggerStationAlarmMap[sid] = conditionStr
 				//纪录历史告警
 				log.Printf("trigger.Id=%d, 测点[%s]本次触发双控,%s,时刻[%s]level=%d", trigger.Id, sid, hisK, alarmTime.Format("2006-01-02 15:04:05.000"), level)
 				the.historyStationAlarmMap[hisK] = AXY_SK.HistoryAlarm{