From 7cba553884359331edf71047d0308371d8daca88 Mon Sep 17 00:00:00 2001
From: simonzhangsz <simonzhangsz@outlook.com>
Date: Wed, 27 Sep 2023 18:01:52 +0800
Subject: [PATCH] d

---
 features/fm/alarm.go | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/features/fm/alarm.go b/features/fm/alarm.go
index 521d93e5..6a317fa9 100644
--- a/features/fm/alarm.go
+++ b/features/fm/alarm.go
@@ -484,14 +484,23 @@ func GetAlarmFromNF(w http.ResponseWriter, r *http.Request) {
 		body := response.Body()
 		log.Debug("Request body:", string(body))
 		alarmArray := new([]Alarm)
-		_ = json.Unmarshal(body, &alarmArray)
-
+		err = json.Unmarshal(body, &alarmArray)
+		if err != nil {
+			log.Error("Failed to Unmarshal:", err)
+			//services.ResponseInternalServerError500ProcessError(w, err)
+			continue
+		}
 		valueJson, err := dborm.XormGetAAConfig()
 		if err != nil {
 			log.Error("Failed to XormGetAAConfig:", err)
 			//services.ResponseInternalServerError500ProcessError(w, err)
 			continue
 		}
+		if alarmArray == nil {
+			log.Info("Not found sync alarms, neType=%s, neId=%s", ne.NeType, ne.NeId)
+			//services.ResponseInternalServerError500ProcessError(w, err)
+			continue
+		}
 		// session := xEngine.NewSession()
 		// defer session.Close()
 		var activeAlarmNum int = 0