From f74db3760b4f12f1b2b9e9a1e71505cc0ee5104d Mon Sep 17 00:00:00 2001 From: simonzhangsz Date: Tue, 15 Aug 2023 00:30:09 +0800 Subject: [PATCH] dd --- features/fm/alarm.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/features/fm/alarm.go b/features/fm/alarm.go index 864c8824..f49964d8 100644 --- a/features/fm/alarm.go +++ b/features/fm/alarm.go @@ -586,7 +586,8 @@ func GetAlarmFromNF(w http.ResponseWriter, r *http.Request) { var currentSeq string has, err = xEngine.Table("alarm"). Where("ne_type=? and ne_id=?", alarmData.NeType, alarmData.NeId). - Desc("alarm_seq"). + //Desc("alarm_seq"). + Desc("event_time"). Cols("alarm_seq"). Limit(1). Get(¤tSeq) @@ -598,10 +599,9 @@ func GetAlarmFromNF(w http.ResponseWriter, r *http.Request) { if has == true { seq, _ := strconv.Atoi(currentSeq) - if seq+1 > global.MaxInt32Number { + alarmData.AlarmSeq = seq + activeAlarmNum + if alarmData.AlarmSeq > global.MaxInt32Number { alarmData.AlarmSeq = AlarmSeqBeginNumber - } else { - alarmData.AlarmSeq = seq + 1 } } else { alarmData.AlarmSeq = AlarmSeqBeginNumber