|
@@ -210,14 +210,14 @@ public class SysJobController {
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* 启动定时任务
|
|
* 启动定时任务
|
|
|
- * @param jobId 定时人ID
|
|
|
|
|
|
|
+ * @param job 定时任务
|
|
|
*/
|
|
*/
|
|
|
@SysLog("启动定时任务")
|
|
@SysLog("启动定时任务")
|
|
|
- @GetMapping("/startJob")
|
|
|
|
|
|
|
+ @PostMapping("/startJob")
|
|
|
@PreAuthorize("@pms.hasPermission('job_sys_job_start_job')")
|
|
@PreAuthorize("@pms.hasPermission('job_sys_job_start_job')")
|
|
|
@Operation(description = "启动定时任务")
|
|
@Operation(description = "启动定时任务")
|
|
|
- public R startJob(@RequestParam("jobId") Long jobId) throws SchedulerException {
|
|
|
|
|
- SysJob querySysJob = this.sysJobService.getById(jobId);
|
|
|
|
|
|
|
+ public R startJob(@RequestBody SysJob job) throws SchedulerException {
|
|
|
|
|
+ SysJob querySysJob = this.sysJobService.getById(job.getJobId());
|
|
|
if (querySysJob == null) {
|
|
if (querySysJob == null) {
|
|
|
return R.failed("无此定时任务,请确认");
|
|
return R.failed("无此定时任务,请确认");
|
|
|
}
|
|
}
|
|
@@ -225,7 +225,7 @@ public class SysJobController {
|
|
|
// 如果定时任务不存在,强制状态为1已发布
|
|
// 如果定时任务不存在,强制状态为1已发布
|
|
|
if (!scheduler.checkExists(TaskUtil.getJobKey(querySysJob))) {
|
|
if (!scheduler.checkExists(TaskUtil.getJobKey(querySysJob))) {
|
|
|
querySysJob.setJobStatus(SkyQuartzEnum.JOB_STATUS_RELEASE.getType());
|
|
querySysJob.setJobStatus(SkyQuartzEnum.JOB_STATUS_RELEASE.getType());
|
|
|
- log.warn("定时任务不在quartz中,任务id:{},强制状态为已发布并加入调度器", jobId);
|
|
|
|
|
|
|
+ log.warn("定时任务不在quartz中,任务id:{},强制状态为已发布并加入调度器", job.getJobId());
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
if (SkyQuartzEnum.JOB_STATUS_RELEASE.getType().equals(querySysJob.getJobStatus())) {
|
|
if (SkyQuartzEnum.JOB_STATUS_RELEASE.getType().equals(querySysJob.getJobStatus())) {
|
|
@@ -236,25 +236,25 @@ public class SysJobController {
|
|
|
}
|
|
}
|
|
|
// 更新定时任务状态为运行状态2
|
|
// 更新定时任务状态为运行状态2
|
|
|
this.sysJobService
|
|
this.sysJobService
|
|
|
- .updateById(SysJob.builder().jobId(jobId).jobStatus(SkyQuartzEnum.JOB_STATUS_RUNNING.getType()).build());
|
|
|
|
|
|
|
+ .updateById(SysJob.builder().jobId(job.getJobId()).jobStatus(SkyQuartzEnum.JOB_STATUS_RUNNING.getType()).build());
|
|
|
return R.ok();
|
|
return R.ok();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
- * 启动定时任务
|
|
|
|
|
- * @param jobId 任务ID
|
|
|
|
|
|
|
+ * 立刻执行定时任务
|
|
|
|
|
+ * @param job 任务
|
|
|
*/
|
|
*/
|
|
|
@SysLog("立刻执行定时任务")
|
|
@SysLog("立刻执行定时任务")
|
|
|
- @GetMapping("/runJob")
|
|
|
|
|
|
|
+ @PostMapping("/runJob")
|
|
|
@PreAuthorize("@pms.hasPermission('job_sys_job_run_job')")
|
|
@PreAuthorize("@pms.hasPermission('job_sys_job_run_job')")
|
|
|
@Operation(description = "立刻执行定时任务")
|
|
@Operation(description = "立刻执行定时任务")
|
|
|
- public R runJob(@RequestParam("jobId") Long jobId) throws SchedulerException {
|
|
|
|
|
- SysJob querySysJob = this.sysJobService.getById(jobId);
|
|
|
|
|
|
|
+ public R runJob(@RequestBody SysJob job) throws SchedulerException {
|
|
|
|
|
+ SysJob querySysJob = this.sysJobService.getById(job.getJobId());
|
|
|
|
|
|
|
|
// 执行定时任务前判定任务是否在quartz中
|
|
// 执行定时任务前判定任务是否在quartz中
|
|
|
if (!scheduler.checkExists(TaskUtil.getJobKey(querySysJob))) {
|
|
if (!scheduler.checkExists(TaskUtil.getJobKey(querySysJob))) {
|
|
|
querySysJob.setJobStatus(SkyQuartzEnum.JOB_STATUS_NOT_RUNNING.getType());
|
|
querySysJob.setJobStatus(SkyQuartzEnum.JOB_STATUS_NOT_RUNNING.getType());
|
|
|
- log.warn("立刻执行定时任务-定时任务不在quartz中,任务id:{},强制状态为暂停并加入调度器", jobId);
|
|
|
|
|
|
|
+ log.warn("立刻执行定时任务-定时任务不在quartz中,任务id:{},强制状态为暂停并加入调度器", job.getJobId());
|
|
|
taskUtil.addOrUpateJob(querySysJob, scheduler);
|
|
taskUtil.addOrUpateJob(querySysJob, scheduler);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -265,11 +265,11 @@ public class SysJobController {
|
|
|
* 暂停定时任务
|
|
* 暂停定时任务
|
|
|
*/
|
|
*/
|
|
|
@SysLog("暂停定时任务")
|
|
@SysLog("暂停定时任务")
|
|
|
- @GetMapping("/shutdownJob")
|
|
|
|
|
|
|
+ @PostMapping("/shutdownJob")
|
|
|
@PreAuthorize("@pms.hasPermission('job_sys_job_shutdown_job')")
|
|
@PreAuthorize("@pms.hasPermission('job_sys_job_shutdown_job')")
|
|
|
@Operation(description = "暂停定时任务")
|
|
@Operation(description = "暂停定时任务")
|
|
|
- public R shutdownJob(@RequestParam("jobId") Long jobId) {
|
|
|
|
|
- SysJob querySysJob = this.sysJobService.getById(jobId);
|
|
|
|
|
|
|
+ public R shutdownJob(@RequestBody SysJob job) {
|
|
|
|
|
+ SysJob querySysJob = this.sysJobService.getById(job.getJobId());
|
|
|
// 更新定时任务状态条件,运行状态2更新为暂停状态3
|
|
// 更新定时任务状态条件,运行状态2更新为暂停状态3
|
|
|
this.sysJobService.updateById(SysJob.builder()
|
|
this.sysJobService.updateById(SysJob.builder()
|
|
|
.jobId(querySysJob.getJobId())
|
|
.jobId(querySysJob.getJobId())
|