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 0199545a..2ba0fc16 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 @@ -17,7 +17,7 @@ import java.util.List; @RequiredArgsConstructor public class JobRunner implements ApplicationRunner { private static final Logger log = LoggerFactory.getLogger(JobRunner.class); - private final QuartzJobService quartzJobService; + private final QuartzJobMapper quartzJobMapper; private final QuartzManage quartzManage; /** @@ -27,7 +27,7 @@ public class JobRunner implements ApplicationRunner { */ @Override public void run(ApplicationArguments applicationArguments) { - List quartzJobs = quartzJobService.listActiveJob(); + 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 8ccb574e..5cfd9c5e 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,6 +7,7 @@ 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; @@ -16,4 +17,7 @@ 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(); } diff --git a/cutejava/cutejava-job/src/main/java/cn/odboy/service/QuartzJobService.java b/cutejava/cutejava-job/src/main/java/cn/odboy/service/QuartzJobService.java index 2256ced0..1165b298 100644 --- a/cutejava/cutejava-job/src/main/java/cn/odboy/service/QuartzJobService.java +++ b/cutejava/cutejava-job/src/main/java/cn/odboy/service/QuartzJobService.java @@ -109,5 +109,4 @@ public interface QuartzJobService extends IService { * @throws InterruptedException / */ void executionSubJob(String[] tasks) throws InterruptedException; - List listActiveJob(); } 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 7d62818f..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 @@ -134,11 +134,6 @@ public class QuartzJobServiceImpl extends ServiceImpl listActiveJob() { - return lambdaQuery().eq(QuartzJob::getIsPause, 0).list(); - } - @Override public void download(List quartzJobs, HttpServletResponse response) throws IOException { List> list = new ArrayList<>(); diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/mapper/DeptMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/mapper/DeptMapper.java index 2ecc80b9..19b6275e 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/mapper/DeptMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/mapper/DeptMapper.java @@ -16,14 +16,13 @@ public interface DeptMapper extends BaseMapper { List selectAll(@Param("criteria") DeptQueryCriteria criteria); List selectByPid(@Param("pid") Long pid); + @Select("select count(*) from sys_dept where pid = #{pid}") + int countByPid(@Param("pid") Long pid); List selectByPidIsNull(); Set selectByRoleId(@Param("roleId") Long roleId); - @Select("select count(*) from sys_dept where pid = #{pid}") - int countByPid(@Param("pid") Long pid); - @Select("update sys_dept set sub_count = #{count} where dept_id = #{id}") void updateSubCntById(@Param("count") Integer count, @Param("id") Long id); } \ No newline at end of file