diff --git a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/context/ExecutionJobBean.java b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/context/ExecutionJobBean.java index 390868f9..aed4956b 100644 --- a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/context/ExecutionJobBean.java +++ b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/context/ExecutionJobBean.java @@ -67,7 +67,7 @@ public class ExecutionJobBean extends QuartzJobBean { if (StringUtil.isNotBlank(quartzJob.getSubTask())) { String[] tasks = quartzJob.getSubTask().split("[,,]"); // 执行子任务 - quartzJobService.executionSubJob(tasks); + quartzJobService.startSubQuartJob(tasks); } } catch (Exception e) { if (StringUtil.isNotBlank(uuid)) { @@ -83,7 +83,7 @@ public class ExecutionJobBean extends QuartzJobBean { if (quartzJob.getPauseAfterFailure() != null && quartzJob.getPauseAfterFailure()) { quartzJob.setIsPause(false); // 更新状态 - quartzJobService.switchJobPauseStatus(quartzJob); + quartzJobService.switchQuartzJobStatus(quartzJob); } if (quartzJob.getEmail() != null) { EmailService emailService = SpringBeanHolder.getBean(EmailService.class); diff --git a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/rest/QuartzJobController.java b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/rest/QuartzJobController.java index 514f6623..f8034c3e 100644 --- a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/rest/QuartzJobController.java +++ b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/rest/QuartzJobController.java @@ -44,21 +44,21 @@ public class QuartzJobController { @PreAuthorize("@el.check('timing:list')") public ResponseEntity> queryQuartzJob(QueryQuartzJobRequest criteria) { Page page = new Page<>(criteria.getPage(), criteria.getSize()); - return new ResponseEntity<>(quartzJobService.queryJobPage(criteria, page), HttpStatus.OK); + return new ResponseEntity<>(quartzJobService.describeQuartzJobPage(criteria, page), HttpStatus.OK); } @ApiOperation("导出任务数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('timing:list')") public void exportQuartzJob(HttpServletResponse response, QueryQuartzJobRequest criteria) throws IOException { - quartzJobService.downloadJobExcel(quartzJobService.selectJobByCriteria(criteria), response); + quartzJobService.downloadQuartzJobExcel(quartzJobService.describeQuartzJobList(criteria), response); } @ApiOperation("导出日志数据") @GetMapping(value = "/logs/download") @PreAuthorize("@el.check('timing:list')") public void exportQuartzJobLog(HttpServletResponse response, QueryQuartzJobRequest criteria) throws IOException { - quartzJobService.downloadLogExcel(quartzJobService.selectLogByCriteria(criteria), response); + quartzJobService.downloadQuartzLogExcel(quartzJobService.describeQuartzLogList(criteria), response); } @ApiOperation("查询任务执行日志") @@ -66,7 +66,7 @@ public class QuartzJobController { @PreAuthorize("@el.check('timing:list')") public ResponseEntity> queryQuartzJobLog(QueryQuartzJobRequest criteria) { Page page = new Page<>(criteria.getPage(), criteria.getSize()); - return new ResponseEntity<>(quartzJobService.queryLogPage(criteria, page), HttpStatus.OK); + return new ResponseEntity<>(quartzJobService.describeQuartzLogPage(criteria, page), HttpStatus.OK); } @ApiOperation("新增定时任务") @@ -88,7 +88,7 @@ public class QuartzJobController { public ResponseEntity updateQuartzJob(@Validated(QuartzJob.Update.class) @RequestBody UpdateQuartzJobRequest resources) { // 验证Bean是不是合法的,合法的定时任务 Bean 需要用 @Service 定义 checkBean(resources.getBeanName()); - quartzJobService.updateJob(resources); + quartzJobService.modifyQuartzJobResumeCron(resources); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @@ -96,7 +96,7 @@ public class QuartzJobController { @PostMapping(value = "/switchJobPauseStatus/{id}") @PreAuthorize("@el.check('timing:edit')") public ResponseEntity switchJobPauseStatus(@PathVariable Long id) { - quartzJobService.switchJobPauseStatus(quartzJobService.getById(id)); + quartzJobService.switchQuartzJobStatus(quartzJobService.getById(id)); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @@ -104,7 +104,7 @@ public class QuartzJobController { @PostMapping(value = "/executionQuartzJob/{id}") @PreAuthorize("@el.check('timing:edit')") public ResponseEntity executionQuartzJob(@PathVariable Long id) { - quartzJobService.executionJob(quartzJobService.getById(id)); + quartzJobService.startQuartzJob(quartzJobService.getById(id)); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } diff --git a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/service/QuartzJobService.java b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/service/QuartzJobService.java index beb92287..f16c155d 100644 --- a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/service/QuartzJobService.java +++ b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/service/QuartzJobService.java @@ -22,7 +22,7 @@ public interface QuartzJobService extends IService { * @param page 分页参数 * @return / */ - PageResult queryJobPage(QueryQuartzJobRequest criteria, Page page); + PageResult describeQuartzJobPage(QueryQuartzJobRequest criteria, Page page); /** * 查询全部 @@ -30,7 +30,7 @@ public interface QuartzJobService extends IService { * @param criteria 条件 * @return / */ - List selectJobByCriteria(QueryQuartzJobRequest criteria); + List describeQuartzJobList(QueryQuartzJobRequest criteria); /** * 分页查询日志 @@ -39,7 +39,7 @@ public interface QuartzJobService extends IService { * @param page 分页参数 * @return / */ - PageResult queryLogPage(QueryQuartzJobRequest criteria, Page page); + PageResult describeQuartzLogPage(QueryQuartzJobRequest criteria, Page page); /** * 查询全部 @@ -47,7 +47,7 @@ public interface QuartzJobService extends IService { * @param criteria 条件 * @return / */ - List selectLogByCriteria(QueryQuartzJobRequest criteria); + List describeQuartzLogList(QueryQuartzJobRequest criteria); /** * 创建 @@ -57,11 +57,11 @@ public interface QuartzJobService extends IService { void createJob(QuartzJob resources); /** - * 编辑 + * 修改任务并重新调度 * * @param resources / */ - void updateJob(UpdateQuartzJobRequest resources); + void modifyQuartzJobResumeCron(UpdateQuartzJobRequest resources); /** * 删除任务 @@ -75,14 +75,14 @@ public interface QuartzJobService extends IService { * * @param quartzJob / */ - void switchJobPauseStatus(QuartzJob quartzJob); + void switchQuartzJobStatus(QuartzJob quartzJob); /** * 立即执行定时任务 * * @param quartzJob / */ - void executionJob(QuartzJob quartzJob); + void startQuartzJob(QuartzJob quartzJob); /** * 导出定时任务 @@ -91,7 +91,7 @@ public interface QuartzJobService extends IService { * @param response / * @throws IOException / */ - void downloadJobExcel(List queryAll, HttpServletResponse response) throws IOException; + void downloadQuartzJobExcel(List queryAll, HttpServletResponse response) throws IOException; /** * 导出定时任务日志 @@ -100,7 +100,7 @@ public interface QuartzJobService extends IService { * @param response / * @throws IOException / */ - void downloadLogExcel(List queryAllLog, HttpServletResponse response) throws IOException; + void downloadQuartzLogExcel(List queryAllLog, HttpServletResponse response) throws IOException; /** * 执行子任务 @@ -108,5 +108,5 @@ public interface QuartzJobService extends IService { * @param tasks / * @throws InterruptedException / */ - void executionSubJob(String[] tasks) throws InterruptedException; + void startSubQuartJob(String[] tasks) throws InterruptedException; } diff --git a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/service/impl/QuartzJobServiceImpl.java b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/service/impl/QuartzJobServiceImpl.java index 251cbff4..f908a018 100644 --- a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/service/impl/QuartzJobServiceImpl.java +++ b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/service/impl/QuartzJobServiceImpl.java @@ -42,22 +42,22 @@ public class QuartzJobServiceImpl extends ServiceImpl queryJobPage(QueryQuartzJobRequest criteria, Page page) { + public PageResult describeQuartzJobPage(QueryQuartzJobRequest criteria, Page page) { return PageUtil.toPage(quartzJobMapper.queryQuartzJobPageByArgs(criteria, page)); } @Override - public PageResult queryLogPage(QueryQuartzJobRequest criteria, Page page) { + public PageResult describeQuartzLogPage(QueryQuartzJobRequest criteria, Page page) { return PageUtil.toPage(quartzLogMapper.queryQuartzLogPageByArgs(criteria, page)); } @Override - public List selectJobByCriteria(QueryQuartzJobRequest criteria) { + public List describeQuartzJobList(QueryQuartzJobRequest criteria) { return quartzJobMapper.queryQuartzJobPageByArgs(criteria, PageUtil.getCount(quartzJobMapper)).getRecords(); } @Override - public List selectLogByCriteria(QueryQuartzJobRequest criteria) { + public List describeQuartzLogList(QueryQuartzJobRequest criteria) { return quartzLogMapper.queryQuartzLogPageByArgs(criteria, PageUtil.getCount(quartzLogMapper)).getRecords(); } @@ -73,7 +73,7 @@ public class QuartzJobServiceImpl extends ServiceImpl quartzJobs, HttpServletResponse response) throws IOException { + public void downloadQuartzJobExcel(List quartzJobs, HttpServletResponse response) throws IOException { List> list = new ArrayList<>(); for (QuartzJob quartzJob : quartzJobs) { Map map = new LinkedHashMap<>(); @@ -164,7 +164,7 @@ public class QuartzJobServiceImpl extends ServiceImpl queryAllLog, HttpServletResponse response) throws IOException { + public void downloadQuartzLogExcel(List queryAllLog, HttpServletResponse response) throws IOException { List> list = new ArrayList<>(); for (QuartzLog quartzLog : queryAllLog) { Map map = new LinkedHashMap<>();