Procházet zdrojové kódy

定时任务接口修改分页方式

ZhangManMan před 2 roky
rodič
revize
61557a8dd4

+ 2 - 2
src/main/java/com/sky/ioc/controller/scene/QuartzJobController.java

@@ -39,9 +39,9 @@ public class QuartzJobController {
     public ReturnMsg getJobList(@RequestParam(name = "name", required = false) String name,
                                 @RequestParam(name = "groupName", required = false) String groupName,
                                 @RequestParam(name = "status", required = false) Integer status,
-                                @RequestParam(name = "pageStart", required = false,defaultValue = "0") Integer pageStart,
+                                @RequestParam(name = "page", required = false,defaultValue = "1") Integer page,
                                 @RequestParam(name = "pageSize", required = false,defaultValue = "10") Integer pageSize) {
-        return  quartzJobService.pageList(name,groupName,status,pageStart,pageSize);
+        return  quartzJobService.pageList(name,groupName,status,page,pageSize);
     }
 
 

+ 3 - 7
src/main/java/com/sky/ioc/mapper/job/QuartzJobMapper.java

@@ -12,7 +12,7 @@ import java.util.List;
 public interface QuartzJobMapper extends BaseMapper<QuartzJob> {
 
     @Select("<script>" +
-            " select * from sys_quartz_job where 1=1 " +
+            " select * from sys_quartz_job where del_flag = 0 " +
             "<if test='name!=null and name!=\"\"'>" +
             " and name like #{name} " +
             "</if>" +
@@ -22,13 +22,9 @@ public interface QuartzJobMapper extends BaseMapper<QuartzJob> {
             "<if test='status!=null '>" +
             " and status = #{status} " +
             "</if>" +
-            "<if test='pageStart!=null and pageSize!=null '>" +
-            "  limit #{pageSize} offset #{pageStart} " +
-            "</if>" +
-            "</script>")
+            " order by id </script>")
     List<QuartzJob> pageList(@Param("name") String name, @Param("groupName") String groupName,
-                             @Param("status")  Integer status,
-                             @Param("pageStart") Integer pageStart,@Param("pageSize")  Integer pageSize);
+                             @Param("status")  Integer status);
 
 
 }

+ 7 - 3
src/main/java/com/sky/ioc/service/job/impl/QuartzJobServiceImpl.java

@@ -1,6 +1,8 @@
 package com.sky.ioc.service.job.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.sky.ioc.constant.Constant;
 import com.sky.ioc.entity.QuartzJob;
 import com.sky.ioc.mapper.job.QuartzJobMapper;
@@ -55,15 +57,17 @@ public class QuartzJobServiceImpl extends ServiceImpl<QuartzJobMapper, QuartzJob
     }
 
     @Override
-    public ReturnMsg pageList(String name, String groupName, Integer status, Integer pageStart, Integer pageSize) {
+    public ReturnMsg pageList(String name, String groupName, Integer status, Integer page, Integer pageSize) {
         if(StringUtils.isNotBlank(name)){
             name = "%"+name+"%";
         }
         if(StringUtils.isNotBlank(groupName)){
             groupName = "%"+groupName+"%";
         }
-        List<QuartzJob> lists = quartzJobMapper.pageList(name,groupName,status,pageStart,pageSize);
-        return ReturnMsg.ok(lists);
+        PageHelper.startPage(page,pageSize);
+        List<QuartzJob> lists = quartzJobMapper.pageList(name,groupName,status);
+
+        return ReturnMsg.ok(new PageInfo<>(lists));
     }
 
     /**

+ 1 - 1
src/main/resources/application.yml

@@ -91,7 +91,7 @@ mybatis-plus:
 
 # PageHelper分页插件
 pagehelper:
-  helperDialect: mysql
+  helperDialect: postgresql
   supportMethodsArguments: true
   params: count=countSql