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 99e91708..4043758a 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.selectActiveJob(); + List quartzJobs = quartzJobMapper.findActiveQuartzJobs(); 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 5cfd9c5e..fda1c829 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 @@ -7,17 +7,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; import java.util.List; @Mapper public interface QuartzJobMapper extends BaseMapper { - - IPage selectByPage(@Param("criteria") QuartzJobQueryCriteria criteria, Page page); - - List selectByPage(@Param("criteria") QuartzJobQueryCriteria criteria); - - @Select("SELECT * FROM sys_quartz_job WHERE is_pause = 0") - List selectActiveJob(); + IPage findQuartzJob(@Param("criteria") QuartzJobQueryCriteria criteria, Page page); + List findQuartzJob(@Param("criteria") QuartzJobQueryCriteria criteria); + List findActiveQuartzJobs(); } 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 66082d1d..5647f728 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 @@ -13,8 +13,6 @@ import java.util.List; @Mapper public interface QuartzLogMapper extends BaseMapper { - - IPage selectByPage(@Param("criteria") QuartzJobQueryCriteria criteria, Page page); - - List selectByPage(@Param("criteria") QuartzJobQueryCriteria criteria); + IPage findQuartzLog(@Param("criteria") QuartzJobQueryCriteria criteria, Page page); + List findQuartzLog(@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 aadb2537..b533bc3c 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.selectByPage(criteria, page)); + return PageUtil.toPage(quartzJobMapper.findQuartzJob(criteria, page)); } @Override public PageResult queryAllLog(QuartzJobQueryCriteria criteria, Page page) { - return PageUtil.toPage(quartzLogMapper.selectByPage(criteria, page)); + return PageUtil.toPage(quartzLogMapper.findQuartzLog(criteria, page)); } @Override public List queryAll(QuartzJobQueryCriteria criteria) { - return quartzJobMapper.selectByPage(criteria); + return quartzJobMapper.findQuartzJob(criteria); } @Override public List queryAllLog(QuartzJobQueryCriteria criteria) { - return quartzLogMapper.selectByPage(criteria); + return quartzLogMapper.findQuartzLog(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 aa83ffc5..9d77100b 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 @@ -15,4 +15,7 @@ ORDER BY id DESC + \ No newline at end of file diff --git a/cutejava/cutejava-job/src/main/resources/mapper/QuartzLogMapper.xml b/cutejava/cutejava-job/src/main/resources/mapper/QuartzLogMapper.xml index 90adef6a..0d5f7f1f 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