diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/xhpc/job/RuoYiJobApplication.java b/ruoyi-modules/ruoyi-job/src/main/java/com/xhpc/job/RuoYiJobApplication.java index 9621e00a..47ecf972 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/xhpc/job/RuoYiJobApplication.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/xhpc/job/RuoYiJobApplication.java @@ -1,10 +1,10 @@ package com.xhpc.job; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; import com.xhpc.common.security.annotation.EnableCustomConfig; import com.xhpc.common.security.annotation.EnableRyFeignClients; import com.xhpc.common.swagger.annotation.EnableCustomSwagger2; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; /** * 定时任务 diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/xhpc/job/controller/SysJobController.java b/ruoyi-modules/ruoyi-job/src/main/java/com/xhpc/job/controller/SysJobController.java index 96c04f22..7fd34adb 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/xhpc/job/controller/SysJobController.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/xhpc/job/controller/SysJobController.java @@ -1,20 +1,5 @@ package com.xhpc.job.controller; -import java.io.IOException; -import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import com.xhpc.job.util.CronUtils; -import org.quartz.SchedulerException; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.xhpc.common.core.exception.job.TaskException; import com.xhpc.common.core.utils.SecurityUtils; import com.xhpc.common.core.utils.poi.ExcelUtil; @@ -26,6 +11,14 @@ import com.xhpc.common.log.enums.BusinessType; import com.xhpc.common.security.annotation.PreAuthorize; import com.xhpc.job.domain.SysJob; import com.xhpc.job.service.ISysJobService; +import com.xhpc.job.util.CronUtils; +import org.quartz.SchedulerException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; /** * 调度任务信息操作处理 @@ -36,8 +29,9 @@ import com.xhpc.job.service.ISysJobService; @RequestMapping("/job") public class SysJobController extends BaseController { + @Autowired - private ISysJobService jobService; + private ISysJobService sysJobService; /** * 查询定时任务列表 @@ -47,7 +41,7 @@ public class SysJobController extends BaseController public TableDataInfo list(SysJob sysJob) { startPage(); - List list = jobService.selectJobList(sysJob); + List list = sysJobService.selectJobList(sysJob); return getDataTable(list); } @@ -59,7 +53,8 @@ public class SysJobController extends BaseController @PostMapping("/export") public void export(HttpServletResponse response, SysJob sysJob) throws IOException { - List list = jobService.selectJobList(sysJob); + + List list = sysJobService.selectJobList(sysJob); ExcelUtil util = new ExcelUtil(SysJob.class); util.exportExcel(response, list, "定时任务"); } @@ -71,7 +66,8 @@ public class SysJobController extends BaseController @GetMapping(value = "/{jobId}") public AjaxResult getInfo(@PathVariable("jobId") Long jobId) { - return AjaxResult.success(jobService.selectJobById(jobId)); + + return AjaxResult.success(sysJobService.selectJobById(jobId)); } /** @@ -87,7 +83,7 @@ public class SysJobController extends BaseController return AjaxResult.error("cron表达式不正确"); } sysJob.setCreateBy(SecurityUtils.getUsername()); - return toAjax(jobService.insertJob(sysJob)); + return toAjax(sysJobService.insertJob(sysJob)); } /** @@ -103,7 +99,7 @@ public class SysJobController extends BaseController return AjaxResult.error("cron表达式不正确"); } sysJob.setUpdateBy(SecurityUtils.getUsername()); - return toAjax(jobService.updateJob(sysJob)); + return toAjax(sysJobService.updateJob(sysJob)); } /** @@ -114,9 +110,10 @@ public class SysJobController extends BaseController @PutMapping("/changeStatus") public AjaxResult changeStatus(@RequestBody SysJob job) throws SchedulerException { - SysJob newJob = jobService.selectJobById(job.getJobId()); + + SysJob newJob = sysJobService.selectJobById(job.getJobId()); newJob.setStatus(job.getStatus()); - return toAjax(jobService.changeStatus(newJob)); + return toAjax(sysJobService.changeStatus(newJob)); } /** @@ -127,7 +124,8 @@ public class SysJobController extends BaseController @PutMapping("/run") public AjaxResult run(@RequestBody SysJob job) throws SchedulerException { - jobService.run(job); + + sysJobService.run(job); return AjaxResult.success(); } @@ -139,7 +137,8 @@ public class SysJobController extends BaseController @DeleteMapping("/{jobIds}") public AjaxResult remove(@PathVariable Long[] jobIds) throws SchedulerException, TaskException { - jobService.deleteJobByIds(jobIds); + + sysJobService.deleteJobByIds(jobIds); return AjaxResult.success(); } } diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/xhpc/job/mapper/SysJobLogMapper.java b/ruoyi-modules/ruoyi-job/src/main/java/com/xhpc/job/mapper/SysJobLogMapper.java index cb711784..ceb1cd03 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/xhpc/job/mapper/SysJobLogMapper.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/xhpc/job/mapper/SysJobLogMapper.java @@ -1,14 +1,16 @@ package com.xhpc.job.mapper; -import java.util.List; - import com.xhpc.job.domain.SysJobLog; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; /** * 调度任务日志信息 数据层 * * @author ruoyi */ +@Mapper public interface SysJobLogMapper { /** diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/xhpc/job/mapper/SysJobMapper.java b/ruoyi-modules/ruoyi-job/src/main/java/com/xhpc/job/mapper/SysJobMapper.java index dc8ff1d3..2268db25 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/xhpc/job/mapper/SysJobMapper.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/xhpc/job/mapper/SysJobMapper.java @@ -1,14 +1,16 @@ package com.xhpc.job.mapper; -import java.util.List; - import com.xhpc.job.domain.SysJob; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; /** * 调度任务信息 数据层 * * @author ruoyi */ +@Mapper public interface SysJobMapper { /** diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/xhpc/job/service/ISysJobService.java b/ruoyi-modules/ruoyi-job/src/main/java/com/xhpc/job/service/ISysJobService.java index 40d1a467..99bf8140 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/xhpc/job/service/ISysJobService.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/xhpc/job/service/ISysJobService.java @@ -1,10 +1,10 @@ package com.xhpc.job.service; -import java.util.List; - +import com.xhpc.common.core.exception.job.TaskException; import com.xhpc.job.domain.SysJob; import org.quartz.SchedulerException; -import com.xhpc.common.core.exception.job.TaskException; + +import java.util.List; /** * 定时任务调度信息信息 服务层 diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/mapper/job/SysJobMapper.xml b/ruoyi-modules/ruoyi-job/src/main/resources/mapper/job/SysJobMapper.xml new file mode 100644 index 00000000..6cbc1f19 --- /dev/null +++ b/ruoyi-modules/ruoyi-job/src/main/resources/mapper/job/SysJobMapper.xml @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + select job_id, + job_name, + job_group, + invoke_target, + cron_expression, + misfire_policy, + concurrent, + status, + create_by, + create_time, + remark + from sys_job + + + + + + + + + + delete + from sys_job + where job_id = #{jobId} + + + + delete from sys_job where job_id in + + #{jobId} + + + + + update sys_job + + job_name = #{jobName}, + job_group = #{jobGroup}, + invoke_target = #{invokeTarget}, + cron_expression = #{cronExpression}, + misfire_policy = #{misfirePolicy}, + concurrent = #{concurrent}, + status = #{status}, + remark = #{remark}, + update_by = #{updateBy}, + update_time = sysdate() + + where job_id = #{jobId} + + + + insert into sys_job( + job_id, + job_name, + job_group, + invoke_target, + cron_expression, + misfire_policy, + concurrent, + status, + remark, + create_by, + create_time + )values( + #{jobId}, + #{jobName}, + #{jobGroup}, + #{invokeTarget}, + #{cronExpression}, + #{misfirePolicy}, + #{concurrent}, + #{status}, + #{remark}, + #{createBy}, + sysdate() + ) + + +