From 75387400acaecbdde284d1622c637673c1883d04 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Wed, 3 Sep 2025 11:50:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E5=91=8A=E8=AD=A6?=
 =?UTF-8?q?=E9=99=84=E5=8A=A0=E4=BF=A1=E6=81=AF=E5=A4=84=E7=90=86=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ne_alarm_state_check_cmd.go               | 18 ++++++++-------
 .../ne_alarm_state_check_license.go           | 19 +++++++---------
 .../ne_alarm_state_check_udmdb_sync.go        | 22 +++++++++----------
 3 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/src/modules/crontask/processor/ne_alarm_state_check_cmd/ne_alarm_state_check_cmd.go b/src/modules/crontask/processor/ne_alarm_state_check_cmd/ne_alarm_state_check_cmd.go
index 708fb04a..aac8aef9 100644
--- a/src/modules/crontask/processor/ne_alarm_state_check_cmd/ne_alarm_state_check_cmd.go
+++ b/src/modules/crontask/processor/ne_alarm_state_check_cmd/ne_alarm_state_check_cmd.go
@@ -107,6 +107,13 @@ func (s *NeAlarmStateCheckCMDProcessor) Execute(data any) (any, error) {
 		if err == nil {
 			continue
 		}
+		// 附加信息
+		addInfo := params.AddInfo
+		if addInfo != "" {
+			addInfo = addInfo + ", " + err.Error()
+		} else {
+			addInfo = err.Error()
+		}
 
 		neTypeAndId := fmt.Sprintf("%s_%s", neInfo.NeType, neInfo.NeId)
 		// 告警ID
@@ -136,15 +143,10 @@ func (s *NeAlarmStateCheckCMDProcessor) Execute(data any) (any, error) {
 		}
 		// 未记录
 		if alarmStatus == "" {
-			addInfo := params.AddInfo
-			if params.AddInfo != "" {
-				params.AddInfo = params.AddInfo + ", " + err.Error()
-			} else {
-				params.AddInfo = err.Error()
-			}
 			// 进行新增
-			newAlarm, err := s.alarmNew(neInfo, params)
-			params.AddInfo = addInfo                       // 恢复附加信息
+			copyParams := params
+			copyParams.AddInfo = addInfo
+			newAlarm, err := s.alarmNew(neInfo, copyParams)
 			triggerCount.Store(neTypeAndId, []time.Time{}) // 重置连续触发次数
 			if err != nil {
 				result[neTypeAndId] = err.Error()
diff --git a/src/modules/crontask/processor/ne_alarm_state_check_license/ne_alarm_state_check_license.go b/src/modules/crontask/processor/ne_alarm_state_check_license/ne_alarm_state_check_license.go
index 40a1ffdf..89657b5a 100644
--- a/src/modules/crontask/processor/ne_alarm_state_check_license/ne_alarm_state_check_license.go
+++ b/src/modules/crontask/processor/ne_alarm_state_check_license/ne_alarm_state_check_license.go
@@ -87,10 +87,12 @@ func (s *NeAlarmStateCheckLicenseProcessor) Execute(data any) (any, error) {
 		if err == nil {
 			continue
 		}
-		if params.AddInfo != "" {
-			params.AddInfo = params.AddInfo + ", " + err.Error()
+		// 附加信息
+		addInfo := params.AddInfo
+		if addInfo != "" {
+			addInfo = addInfo + ", " + err.Error()
 		} else {
-			params.AddInfo = err.Error()
+			addInfo = err.Error()
 		}
 
 		neTypeAndId := fmt.Sprintf("%s_%s", neInfo.NeType, neInfo.NeId)
@@ -121,15 +123,10 @@ func (s *NeAlarmStateCheckLicenseProcessor) Execute(data any) (any, error) {
 		}
 		// 未记录
 		if alarmStatus == "" {
-			addInfo := params.AddInfo
-			if params.AddInfo != "" {
-				params.AddInfo = params.AddInfo + ", " + err.Error()
-			} else {
-				params.AddInfo = err.Error()
-			}
 			// 进行新增
-			newAlarm, err := s.alarmNew(neInfo, params)
-			params.AddInfo = addInfo // 恢复附加信息
+			copyParams := params
+			copyParams.AddInfo = addInfo
+			newAlarm, err := s.alarmNew(neInfo, copyParams)
 			if err != nil {
 				result[neTypeAndId] = err.Error()
 				continue
diff --git a/src/modules/crontask/processor/ne_alarm_state_check_udmdb_sync/ne_alarm_state_check_udmdb_sync.go b/src/modules/crontask/processor/ne_alarm_state_check_udmdb_sync/ne_alarm_state_check_udmdb_sync.go
index 99a0aee9..605b6349 100644
--- a/src/modules/crontask/processor/ne_alarm_state_check_udmdb_sync/ne_alarm_state_check_udmdb_sync.go
+++ b/src/modules/crontask/processor/ne_alarm_state_check_udmdb_sync/ne_alarm_state_check_udmdb_sync.go
@@ -73,10 +73,12 @@ func (s *NeAlarmStateCheckUDMDBProcessor) Execute(data any) (any, error) {
 		if err == nil {
 			continue
 		}
-		if params.AddInfo != "" {
-			params.AddInfo = params.AddInfo + ", " + err.Error()
+		// 附加信息
+		addInfo := params.AddInfo
+		if addInfo != "" {
+			addInfo = addInfo + ", " + err.Error()
 		} else {
-			params.AddInfo = err.Error()
+			addInfo = err.Error()
 		}
 
 		neTypeAndId := fmt.Sprintf("%s_%s", neInfo.NeType, neInfo.NeId)
@@ -107,15 +109,10 @@ func (s *NeAlarmStateCheckUDMDBProcessor) Execute(data any) (any, error) {
 		}
 		// 未记录
 		if alarmStatus == "" {
-			addInfo := params.AddInfo
-			if params.AddInfo != "" {
-				params.AddInfo = params.AddInfo + ", " + err.Error()
-			} else {
-				params.AddInfo = err.Error()
-			}
 			// 进行新增
-			newAlarm, err := s.alarmNew(neInfo, params)
-			params.AddInfo = addInfo // 恢复附加信息
+			copyParams := params
+			copyParams.AddInfo = addInfo
+			newAlarm, err := s.alarmNew(neInfo, copyParams)
 			if err != nil {
 				result[neTypeAndId] = err.Error()
 				continue
@@ -183,6 +180,9 @@ func (s NeAlarmStateCheckUDMDBProcessor) serverState(neInfo neModel.NeInfo) erro
 			}
 			continue
 		}
+		if !(strings.HasPrefix(master_host, "master_") && strings.HasPrefix(master_port, "master_")) {
+			break
+		}
 	}
 
 	return fmt.Errorf("host:%s, port:%s, status down", master_host, master_port)