定时任务接口修改增加任务组别和任务名称搜索

src/main/java/com/sky/ioc/controller/scene/QuartzJobController.java

@@ -30,18 +30,18 @@ public class QuartzJobController {
             return ReturnMsg.fail("该定时任务类名已存在");
         }
         quartzJobService.saveAndScheduleJob(quartzJob);
-        return ReturnMsg.ok("创建定时任务成功");
+        return ReturnMsg.ok();
     }
 
 
     @ApiOperation("定时任务列表")
     @GetMapping(value = "/getJobList")
     public ReturnMsg getJobList(@RequestParam(name = "name", required = false) String name,
-                                @RequestParam(name = "groupName", required = false) String groupName,
+                                @RequestParam(name = "group", required = false) Integer group,
                                 @RequestParam(name = "status", required = false) Integer status,
                                 @RequestParam(name = "page", required = false,defaultValue = "1") Integer page,
                                 @RequestParam(name = "pageSize", required = false,defaultValue = "10") Integer pageSize) {
-        return  quartzJobService.pageList(name,groupName,status,page,pageSize);
+        return  quartzJobService.pageList(name,group,status,page,pageSize);
     }
 
 
@@ -54,10 +54,10 @@ public class QuartzJobController {
         }else {
             try {
                 quartzJobService.editAndScheduleJob(quartzJob);
-                return ReturnMsg.ok("操作成功!");
+                return ReturnMsg.ok();
             } catch (SchedulerException e) {
                // throw new RuntimeException(e);
-                return ReturnMsg.ok("失败!"+e.getMessage());
+                return ReturnMsg.fail("失败!"+e.getMessage());
             }
 
         }
@@ -71,7 +71,7 @@ public class QuartzJobController {
             return ReturnMsg.fail("未找到对应实体");
         }else {
             quartzJobService.deleteAndStopJob(quartzJob);
-            return ReturnMsg.ok("操作成功!");
+            return ReturnMsg.ok();
         }
     }
 
@@ -92,10 +92,10 @@ public class QuartzJobController {
                 //暂停
                 try {
                     quartzJobService.editAndScheduleJob(quartzJob);
-                    return ReturnMsg.ok("操作成功!");
+                    return ReturnMsg.ok();
                 } catch (SchedulerException e) {
                     // throw new RuntimeException(e);
-                    return ReturnMsg.ok("失败!"+e.getMessage());
+                    return ReturnMsg.fail("失败!"+e.getMessage());
                 }
             }
         }

src/main/java/com/sky/ioc/entity/QuartzJob.java

@@ -23,8 +23,11 @@ public class QuartzJob implements Serializable {
      */
     private String createBy;
 
-    /**组名*/
-    private String groupName;
+    /**任务分组
+     * 1 系统
+     * 2 默认
+     * */
+    private Integer groupType;
     /**任务名*/
     private String name;
 

src/main/java/com/sky/ioc/mapper/job/QuartzJobMapper.java

@@ -16,14 +16,14 @@ public interface QuartzJobMapper extends BaseMapper<QuartzJob> {
             "<if test='name!=null and name!=\"\"'>" +
             " and name like #{name} " +
             "</if>" +
-            "<if test='groupName!=null and groupName!=\"\"'>" +
-            " and groupName like #{groupName} " +
+            "<if test='groupType!=null'>" +
+            " and group_type = #{groupType} " +
             "</if>" +
             "<if test='status!=null '>" +
             " and status = #{status} " +
             "</if>" +
             " order by id </script>")
-    List<QuartzJob> pageList(@Param("name") String name, @Param("groupName") String groupName,
+    List<QuartzJob> pageList(@Param("name") String name, @Param("groupType") Integer group,
                              @Param("status")  Integer status);
 
 

src/main/java/com/sky/ioc/service/job/IQuartzJobService.java

@@ -17,5 +17,5 @@ public interface IQuartzJobService extends IService<QuartzJob> {
 
     void test(String param);
 
-    ReturnMsg pageList(String name,String groupName,Integer status,Integer pageStart,Integer pageSize);
+    ReturnMsg pageList(String name,Integer group,Integer status,Integer pageStart,Integer pageSize);
 }

src/main/java/com/sky/ioc/service/job/impl/QuartzJobServiceImpl.java

@@ -57,16 +57,12 @@ public class QuartzJobServiceImpl extends ServiceImpl<QuartzJobMapper, QuartzJob
     }
 
     @Override
-    public ReturnMsg pageList(String name, String groupName, Integer status, Integer page, Integer pageSize) {
+    public ReturnMsg pageList(String name, Integer group, Integer status, Integer page, Integer pageSize) {
         if(StringUtils.isNotBlank(name)){
             name = "%"+name+"%";
         }
-        if(StringUtils.isNotBlank(groupName)){
-            groupName = "%"+groupName+"%";
-        }
         PageHelper.startPage(page,pageSize);
-        List<QuartzJob> lists = quartzJobMapper.pageList(name,groupName,status);
-
+        List<QuartzJob> lists = quartzJobMapper.pageList(name,group,status);
         return ReturnMsg.ok(new PageInfo<>(lists));
     }