diff --git a/cutejava/cutejava-job/src/main/java/cn/odboy/config/JobRunner.java b/cutejava/cutejava-job/src/main/java/cn/odboy/config/JobRunner.java index e4ef7545..99e91708 100644 --- a/cutejava/cutejava-job/src/main/java/cn/odboy/config/JobRunner.java +++ b/cutejava/cutejava-job/src/main/java/cn/odboy/config/JobRunner.java @@ -26,7 +26,7 @@ public class JobRunner implements ApplicationRunner { */ @Override public void run(ApplicationArguments applicationArguments) { - List quartzJobs = quartzJobMapper.findByIsPauseIsFalse(); + List quartzJobs = quartzJobMapper.selectActiveJob(); quartzJobs.forEach(quartzManage::addJob); log.info("Timing task injection complete"); } diff --git a/cutejava/cutejava-job/src/main/java/cn/odboy/mapper/QuartzJobMapper.java b/cutejava/cutejava-job/src/main/java/cn/odboy/mapper/QuartzJobMapper.java index d6e8140c..e776f533 100644 --- a/cutejava/cutejava-job/src/main/java/cn/odboy/mapper/QuartzJobMapper.java +++ b/cutejava/cutejava-job/src/main/java/cn/odboy/mapper/QuartzJobMapper.java @@ -13,9 +13,9 @@ import java.util.List; @Mapper public interface QuartzJobMapper extends BaseMapper { - IPage findAll(@Param("criteria") QuartzJobQueryCriteria criteria, Page page); + IPage selectByPage(@Param("criteria") QuartzJobQueryCriteria criteria, Page page); - List findAll(@Param("criteria") QuartzJobQueryCriteria criteria); + List selectByPage(@Param("criteria") QuartzJobQueryCriteria criteria); - List findByIsPauseIsFalse(); + List selectActiveJob(); } diff --git a/cutejava/cutejava-job/src/main/java/cn/odboy/mapper/QuartzLogMapper.java b/cutejava/cutejava-job/src/main/java/cn/odboy/mapper/QuartzLogMapper.java index f01f8513..66082d1d 100644 --- a/cutejava/cutejava-job/src/main/java/cn/odboy/mapper/QuartzLogMapper.java +++ b/cutejava/cutejava-job/src/main/java/cn/odboy/mapper/QuartzLogMapper.java @@ -14,7 +14,7 @@ import java.util.List; @Mapper public interface QuartzLogMapper extends BaseMapper { - IPage findAll(@Param("criteria") QuartzJobQueryCriteria criteria, Page page); + IPage selectByPage(@Param("criteria") QuartzJobQueryCriteria criteria, Page page); - List findAll(@Param("criteria") QuartzJobQueryCriteria criteria); + List selectByPage(@Param("criteria") QuartzJobQueryCriteria criteria); } diff --git a/cutejava/cutejava-job/src/main/java/cn/odboy/service/impl/QuartzJobServiceImpl.java b/cutejava/cutejava-job/src/main/java/cn/odboy/service/impl/QuartzJobServiceImpl.java index ea6014d8..aadb2537 100644 --- a/cutejava/cutejava-job/src/main/java/cn/odboy/service/impl/QuartzJobServiceImpl.java +++ b/cutejava/cutejava-job/src/main/java/cn/odboy/service/impl/QuartzJobServiceImpl.java @@ -33,22 +33,22 @@ public class QuartzJobServiceImpl extends ServiceImpl queryAll(QuartzJobQueryCriteria criteria, Page page) { - return PageUtil.toPage(quartzJobMapper.findAll(criteria, page)); + return PageUtil.toPage(quartzJobMapper.selectByPage(criteria, page)); } @Override public PageResult queryAllLog(QuartzJobQueryCriteria criteria, Page page) { - return PageUtil.toPage(quartzLogMapper.findAll(criteria, page)); + return PageUtil.toPage(quartzLogMapper.selectByPage(criteria, page)); } @Override public List queryAll(QuartzJobQueryCriteria criteria) { - return quartzJobMapper.findAll(criteria); + return quartzJobMapper.selectByPage(criteria); } @Override public List queryAllLog(QuartzJobQueryCriteria criteria) { - return quartzLogMapper.findAll(criteria); + return quartzLogMapper.selectByPage(criteria); } @Override diff --git a/cutejava/cutejava-job/src/main/resources/mapper/QuartzJobMapper.xml b/cutejava/cutejava-job/src/main/resources/mapper/QuartzJobMapper.xml index 356df18d..8946c773 100644 --- a/cutejava/cutejava-job/src/main/resources/mapper/QuartzJobMapper.xml +++ b/cutejava/cutejava-job/src/main/resources/mapper/QuartzJobMapper.xml @@ -1,7 +1,7 @@ - SELECT * FROM sys_quartz_job @@ -16,7 +16,7 @@ ORDER BY id DESC - SELECT * FROM sys_quartz_job WHERE is_pause = 0 diff --git a/cutejava/cutejava-job/src/main/resources/mapper/QuartzLogMapper.xml b/cutejava/cutejava-job/src/main/resources/mapper/QuartzLogMapper.xml index bf80d23b..3934b0aa 100644 --- a/cutejava/cutejava-job/src/main/resources/mapper/QuartzLogMapper.xml +++ b/cutejava/cutejava-job/src/main/resources/mapper/QuartzLogMapper.xml @@ -1,7 +1,7 @@ - SELECT * FROM sys_quartz_log