From 4177242df01efdef6c07f9268d5ca33ed36bbc36 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Thu, 22 May 2025 19:58:25 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=A7=BB=E9=99=A4=E6=9C=AA?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E7=9A=84=E5=87=BD=E6=95=B0=E5=92=8C=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=EF=BC=8C=E4=BC=98=E5=8C=96=E5=91=8A=E8=AD=A6=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 features/fm/alarm.go | 34 +++-------------------------------
 1 file changed, 3 insertions(+), 31 deletions(-)

diff --git a/features/fm/alarm.go b/features/fm/alarm.go
index a3e95865..49b8d8ed 100644
--- a/features/fm/alarm.go
+++ b/features/fm/alarm.go
@@ -5,13 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
-	"strconv"
 	"strings"
-	"time"
 
 	"be.ems/lib/config"
 	"be.ems/lib/core/ctx"
-	"be.ems/lib/dborm"
 	"be.ems/lib/global"
 	"be.ems/lib/log"
 	"be.ems/lib/services"
@@ -105,32 +102,7 @@ var (
 	CustomUriAlarmsFmt = config.UriPrefix + "/faultManagement/v1/elementType/%s/objectType/alarms"
 )
 
-func IsNeedToAckAlarm(valueJson *dborm.ValueJson, alarm *Alarm) bool {
-	log.Info("IsNeedToAckAlarm processing... ")
-	if valueJson != nil {
-		status, _ := strconv.Atoi(valueJson.AlarmStatus)
-		log.Tracef("alarm.AlarmStatus=%d, alarm.AlarmType=%s, alarm.OrigSeverity=%s", alarm.AlarmStatus, alarm.AlarmType, alarm.OrigSeverity)
-		log.Tracef("status=%d, valueJson.AlarmType=%s, valueJson.OrigSeverity=%s", status, valueJson.AlarmType, valueJson.OrigSeverity)
-
-		if alarm.AlarmStatus == status &&
-			alarm.AlarmType == valueJson.AlarmType &&
-			alarm.OrigSeverity == valueJson.OrigSeverity {
-			return true
-		}
-	}
-
-	return false
-}
-
-func SetAlarmAckInfo(valueJson *dborm.ValueJson, alarm *Alarm) {
-	log.Info("SetAlarmAckInfo processing... ")
-	alarm.AckState = AckStateAcked
-	alarm.AckTime.Valid = true
-	alarm.AckTime.Time = time.Now()
-	alarm.AckUser = valueJson.AckUser
-}
-
-// process alarm post message from NFs
+// PostAlarmFromNF 网元告警数据上报接收
 func PostAlarmFromNF(w http.ResponseWriter, r *http.Request) {
 	log.Debug("PostAlarmFromNF processing... ")
 	apiVer := ctx.GetParam(r, "apiVersion")
@@ -512,7 +484,7 @@ func mapToAlarm(data []map[string]any) []Alarm {
 	return result
 }
 
-// process alarm get from NFs
+// GetAlarmFromNF 告警历史数据，从网元获取
 func GetAlarmFromNF(w http.ResponseWriter, r *http.Request) {
 	log.Debug("GetAlarmFromNF processing... ")
 	neType := ctx.GetParam(r, "elementTypeValue")
@@ -591,5 +563,5 @@ func GetAlarmFromNF(w http.ResponseWriter, r *http.Request) {
 			}
 		}
 	}
-	services.ResponseStatusOK204NoContent(w)
+	services.ResponseWithJson(w, 200, resp.OkMsg("sync alarms success"))
 }