From d8e30f6835b29054ddebc3be074cbd2d1a13eb86 Mon Sep 17 00:00:00 2001 From: lucas Date: Sun, 31 Aug 2025 20:09:47 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=9B=B4=E6=96=B0=E5=8F=8C=E6=8E=A7?= =?UTF-8?q?=20=E9=81=BF=E5=85=8D=E5=90=8C=E6=97=B6=E9=97=B4=E5=91=8A?= =?UTF-8?q?=E8=AD=A6=20=E9=87=8D=E5=A4=8D=E8=A7=A6=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- consumers/consumerAxySkAlarm.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/consumers/consumerAxySkAlarm.go b/consumers/consumerAxySkAlarm.go index 9c1c3e8..d4bf146 100644 --- a/consumers/consumerAxySkAlarm.go +++ b/consumers/consumerAxySkAlarm.go @@ -229,7 +229,7 @@ func (the *consumerAxySkAlarm) judgeSK() string { continue } - if hv.Time.After(alarmTime) { + if !alarmTime.After(hv.Time) { log.Printf("测点[%s]本次触发时刻[%s]level=%d 对比历史有效时刻[%s]level=%d 非新", sid, alarmTime.Format("2006-01-02 15:04:05"), level, @@ -240,6 +240,7 @@ func (the *consumerAxySkAlarm) judgeSK() string { } } //纪录历史告警 + log.Printf("测点[%s]本次触发双控,时刻[%s]level=%d", sid, alarmTime.Format("2006-01-02 15:04:05"), level) the.historyStationAlarmMap[sid] = AXY_SK.HistoryAlarm{ SourceId: sid, AlarmLevel: level, @@ -359,7 +360,7 @@ func (the *consumerAxySkAlarm) isRuleAlarm(trigger AXY_SK.AlarmTrigger, stationA for _, conditionInt := range trigger.ConditionArray { switch conditionInt { case 0: - if stationAlarm.Alarm3007.CurrentLevel <= trigger.AlarmLevel { + if stationAlarm.Alarm3007 != nil && stationAlarm.Alarm3007.CurrentLevel <= trigger.AlarmLevel { isAlarm = true detail += stationAlarm.Alarm3007.Detail if stationAlarm.Alarm3007.EndTime.After(dt) { @@ -368,7 +369,7 @@ func (the *consumerAxySkAlarm) isRuleAlarm(trigger AXY_SK.AlarmTrigger, stationA triggerTypeCodes = append(triggerTypeCodes, stationAlarm.Alarm3007.AlarmTypeCode) } case 1: - if stationAlarm.Alarm3008.CurrentLevel <= trigger.AlarmLevel { + if stationAlarm.Alarm3008 != nil && stationAlarm.Alarm3008.CurrentLevel <= trigger.AlarmLevel { isAlarm = true detail += stationAlarm.Alarm3008.Detail if stationAlarm.Alarm3008.EndTime.After(dt) {