OMC/be.ems
1
0
Fork 0
Code Issues Releases 3 Activity

fix: 调度任务更新状态导致数据值丢失

Browse Source
This commit is contained in:
TsMask
2024-01-09 16:37:27 +08:00
parent 09de2a41d0
commit f439d6b708
3 changed files with 4 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/monitor/controller/sys_job.go
View File

@@ -244,8 +244,8 @@ func (s *SysJobController) Status(c *gin.Context) {
// 更新状态 // 更新状态
job.Status = body.Status job.Status = body.Status
job.UpdateBy = ctx.LoginUserToUserName(c) job.UpdateBy = ctx.LoginUserToUserName(c)
ok := s.sysJobService.ChangeStatus(job) rows := s.sysJobService.UpdateJob(job)
if ok { if rows > 0 {
c.JSON(200, result.Ok(nil)) c.JSON(200, result.Ok(nil))
return return
} }

3
src/modules/monitor/service/sys_job.go
View File

@@ -27,9 +27,6 @@ type ISysJob interface {
// DeleteJobByIds 批量删除调度任务信息 // DeleteJobByIds 批量删除调度任务信息
DeleteJobByIds(jobIds []string) (int64, error) DeleteJobByIds(jobIds []string) (int64, error)
// ChangeStatus 任务调度状态修改
ChangeStatus(sysJob model.SysJob) bool
// RunQueueJob 立即运行一次调度任务 // RunQueueJob 立即运行一次调度任务
RunQueueJob(sysJob model.SysJob) bool RunQueueJob(sysJob model.SysJob) bool

27
src/modules/monitor/service/sys_job.impl.go
View File

@@ -86,7 +86,7 @@ func (r *SysJobImpl) DeleteJobByIds(jobIds []string) (int64, error) {
jobs := r.sysJobRepository.SelectJobByIds(jobIds) jobs := r.sysJobRepository.SelectJobByIds(jobIds)
if len(jobs) <= 0 { if len(jobs) <= 0 {
// 没有可访问调度任务数据！ // 没有可访问调度任务数据！
return 0, fmt.Errorf("There is no accessible scheduling task data!") return 0, fmt.Errorf("there is no accessible scheduling task data")
} }
if len(jobs) == len(jobIds) { if len(jobs) == len(jobIds) {
// 清除任务 // 清除任务
@@ -97,30 +97,7 @@ func (r *SysJobImpl) DeleteJobByIds(jobIds []string) (int64, error) {
return rows, nil return rows, nil
} }
// 删除调度任务信息失败！ // 删除调度任务信息失败！
return 0, fmt.Errorf("Failed to delete scheduling task information!") return 0, fmt.Errorf("failed to delete scheduling task information")
}
// ChangeStatus 任务调度状态修改
func (r *SysJobImpl) ChangeStatus(sysJob model.SysJob) bool {
// 更新状态
newSysJob := model.SysJob{
JobID: sysJob.JobID,
Status: sysJob.Status,
UpdateBy: sysJob.UpdateBy,
}
rows := r.sysJobRepository.UpdateJob(newSysJob)
if rows > 0 {
//状态正常添加队列任务
if sysJob.Status == common.STATUS_YES {
r.insertQueueJob(sysJob, true)
}
// 状态禁用删除队列任务
if sysJob.Status == common.STATUS_NO {
r.deleteQueueJob(sysJob)
}
return true
}
return false
} }
// ResetQueueJob 重置初始调度任务 // ResetQueueJob 重置初始调度任务