From 5244288427a81807197e024f6cf583b801cdf948 Mon Sep 17 00:00:00 2001 From: simonzhangsz Date: Fri, 5 Jan 2024 16:58:21 +0800 Subject: [PATCH] fix: bool warning --- features/fm/alarm.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/features/fm/alarm.go b/features/fm/alarm.go index 840d2287..4d422c56 100644 --- a/features/fm/alarm.go +++ b/features/fm/alarm.go @@ -252,7 +252,7 @@ func PostAlarmFromNF(w http.ResponseWriter, r *http.Request) { tm, _ := time.Parse(time.RFC3339, alarmData.EventTime) log.Debugf("EventTime:%s tm:%d tm-datetime:%s", alarmData.EventTime, tm, tm.Local().Format(time.DateTime)) alarmData.ClearTime.Time = tm - if IsNeedToAckAlarm(valueJson, &alarmData) == true { + if IsNeedToAckAlarm(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). 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) continue } - if has == true { + if has { 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) - if has == true && severity > alarmData.OrigSeverity { + if has && severity > alarmData.OrigSeverity { // update exist record _, err := session.Table("alarm"). 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", alarmData.AlarmId, alarmData.NeType, alarmData.NeId). Exist() - if err == nil && has == true { + if err == nil && has { log.Warn("Exist the same alarm") continue } @@ -359,7 +359,7 @@ func PostAlarmFromNF(w http.ResponseWriter, r *http.Request) { log.Debugf("neType=%s, neId=%s, currentSeq=%s activeAlarmNum=%d", alarmData.NeType, alarmData.NeId, currentSeq, activeAlarmNum) - if has == true { + if has { seq, _ := strconv.Atoi(currentSeq) alarmData.AlarmSeq = seq + 1 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) - if has == false || severity == alarmData.OrigSeverity { + if has || severity == alarmData.OrigSeverity { alarmData.PerceivedSeverity = alarmData.OrigSeverity } else if severity > alarmData.OrigSeverity { alarmData.PerceivedSeverity = alarmData.OrigSeverity