fix: 修复定时任务关闭不生效问题

This commit is contained in:
TsMask
2025-06-27 11:38:28 +08:00
parent 976d4382dd
commit 0a2d83fd7d
4 changed files with 90 additions and 95 deletions

View File

@@ -5,6 +5,7 @@ import (
"be.ems/src/framework/constants/common"
"be.ems/src/framework/cron"
"be.ems/src/framework/utils/parse"
"be.ems/src/modules/monitor/model"
"be.ems/src/modules/monitor/repository"
)
@@ -143,7 +144,7 @@ func (r *SysJob) insertQueueJob(sysJob model.SysJob, repeat bool) bool {
if !repeat {
// 执行单次任务
status := queue.RunJob(options, cron.JobOptions{
JobId: sysJob.JobID,
JobId: parse.Number(sysJob.JobID),
})
// 执行中或等待中的都返回正常
return status == cron.Active || status == cron.Waiting
@@ -151,7 +152,7 @@ func (r *SysJob) insertQueueJob(sysJob model.SysJob, repeat bool) bool {
// 执行重复任务
queue.RunJob(options, cron.JobOptions{
JobId: sysJob.JobID,
JobId: parse.Number(sysJob.JobID),
Cron: sysJob.CronExpression,
})
@@ -165,5 +166,5 @@ func (r *SysJob) deleteQueueJob(sysJob model.SysJob) bool {
if queue.Name != sysJob.InvokeTarget {
return false
}
return queue.RemoveJob(sysJob.JobID)
return queue.RemoveJob(parse.Number(sysJob.JobID))
}