alarm
This commit is contained in:
@@ -341,8 +341,8 @@ func PostAlarmFromNF(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("event_time").
|
||||
Desc("alarm_seq").
|
||||
//Desc("event_time").
|
||||
Cols("alarm_seq").
|
||||
Limit(1).
|
||||
Get(¤tSeq)
|
||||
@@ -575,6 +575,7 @@ func GetAlarmFromNF(w http.ResponseWriter, r *http.Request) {
|
||||
// for alarm forward time format
|
||||
alarmData.EventTime = eventTime
|
||||
} else {
|
||||
activeAlarmNum++
|
||||
has, err := xEngine.Table("alarm").
|
||||
Where("alarm_id=? and ne_type=? and ne_id=? and alarm_status=1",
|
||||
alarmData.AlarmId, alarmData.NeType, alarmData.NeId).
|
||||
@@ -587,8 +588,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("event_time").
|
||||
Desc("alarm_seq").
|
||||
//Desc("event_time").
|
||||
Cols("alarm_seq").
|
||||
Limit(1).
|
||||
Get(¤tSeq)
|
||||
|
||||
Reference in New Issue
Block a user