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)