From 899e769cb265e2bb05549e8930a97d337fd6790b Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Mon, 13 Oct 2025 18:56:29 +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 +- .../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 | 3 ++- .../crontask/processor/delete_cdr_record/delete_cdr_record.go | 3 ++- .../crontask/processor/delete_kpi_record/delete_kpi_record.go | 3 ++- .../delete_ne_config_backup/delete_ne_config_backup.go | 2 +- .../processor/delete_uenb_record/delete_uenb_record.go | 3 ++- .../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 +- .../ne_alarm_state_check_udmdb_sync.go | 2 +- .../crontask/processor/ne_config_backup/ne_config_backup.go | 3 ++- src/modules/crontask/processor/ne_data_udm/ne_data_udm.go | 3 ++- 17 files changed, 24 insertions(+), 17 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 f6ca98d0..2f6fcd0e 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 @@ -58,7 +58,7 @@ func (s *BackupExportCDRProcessor) Execute(data any) (any, error) { // 分布式锁,防止多个任务同时执行 lockKey := fmt.Sprintf("processor:backup_export_cdr:%s", 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 5c8474b4..ff09c3e9 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:%s", 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 4580ac3b..e3dd70a8 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 @@ -47,7 +47,7 @@ func (s *BackupExportLogProcessor) Execute(data any) (any, error) { // 分布式锁,防止多个任务同时执行 lockKey := fmt.Sprintf("processor:backup_export_log:%s", 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_udm/backup_export_udm.go b/src/modules/crontask/processor/backup_export_udm/backup_export_udm.go index 16466353..834698d3 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:%s", 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 93faff94..8d4aaea3 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:%s", 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 027e670b..b74d9fe2 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 @@ -3,6 +3,7 @@ package delete_alarm_record import ( "encoding/json" "fmt" + "time" "be.ems/src/framework/cron" "be.ems/src/framework/database/db" @@ -31,7 +32,7 @@ func (s *DeleteAlarmRecordProcessor) Execute(data any) (any, error) { // 分布式锁,防止多个任务同时执行 lockKey := fmt.Sprintf("processor:delete_alarm_record:%s", 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 b9bd0b27..16c015bb 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 @@ -4,6 +4,7 @@ import ( "encoding/json" "fmt" "strings" + "time" "be.ems/src/framework/cron" "be.ems/src/framework/database/db" @@ -32,7 +33,7 @@ func (s *DeleteCDRRecordProcessor) Execute(data any) (any, error) { // 分布式锁,防止多个任务同时执行 lockKey := fmt.Sprintf("processor:delete_cdr_record:%s", 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_kpi_record/delete_kpi_record.go b/src/modules/crontask/processor/delete_kpi_record/delete_kpi_record.go index 4cb07fe1..ae76ddf6 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 @@ -4,6 +4,7 @@ import ( "encoding/json" "fmt" "strings" + "time" "be.ems/src/framework/cron" "be.ems/src/framework/database/db" @@ -32,7 +33,7 @@ func (s *DeleteKPIRecordProcessor) Execute(data any) (any, error) { // 分布式锁,防止多个任务同时执行 lockKey := fmt.Sprintf("processor:delete_kpi_record:%s", 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 a6aeb4fb..f7948890 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:%s", 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 d0ad556c..dd103eac 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 @@ -4,6 +4,7 @@ import ( "encoding/json" "fmt" "strings" + "time" "be.ems/src/framework/cron" "be.ems/src/framework/database/db" @@ -32,7 +33,7 @@ func (s *DeleteUENBRecordProcessor) Execute(data any) (any, error) { // 分布式锁,防止多个任务同时执行 lockKey := fmt.Sprintf("processor:delete_uenb_record:%s", 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 6ad158af..5b768724 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:%s", 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 ff445544..b5e8ddff 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 @@ -60,7 +60,7 @@ func (s *NeAlarmStateCheckProcessor) Execute(data any) (any, error) { // 分布式锁,防止多个任务同时执行 lockKey := fmt.Sprintf("processor:ne_alarm_state_check:%s", 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 16d72983..fdefdb14 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 @@ -75,7 +75,7 @@ func (s *NeAlarmStateCheckCMDProcessor) Execute(data any) (any, error) { // 分布式锁,防止多个任务同时执行 lockKey := fmt.Sprintf("processor:ne_alarm_state_check_cmd:%s", 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 c417de1c..d1fed275 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 @@ -62,7 +62,7 @@ func (s *NeAlarmStateCheckLicenseProcessor) Execute(data any) (any, error) { // 分布式锁,防止多个任务同时执行 lockKey := fmt.Sprintf("processor:ne_alarm_state_check_license:%s", 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_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 a2bae84c..6d8d929c 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 @@ -61,7 +61,7 @@ func (s *NeAlarmStateCheckUDMDBProcessor) Execute(data any) (any, error) { // 分布式锁,防止多个任务同时执行 lockKey := fmt.Sprintf("processor:ne_alarm_state_check_udmdb_sync:%s", 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 e47e743b..bfd9ab4c 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:%s", 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 4d7fef75..bd08c6ef 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:%s", 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)