OMC/be.ems
1
0
Fork 0
Code Issues Releases 3 Activity

fix: bool warning

Browse Source
This commit is contained in:
simonzhangsz
2024-01-05 16:58:21 +08:00
parent d5c02dee55
commit 5244288427
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
features/fm/alarm.go
View File

@@ -252,7 +252,7 @@ func PostAlarmFromNF(w http.ResponseWriter, r *http.Request) {
tm, _ := time.Parse(time.RFC3339, alarmData.EventTime) tm, _ := time.Parse(time.RFC3339, alarmData.EventTime)
log.Debugf("EventTime:%s tm:%d tm-datetime:%s", alarmData.EventTime, tm, tm.Local().Format(time.DateTime)) log.Debugf("EventTime:%s tm:%d tm-datetime:%s", alarmData.EventTime, tm, tm.Local().Format(time.DateTime))
alarmData.ClearTime.Time = tm alarmData.ClearTime.Time = tm
if IsNeedToAckAlarm(valueJson, &alarmData) == true { if IsNeedToAckAlarm(valueJson, &alarmData) {
SetAlarmAckInfo(valueJson, &alarmData) SetAlarmAckInfo(valueJson, &alarmData)
affected, err := session.Where("ne_type=? and ne_id=? and alarm_id=? and alarm_status=1", alarmData.NeType, alarmData.NeId, alarmData.AlarmId). affected, err := session.Where("ne_type=? and ne_id=? and alarm_id=? and alarm_status=1", alarmData.NeType, alarmData.NeId, alarmData.AlarmId).
Cols("alarm_status", "clear_type", "clear_time", "ack_state", "ack_time", "ack_user"). Cols("alarm_status", "clear_type", "clear_time", "ack_state", "ack_time", "ack_user").
@@ -285,7 +285,7 @@ func PostAlarmFromNF(w http.ResponseWriter, r *http.Request) {
log.Error("Failed to get alarm:", err) log.Error("Failed to get alarm:", err)
continue continue
} }
if has == true { if has {
seq, _ = strconv.Atoi(currentSeq) seq, _ = strconv.Atoi(currentSeq)
} }
@@ -320,7 +320,7 @@ func PostAlarmFromNF(w http.ResponseWriter, r *http.Request) {
} }
log.Debugf("neType=%s, neId=%s, eventTime=%s, severity=%s", alarmData.NeType, alarmData.NeId, alarmData.EventTime, severity) log.Debugf("neType=%s, neId=%s, eventTime=%s, severity=%s", alarmData.NeType, alarmData.NeId, alarmData.EventTime, severity)
if has == true && severity > alarmData.OrigSeverity { if has && severity > alarmData.OrigSeverity {
// update exist record // update exist record
_, err := session.Table("alarm"). _, err := session.Table("alarm").
Where("ne_type=? and ne_id=? and event_time=? and alarm_status=1", alarmData.NeType, alarmData.NeId, alarmData.EventTime). Where("ne_type=? and ne_id=? and event_time=? and alarm_status=1", alarmData.NeType, alarmData.NeId, alarmData.EventTime).
@@ -339,7 +339,7 @@ func PostAlarmFromNF(w http.ResponseWriter, r *http.Request) {
Where("alarm_id=? and ne_type=? and ne_id=? and alarm_status=1", Where("alarm_id=? and ne_type=? and ne_id=? and alarm_status=1",
alarmData.AlarmId, alarmData.NeType, alarmData.NeId). alarmData.AlarmId, alarmData.NeType, alarmData.NeId).
Exist() Exist()
if err == nil && has == true { if err == nil && has {
log.Warn("Exist the same alarm") log.Warn("Exist the same alarm")
continue continue
} }
@@ -359,7 +359,7 @@ func PostAlarmFromNF(w http.ResponseWriter, r *http.Request) {
log.Debugf("neType=%s, neId=%s, currentSeq=%s activeAlarmNum=%d", log.Debugf("neType=%s, neId=%s, currentSeq=%s activeAlarmNum=%d",
alarmData.NeType, alarmData.NeId, currentSeq, activeAlarmNum) alarmData.NeType, alarmData.NeId, currentSeq, activeAlarmNum)
if has == true { if has {
seq, _ := strconv.Atoi(currentSeq) seq, _ := strconv.Atoi(currentSeq)
alarmData.AlarmSeq = seq + 1 alarmData.AlarmSeq = seq + 1
if alarmData.AlarmSeq > global.MaxInt32Number { if alarmData.AlarmSeq > global.MaxInt32Number {
@@ -384,7 +384,7 @@ func PostAlarmFromNF(w http.ResponseWriter, r *http.Request) {
} }
log.Debugf("neType=%s, neId=%s, eventTime=%s, severity=%s", alarmData.NeType, alarmData.NeId, alarmData.EventTime, severity) log.Debugf("neType=%s, neId=%s, eventTime=%s, severity=%s", alarmData.NeType, alarmData.NeId, alarmData.EventTime, severity)
if has == false || severity == alarmData.OrigSeverity { if has || severity == alarmData.OrigSeverity {
alarmData.PerceivedSeverity = alarmData.OrigSeverity alarmData.PerceivedSeverity = alarmData.OrigSeverity
} else if severity > alarmData.OrigSeverity { } else if severity > alarmData.OrigSeverity {
alarmData.PerceivedSeverity = alarmData.OrigSeverity alarmData.PerceivedSeverity = alarmData.OrigSeverity