dd

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(&currentSeq)
@@ -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