From 6f30d998f383c099c94c49c27aaf17efa4e40cf7 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Thu, 24 Jul 2025 14:20:32 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=87=AA=E6=A3=80=E4=BA=A7=E7=94=9F?= =?UTF-8?q?=E7=9A=84=E5=91=8A=E8=AD=A6=E8=BE=85=E5=8A=A9=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=AD=97=E7=AC=A6=E9=87=8D=E5=A4=8D=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ne_alarm_state_check_cmd/ne_alarm_state_check_cmd.go | 9 +++++---- .../ne_alarm_state_check_license.go | 9 +++++---- 2 files changed, 10 insertions(+), 8 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 2d7fc89e..12dc40ae 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 @@ -142,10 +142,11 @@ func (s *NeAlarmStateCheckCMDProcessor) 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() } // 事件产生时间 @@ -164,7 +165,7 @@ func (s *NeAlarmStateCheckCMDProcessor) Execute(data any) (any, error) { AlarmStatus: oam.ALARM_STATUS_ACTIVE, // 告警状态 SpecificProblem: params.SpecificProblem, // 告警问题原因 SpecificProblemID: params.SpecificProblemID, // 告警问题原因ID - AddInfo: params.AddInfo, // 告警辅助信息 + AddInfo: addInfo, // 告警辅助信息 LocationInfo: "NE CPU/Menory/Disk: Heartbeat", // 告警定位信息 } if err = oamService.NewAlarm.Resolve(alarm); err == nil { 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 a5ae5411..8e866a05 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 @@ -80,10 +80,11 @@ 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() } // 告警ID @@ -100,7 +101,7 @@ func (s *NeAlarmStateCheckLicenseProcessor) Execute(data any) (any, error) { AlarmStatus: oam.ALARM_STATUS_ACTIVE, // 告警状态 SpecificProblem: params.SpecificProblem, // 告警问题原因 SpecificProblemID: params.SpecificProblemID, // 告警问题原因ID - AddInfo: params.AddInfo, // 告警辅助信息 + AddInfo: addInfo, // 告警辅助信息 LocationInfo: "NE License: Heartbeat", // 告警定位信息 } if err = oamService.NewAlarm.Resolve(alarm); err == nil {