From 654c2519292d80418d0f51d3245405183d438949 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Tue, 14 Oct 2025 11:07:08 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=AE=BE=E7=BD=AE=E5=88=86=E5=B8=83?= =?UTF-8?q?=E5=BC=8F=E9=94=81=E8=B6=85=E6=97=B61=E5=88=86=E9=92=9F?= =?UTF-8?q?=E8=A7=A3=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crontask/processor/backup_export_cdr/backup_export_cdr.go | 2 +- .../crontask/processor/backup_export_kpi/backup_export_kpi.go | 2 +- .../crontask/processor/backup_export_log/backup_export_log.go | 2 +- .../processor/backup_export_table/backup_export_table.go | 2 +- .../crontask/processor/backup_export_udm/backup_export_udm.go | 2 +- .../processor/backup_remove_file/backup_remove_file.go | 2 +- .../processor/delete_alarm_record/delete_alarm_record.go | 2 +- .../crontask/processor/delete_cdr_record/delete_cdr_record.go | 2 +- .../processor/delete_data_record/delete_data_record.go | 2 +- .../crontask/processor/delete_kpi_record/delete_kpi_record.go | 2 +- .../delete_ne_config_backup/delete_ne_config_backup.go | 2 +- .../processor/delete_uenb_record/delete_uenb_record.go | 2 +- .../processor/monitor_sys_resource/monitor_sys_resource.go | 3 ++- .../processor/ne_alarm_state_check/ne_alarm_state_check.go | 2 +- .../ne_alarm_state_check_cmd/ne_alarm_state_check_cmd.go | 2 +- .../ne_alarm_state_check_license.go | 2 +- .../crontask/processor/ne_config_backup/ne_config_backup.go | 3 ++- src/modules/crontask/processor/ne_data_udm/ne_data_udm.go | 3 ++- 18 files changed, 21 insertions(+), 18 deletions(-) diff --git a/src/modules/crontask/processor/backup_export_cdr/backup_export_cdr.go b/src/modules/crontask/processor/backup_export_cdr/backup_export_cdr.go index 7e2c0652..ce197a51 100644 --- a/src/modules/crontask/processor/backup_export_cdr/backup_export_cdr.go +++ b/src/modules/crontask/processor/backup_export_cdr/backup_export_cdr.go @@ -51,7 +51,7 @@ func (s *BackupExportCDRProcessor) Execute(data any) (any, error) { // 分布式锁,防止多个任务同时执行 lockKey := fmt.Sprintf("processor:backup_export_cdr:%d", sysJob.JobId) - if ok := redis.SetNX("", lockKey, 0); !ok { + if ok := redis.SetNX("", lockKey, time.Minute); !ok { return nil, cron.ErrTaskRunning } defer redis.Del("", lockKey) diff --git a/src/modules/crontask/processor/backup_export_kpi/backup_export_kpi.go b/src/modules/crontask/processor/backup_export_kpi/backup_export_kpi.go index 15d0f910..dbe9095f 100644 --- a/src/modules/crontask/processor/backup_export_kpi/backup_export_kpi.go +++ b/src/modules/crontask/processor/backup_export_kpi/backup_export_kpi.go @@ -51,7 +51,7 @@ func (s *BackupExportKPIProcessor) Execute(data any) (any, error) { // 分布式锁,防止多个任务同时执行 lockKey := fmt.Sprintf("processor:backup_export_kpi:%d", sysJob.JobId) - if ok := redis.SetNX("", lockKey, 0); !ok { + if ok := redis.SetNX("", lockKey, time.Minute); !ok { return nil, cron.ErrTaskRunning } defer redis.Del("", lockKey) diff --git a/src/modules/crontask/processor/backup_export_log/backup_export_log.go b/src/modules/crontask/processor/backup_export_log/backup_export_log.go index ccb6d00b..99009702 100644 --- a/src/modules/crontask/processor/backup_export_log/backup_export_log.go +++ b/src/modules/crontask/processor/backup_export_log/backup_export_log.go @@ -46,7 +46,7 @@ func (s *BackupExportLogProcessor) Execute(data any) (any, error) { // 分布式锁,防止多个任务同时执行 lockKey := fmt.Sprintf("processor:backup_export_log:%d", sysJob.JobId) - if ok := redis.SetNX("", lockKey, 0); !ok { + if ok := redis.SetNX("", lockKey, time.Minute); !ok { return nil, cron.ErrTaskRunning } defer redis.Del("", lockKey) diff --git a/src/modules/crontask/processor/backup_export_table/backup_export_table.go b/src/modules/crontask/processor/backup_export_table/backup_export_table.go index 2d817186..6112a9bc 100644 --- a/src/modules/crontask/processor/backup_export_table/backup_export_table.go +++ b/src/modules/crontask/processor/backup_export_table/backup_export_table.go @@ -57,7 +57,7 @@ func (s *BackupExportTableProcessor) Execute(data any) (any, error) { // 分布式锁,防止多个任务同时执行 lockKey := fmt.Sprintf("processor:backup_export_table:%d:%s", sysJob.JobId, params.TableName) - if ok := redis.SetNX("", lockKey, 0); !ok { + if ok := redis.SetNX("", lockKey, time.Minute); !ok { return nil, cron.ErrTaskRunning } defer redis.Del("", lockKey) diff --git a/src/modules/crontask/processor/backup_export_udm/backup_export_udm.go b/src/modules/crontask/processor/backup_export_udm/backup_export_udm.go index a547c255..c417ee90 100644 --- a/src/modules/crontask/processor/backup_export_udm/backup_export_udm.go +++ b/src/modules/crontask/processor/backup_export_udm/backup_export_udm.go @@ -50,7 +50,7 @@ func (s *BackupExportUDMProcessor) Execute(data any) (any, error) { // 分布式锁,防止多个任务同时执行 lockKey := fmt.Sprintf("processor:backup_export_udm:%d", sysJob.JobId) - if ok := redis.SetNX("", lockKey, 0); !ok { + if ok := redis.SetNX("", lockKey, time.Minute); !ok { return nil, cron.ErrTaskRunning } defer redis.Del("", lockKey) diff --git a/src/modules/crontask/processor/backup_remove_file/backup_remove_file.go b/src/modules/crontask/processor/backup_remove_file/backup_remove_file.go index 5e8866e6..11bc4ad7 100644 --- a/src/modules/crontask/processor/backup_remove_file/backup_remove_file.go +++ b/src/modules/crontask/processor/backup_remove_file/backup_remove_file.go @@ -41,7 +41,7 @@ func (s *BackupRemoveFileProcessor) Execute(data any) (any, error) { // 分布式锁,防止多个任务同时执行 lockKey := fmt.Sprintf("processor:backup_remove_file:%d", sysJob.JobId) - if ok := redis.SetNX("", lockKey, 0); !ok { + if ok := redis.SetNX("", lockKey, time.Minute); !ok { return nil, cron.ErrTaskRunning } defer redis.Del("", lockKey) diff --git a/src/modules/crontask/processor/delete_alarm_record/delete_alarm_record.go b/src/modules/crontask/processor/delete_alarm_record/delete_alarm_record.go index 9435f6f4..d044ae82 100644 --- a/src/modules/crontask/processor/delete_alarm_record/delete_alarm_record.go +++ b/src/modules/crontask/processor/delete_alarm_record/delete_alarm_record.go @@ -32,7 +32,7 @@ func (s *DeleteAlarmRecordProcessor) Execute(data any) (any, error) { // 分布式锁,防止多个任务同时执行 lockKey := fmt.Sprintf("processor:delete_alarm_record:%d", sysJob.JobId) - if ok := redis.SetNX("", lockKey, 0); !ok { + if ok := redis.SetNX("", lockKey, time.Minute); !ok { return nil, cron.ErrTaskRunning } defer redis.Del("", lockKey) diff --git a/src/modules/crontask/processor/delete_cdr_record/delete_cdr_record.go b/src/modules/crontask/processor/delete_cdr_record/delete_cdr_record.go index b5483f73..08b29805 100644 --- a/src/modules/crontask/processor/delete_cdr_record/delete_cdr_record.go +++ b/src/modules/crontask/processor/delete_cdr_record/delete_cdr_record.go @@ -33,7 +33,7 @@ func (s *DeleteCDRRecordProcessor) Execute(data any) (any, error) { // 分布式锁,防止多个任务同时执行 lockKey := fmt.Sprintf("processor:delete_cdr_record:%d", sysJob.JobId) - if ok := redis.SetNX("", lockKey, 0); !ok { + if ok := redis.SetNX("", lockKey, time.Minute); !ok { return nil, cron.ErrTaskRunning } defer redis.Del("", lockKey) diff --git a/src/modules/crontask/processor/delete_data_record/delete_data_record.go b/src/modules/crontask/processor/delete_data_record/delete_data_record.go index b4a44288..bbecdf83 100644 --- a/src/modules/crontask/processor/delete_data_record/delete_data_record.go +++ b/src/modules/crontask/processor/delete_data_record/delete_data_record.go @@ -55,7 +55,7 @@ func (s *DeleteDataRecordProcessor) Execute(data any) (any, error) { // 分布式锁,防止多个任务同时执行 lockKey := fmt.Sprintf("processor:delete_data_record:%d:%s", sysJob.JobId, params.TableName) - if ok := redis.SetNX("", lockKey, 0); !ok { + if ok := redis.SetNX("", lockKey, time.Minute); !ok { return nil, cron.ErrTaskRunning } defer redis.Del("", lockKey) diff --git a/src/modules/crontask/processor/delete_kpi_record/delete_kpi_record.go b/src/modules/crontask/processor/delete_kpi_record/delete_kpi_record.go index 68597053..0973f8aa 100644 --- a/src/modules/crontask/processor/delete_kpi_record/delete_kpi_record.go +++ b/src/modules/crontask/processor/delete_kpi_record/delete_kpi_record.go @@ -33,7 +33,7 @@ func (s *DeleteKPIRecordProcessor) Execute(data any) (any, error) { // 分布式锁,防止多个任务同时执行 lockKey := fmt.Sprintf("processor:delete_kpi_record:%d", sysJob.JobId) - if ok := redis.SetNX("", lockKey, 0); !ok { + if ok := redis.SetNX("", lockKey, time.Minute); !ok { return nil, cron.ErrTaskRunning } defer redis.Del("", lockKey) diff --git a/src/modules/crontask/processor/delete_ne_config_backup/delete_ne_config_backup.go b/src/modules/crontask/processor/delete_ne_config_backup/delete_ne_config_backup.go index 583f3920..c06b45c5 100644 --- a/src/modules/crontask/processor/delete_ne_config_backup/delete_ne_config_backup.go +++ b/src/modules/crontask/processor/delete_ne_config_backup/delete_ne_config_backup.go @@ -40,7 +40,7 @@ func (s *DeleteNeConfigBackupProcessor) Execute(data any) (any, error) { // 分布式锁,防止多个任务同时执行 lockKey := fmt.Sprintf("processor:delete_ne_config_backup:%d", sysJob.JobId) - if ok := redis.SetNX("", lockKey, 0); !ok { + if ok := redis.SetNX("", lockKey, time.Minute); !ok { return nil, cron.ErrTaskRunning } defer redis.Del("", lockKey) diff --git a/src/modules/crontask/processor/delete_uenb_record/delete_uenb_record.go b/src/modules/crontask/processor/delete_uenb_record/delete_uenb_record.go index 289241ec..b62be732 100644 --- a/src/modules/crontask/processor/delete_uenb_record/delete_uenb_record.go +++ b/src/modules/crontask/processor/delete_uenb_record/delete_uenb_record.go @@ -33,7 +33,7 @@ func (s *DeleteUENBRecordProcessor) Execute(data any) (any, error) { // 分布式锁,防止多个任务同时执行 lockKey := fmt.Sprintf("processor:delete_uenb_record:%d", sysJob.JobId) - if ok := redis.SetNX("", lockKey, 0); !ok { + if ok := redis.SetNX("", lockKey, time.Minute); !ok { return nil, cron.ErrTaskRunning } defer redis.Del("", lockKey) diff --git a/src/modules/crontask/processor/monitor_sys_resource/monitor_sys_resource.go b/src/modules/crontask/processor/monitor_sys_resource/monitor_sys_resource.go index cc037dbf..349ae6e2 100644 --- a/src/modules/crontask/processor/monitor_sys_resource/monitor_sys_resource.go +++ b/src/modules/crontask/processor/monitor_sys_resource/monitor_sys_resource.go @@ -3,6 +3,7 @@ package monitor_sys_resource import ( "encoding/json" "fmt" + "time" "be.ems/src/framework/cron" "be.ems/src/framework/database/redis" @@ -34,7 +35,7 @@ func (s *MonitorSysResourceProcessor) Execute(data any) (any, error) { // 分布式锁,防止多个任务同时执行 lockKey := fmt.Sprintf("processor:monitor_sys_resource:%d", sysJob.JobId) - if ok := redis.SetNX("", lockKey, 0); !ok { + if ok := redis.SetNX("", lockKey, time.Minute); !ok { return nil, cron.ErrTaskRunning } defer redis.Del("", lockKey) 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 dca6fb1d..682c75fa 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 @@ -53,7 +53,7 @@ func (s *NeAlarmStateCheckProcessor) Execute(data any) (any, error) { // 分布式锁,防止多个任务同时执行 lockKey := fmt.Sprintf("processor:ne_alarm_state_check:%d", sysJob.JobId) - if ok := redis.SetNX("", lockKey, 0); !ok { + if ok := redis.SetNX("", lockKey, time.Minute); !ok { return nil, cron.ErrTaskRunning } defer redis.Del("", lockKey) 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 53402749..881c1cf8 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 @@ -74,7 +74,7 @@ func (s *NeAlarmStateCheckCMDProcessor) Execute(data any) (any, error) { // 分布式锁,防止多个任务同时执行 lockKey := fmt.Sprintf("processor:ne_alarm_state_check_cmd:%d", sysJob.JobId) - if ok := redis.SetNX("", lockKey, 0); !ok { + if ok := redis.SetNX("", lockKey, time.Minute); !ok { return nil, cron.ErrTaskRunning } defer redis.Del("", lockKey) 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 007d520b..29fed408 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 @@ -55,7 +55,7 @@ func (s *NeAlarmStateCheckLicenseProcessor) Execute(data any) (any, error) { // 分布式锁,防止多个任务同时执行 lockKey := fmt.Sprintf("processor:ne_alarm_state_check_license:%d", sysJob.JobId) - if ok := redis.SetNX("", lockKey, 0); !ok { + if ok := redis.SetNX("", lockKey, time.Minute); !ok { return nil, cron.ErrTaskRunning } defer redis.Del("", lockKey) diff --git a/src/modules/crontask/processor/ne_config_backup/ne_config_backup.go b/src/modules/crontask/processor/ne_config_backup/ne_config_backup.go index aa7b188d..08e14fdc 100644 --- a/src/modules/crontask/processor/ne_config_backup/ne_config_backup.go +++ b/src/modules/crontask/processor/ne_config_backup/ne_config_backup.go @@ -3,6 +3,7 @@ package ne_config_backup import ( "fmt" "path/filepath" + "time" "be.ems/src/framework/cron" "be.ems/src/framework/database/redis" @@ -39,7 +40,7 @@ func (s *NeConfigBackupProcessor) Execute(data any) (any, error) { // 分布式锁,防止多个任务同时执行 lockKey := fmt.Sprintf("processor:ne_config_backup:%d", sysJob.JobId) - if ok := redis.SetNX("", lockKey, 0); !ok { + if ok := redis.SetNX("", lockKey, time.Minute); !ok { return nil, cron.ErrTaskRunning } defer redis.Del("", lockKey) diff --git a/src/modules/crontask/processor/ne_data_udm/ne_data_udm.go b/src/modules/crontask/processor/ne_data_udm/ne_data_udm.go index 699a3b19..8bf5b8a1 100644 --- a/src/modules/crontask/processor/ne_data_udm/ne_data_udm.go +++ b/src/modules/crontask/processor/ne_data_udm/ne_data_udm.go @@ -2,6 +2,7 @@ package ne_data_udm import ( "fmt" + "time" "be.ems/src/framework/cron" "be.ems/src/framework/database/redis" @@ -38,7 +39,7 @@ func (s *NeDataUDM) Execute(data any) (any, error) { // 分布式锁,防止多个任务同时执行 lockKey := fmt.Sprintf("processor:ne_data_udm:%d", sysJob.JobId) - if ok := redis.SetNX("", lockKey, 0); !ok { + if ok := redis.SetNX("", lockKey, time.Minute); !ok { return nil, cron.ErrTaskRunning } defer redis.Del("", lockKey)