From b2e18fabfc16d6e83e22483e48e44fc0a83222e9 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Tue, 9 Sep 2025 16:18:23 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0=E5=91=8A=E8=AD=A6?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E6=97=B6=E9=97=B4=E4=B8=BA=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E6=97=B6=E9=97=B4=EF=BC=8C=E7=A7=BB=E9=99=A4=E4=B8=8D=E5=BF=85?= =?UTF-8?q?=E8=A6=81=E7=9A=84=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4=E6=A3=80?= =?UTF-8?q?=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processor/ne_alarm_state_check/ne_alarm_state_check.go | 7 ++----- .../ne_alarm_state_check_cmd/ne_alarm_state_check_cmd.go | 7 ++----- .../ne_alarm_state_check_license.go | 7 ++----- .../ne_alarm_state_check_udmdb_sync.go | 7 ++----- 4 files changed, 8 insertions(+), 20 deletions(-) diff --git a/src/modules/crontask/processor/ne_alarm_state_check/ne_alarm_state_check.go b/src/modules/crontask/processor/ne_alarm_state_check/ne_alarm_state_check.go index 1d3d68cc..27c190cb 100644 --- a/src/modules/crontask/processor/ne_alarm_state_check/ne_alarm_state_check.go +++ b/src/modules/crontask/processor/ne_alarm_state_check/ne_alarm_state_check.go @@ -137,10 +137,7 @@ func (s NeAlarmStateCheckProcessor) alarmClear(neInfo neModel.NeInfo, v neDataMo func (s NeAlarmStateCheckProcessor) alarmNew(neInfo neModel.NeInfo, v alarmParams) (neDataModel.Alarm, error) { // seq 告警序号 lastSeq := s.alarmService.FindAlarmSeqLast(neInfo.NeType, neInfo.RmUID) - lastTime := neInfo.UpdateTime // 网元最后更新时间 - if lastTime < neInfo.CreateTime { - lastTime = time.Now().UnixMilli() - } + alarm := neDataModel.Alarm{ NeType: neInfo.NeType, NeId: neInfo.RmUID, // neInfo.NeId, @@ -151,7 +148,7 @@ func (s NeAlarmStateCheckProcessor) alarmNew(neInfo neModel.NeInfo, v alarmParam AlarmId: v.AlarmId, AlarmTitle: v.AlarmTitle, AlarmCode: fmt.Sprint(constants.ALARM_STATE_CHECK), - EventTime: time.UnixMilli(lastTime), + EventTime: time.Now(), AlarmType: v.AlarmType, OrigSeverity: v.OrigSeverity, PerceivedSeverity: v.OrigSeverity, 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 d984ad50..d957c272 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 @@ -284,10 +284,7 @@ func (s NeAlarmStateCheckCMDProcessor) alarmClear(neInfo neModel.NeInfo, v neDat func (s NeAlarmStateCheckCMDProcessor) alarmNew(neInfo neModel.NeInfo, v alarmParams) (neDataModel.Alarm, error) { // seq 告警序号 lastSeq := s.alarmService.FindAlarmSeqLast(neInfo.NeType, neInfo.RmUID) - lastTime := neInfo.UpdateTime // 网元最后更新时间 - if lastTime < neInfo.CreateTime { - lastTime = time.Now().UnixMilli() - } + alarm := neDataModel.Alarm{ NeType: neInfo.NeType, NeId: neInfo.RmUID, // neInfo.NeId, @@ -298,7 +295,7 @@ func (s NeAlarmStateCheckCMDProcessor) alarmNew(neInfo neModel.NeInfo, v alarmPa AlarmId: v.AlarmId, AlarmTitle: v.AlarmTitle, AlarmCode: fmt.Sprint(constants.ALARM_CMD_CHECK), - EventTime: time.UnixMilli(lastTime), + EventTime: time.Now(), AlarmType: v.AlarmType, OrigSeverity: v.OrigSeverity, PerceivedSeverity: v.OrigSeverity, 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 89657b5a..1a67a266 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 @@ -187,10 +187,7 @@ func (s NeAlarmStateCheckLicenseProcessor) alarmClear(neInfo neModel.NeInfo, v n func (s NeAlarmStateCheckLicenseProcessor) alarmNew(neInfo neModel.NeInfo, v alarmParams) (neDataModel.Alarm, error) { // seq 告警序号 lastSeq := s.alarmService.FindAlarmSeqLast(neInfo.NeType, neInfo.RmUID) - lastTime := neInfo.UpdateTime // 网元最后更新时间 - if lastTime < neInfo.CreateTime { - lastTime = time.Now().UnixMilli() - } + alarm := neDataModel.Alarm{ NeType: neInfo.NeType, NeId: neInfo.RmUID, // neInfo.NeId, @@ -201,7 +198,7 @@ func (s NeAlarmStateCheckLicenseProcessor) alarmNew(neInfo neModel.NeInfo, v ala AlarmId: v.AlarmId, AlarmTitle: v.AlarmTitle, AlarmCode: fmt.Sprint(constants.ALARM_LICENSE_CHECK), - EventTime: time.UnixMilli(lastTime), + EventTime: time.Now(), AlarmType: v.AlarmType, OrigSeverity: v.OrigSeverity, PerceivedSeverity: v.OrigSeverity, 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 605b6349..8fabd9a4 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 @@ -209,10 +209,7 @@ func (s NeAlarmStateCheckUDMDBProcessor) alarmClear(neInfo neModel.NeInfo, v neD func (s NeAlarmStateCheckUDMDBProcessor) alarmNew(neInfo neModel.NeInfo, v alarmParams) (neDataModel.Alarm, error) { // seq 告警序号 lastSeq := s.alarmService.FindAlarmSeqLast(neInfo.NeType, neInfo.RmUID) - lastTime := neInfo.UpdateTime // 网元最后更新时间 - if lastTime < neInfo.CreateTime { - lastTime = time.Now().UnixMilli() - } + alarm := neDataModel.Alarm{ NeType: neInfo.NeType, NeId: neInfo.RmUID, // neInfo.NeId, @@ -223,7 +220,7 @@ func (s NeAlarmStateCheckUDMDBProcessor) alarmNew(neInfo neModel.NeInfo, v alarm AlarmId: v.AlarmId, AlarmTitle: v.AlarmTitle, AlarmCode: fmt.Sprint(constants.ALARM_LICENSE_CHECK), - EventTime: time.UnixMilli(lastTime), + EventTime: time.Now(), AlarmType: v.AlarmType, OrigSeverity: v.OrigSeverity, PerceivedSeverity: v.OrigSeverity,