upd: 编码规范

cutejava/cutejava-job/src/main/java/cn/odboy/mapper/QuartzJobMapper.java

@@ -12,7 +12,6 @@ import java.util.List;
 
 @Mapper
 public interface QuartzJobMapper extends BaseMapper<QuartzJob> {
-    IPage<QuartzJob> findQuartzJob(@Param("criteria") QuartzJobQueryCriteria criteria, Page<Object> page);
+    IPage<QuartzJob> findQuartzJobPage(@Param("criteria") QuartzJobQueryCriteria criteria, Page<Object> page);
-    List<QuartzJob> findQuartzJob(@Param("criteria") QuartzJobQueryCriteria criteria);
     List<QuartzJob> findActiveQuartzJob();
 }

cutejava/cutejava-job/src/main/java/cn/odboy/mapper/QuartzLogMapper.java

@@ -8,11 +8,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
-
 
 @Mapper
 public interface QuartzLogMapper extends BaseMapper<QuartzLog> {
-    IPage<QuartzLog> findQuartzLog(@Param("criteria") QuartzJobQueryCriteria criteria, Page<Object> page);
+    IPage<QuartzLog> findQuartzLogPage(@Param("criteria") QuartzJobQueryCriteria criteria, Page<Object> page);
-    List<QuartzLog> findQuartzLog(@Param("criteria") QuartzJobQueryCriteria criteria);
 }

cutejava/cutejava-job/src/main/java/cn/odboy/service/impl/QuartzJobServiceImpl.java

@@ -33,22 +33,22 @@ public class QuartzJobServiceImpl extends ServiceImpl<QuartzJobMapper, QuartzJob
 
     @Override
     public PageResult<QuartzJob> queryAll(QuartzJobQueryCriteria criteria, Page<Object> page) {
-        return PageUtil.toPage(quartzJobMapper.findQuartzJob(criteria, page));
+        return PageUtil.toPage(quartzJobMapper.findQuartzJobPage(criteria, page));
     }
 
     @Override
     public PageResult<QuartzLog> queryAllLog(QuartzJobQueryCriteria criteria, Page<Object> page) {
-        return PageUtil.toPage(quartzLogMapper.findQuartzLog(criteria, page));
+        return PageUtil.toPage(quartzLogMapper.findQuartzLogPage(criteria, page));
     }
 
     @Override
     public List<QuartzJob> queryAll(QuartzJobQueryCriteria criteria) {
-        return quartzJobMapper.findQuartzJob(criteria);
+        return quartzJobMapper.findQuartzJobPage(criteria, PageUtil.getCount(quartzJobMapper)).getRecords();
     }
 
     @Override
     public List<QuartzLog> queryAllLog(QuartzJobQueryCriteria criteria) {
-        return quartzLogMapper.findQuartzLog(criteria);
+        return quartzLogMapper.findQuartzLogPage(criteria, PageUtil.getCount(quartzLogMapper)).getRecords();
     }
 
     @Override

cutejava/cutejava-job/src/main/resources/mapper/QuartzJobMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="cn.odboy.mapper.QuartzJobMapper">
-    <select id="findQuartzJob" resultType="cn.odboy.model.job.domain.QuartzJob">
+    <select id="findQuartzJobPage" resultType="cn.odboy.model.job.domain.QuartzJob">
         SELECT
         *
         FROM sys_quartz_job

cutejava/cutejava-job/src/main/resources/mapper/QuartzLogMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="cn.odboy.mapper.QuartzLogMapper">
-    <select id="findQuartzLog" resultType="cn.odboy.model.job.domain.QuartzLog">
+    <select id="findQuartzLogPage" resultType="cn.odboy.model.job.domain.QuartzLog">
         SELECT
         *
         FROM sys_quartz_log