From 98da13473df4f698519ba782466f915f1c93eb99 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Wed, 15 Oct 2025 14:59:22 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=87=AA=E6=A3=80=E5=91=8A=E8=AD=A6?=
 =?UTF-8?q?=E9=99=84=E5=8A=A0=E4=BF=A1=E6=81=AF=E9=94=99=E8=AF=AF=E6=9C=80?=
 =?UTF-8?q?=E4=BD=B3=E5=92=8C=E8=A7=A6=E5=8F=91=E6=B6=88=E9=99=A4=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C?=
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            | 14 +++++++-------
 2 files changed, 16 insertions(+), 16 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 fdefdb14..d737236a 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
@@ -112,20 +112,20 @@ func (s *NeAlarmStateCheckCMDProcessor) Execute(data any) (any, error) {
 
 		// 检查状态
 		err := s.serverState(neInfo.ServerState, params.CPUUseGt, params.MemUseGt, params.DiskUseGt)
-		if err == nil {
-			continue
-		}
+
 		// 附加信息
 		addInfo := params.AddInfo
-		if addInfo != "" {
-			addInfo = addInfo + ", " + err.Error()
-		} else {
-			addInfo = err.Error()
+		if err != nil {
+			if addInfo != "" {
+				addInfo = addInfo + ", " + err.Error()
+			} else {
+				addInfo = err.Error()
+			}
 		}
-
-		neTypeAndId := fmt.Sprintf("%s_%s", neInfo.NeType, neInfo.NeId)
 		// 告警ID
 		params.AlarmId = fmt.Sprintf("%d%d", constants.ALARM_CMD_CHECK, neInfo.CreateTime)
+
+		neTypeAndId := fmt.Sprintf("%s_%s", neInfo.NeType, neInfo.NeId)
 		// 检查网元告警ID是否唯一
 		alarmIdArr := s.alarmService.Find(neDataModel.Alarm{
 			NeType:  neInfo.NeType,
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 d1fed275..b3d0c0ba 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
@@ -92,15 +92,15 @@ func (s *NeAlarmStateCheckLicenseProcessor) Execute(data any) (any, error) {
 
 		// 检查状态
 		err := s.serverState(neInfo.ServerState, params.DayLt)
-		if err == nil {
-			continue
-		}
+
 		// 附加信息
 		addInfo := params.AddInfo
-		if addInfo != "" {
-			addInfo = addInfo + ", " + err.Error()
-		} else {
-			addInfo = err.Error()
+		if err != nil {
+			if addInfo != "" {
+				addInfo = addInfo + ", " + err.Error()
+			} else {
+				addInfo = err.Error()
+			}
 		}
 
 		neTypeAndId := fmt.Sprintf("%s_%s", neInfo.NeType, neInfo.NeId)