Browse Source

任务列表新增筛选条件 "任务描述",快速检索任务;

xuxueli 8 years ago
parent
commit
b3aa981fa8

+ 1 - 0
doc/XXL-JOB官方文档.md View File

1111
 - 27、系统安全性优化,登陆Token写Cookie时进行MD5加密,同时Cookie启用HttpOnly;
1111
 - 27、系统安全性优化,登陆Token写Cookie时进行MD5加密,同时Cookie启用HttpOnly;
1112
 - 28、新增"任务ID"属性,移除"JobKey"属性,前者承担所有功能,方便后续增强任务依赖功能。
1112
 - 28、新增"任务ID"属性,移除"JobKey"属性,前者承担所有功能,方便后续增强任务依赖功能。
1113
 - 29、任务循环依赖问题修复,避免子任务与父任务重复导致的调度死循环;
1113
 - 29、任务循环依赖问题修复,避免子任务与父任务重复导致的调度死循环;
1114
+- 30、任务列表新增筛选条件 "任务描述",快速检索任务;
1114
 
1115
 
1115
 ### TODO LIST
1116
 ### TODO LIST
1116
 - 1、任务权限管理:执行器为粒度分配权限,核心操作校验权限;
1117
 - 1、任务权限管理:执行器为粒度分配权限,核心操作校验权限;

+ 1 - 1
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobGroupController.java View File

100
 	public ReturnT<String> remove(int id){
100
 	public ReturnT<String> remove(int id){
101
 
101
 
102
 		// valid
102
 		// valid
103
-		int count = xxlJobInfoDao.pageListCount(0, 10, id, null);
103
+		int count = xxlJobInfoDao.pageListCount(0, 10, id, null, null);
104
 		if (count > 0) {
104
 		if (count > 0) {
105
 			return new ReturnT<String>(500, "该分组使用中, 不可删除");
105
 			return new ReturnT<String>(500, "该分组使用中, 不可删除");
106
 		}
106
 		}

+ 2 - 2
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java View File

53
 	@ResponseBody
53
 	@ResponseBody
54
 	public Map<String, Object> pageList(@RequestParam(required = false, defaultValue = "0") int start,  
54
 	public Map<String, Object> pageList(@RequestParam(required = false, defaultValue = "0") int start,  
55
 			@RequestParam(required = false, defaultValue = "10") int length,
55
 			@RequestParam(required = false, defaultValue = "10") int length,
56
-			int jobGroup, String executorHandler, String filterTime) {
56
+			int jobGroup, String jobDesc, String executorHandler, String filterTime) {
57
 		
57
 		
58
-		return xxlJobService.pageList(start, length, jobGroup, executorHandler, filterTime);
58
+		return xxlJobService.pageList(start, length, jobGroup, jobDesc, executorHandler, filterTime);
59
 	}
59
 	}
60
 	
60
 	
61
 	@RequestMapping("/add")
61
 	@RequestMapping("/add")

+ 10 - 2
xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobInfoDao.java View File

12
  */
12
  */
13
 public interface XxlJobInfoDao {
13
 public interface XxlJobInfoDao {
14
 
14
 
15
-	public List<XxlJobInfo> pageList(@Param("offset") int offset, @Param("pagesize") int pagesize, @Param("jobGroup") int jobGroup, @Param("executorHandler") String executorHandler);
16
-	public int pageListCount(@Param("offset") int offset, @Param("pagesize") int pagesize, @Param("jobGroup") int jobGroup, @Param("executorHandler") String executorHandler);
15
+	public List<XxlJobInfo> pageList(@Param("offset") int offset,
16
+									 @Param("pagesize") int pagesize,
17
+									 @Param("jobGroup") int jobGroup,
18
+									 @Param("jobDesc") String jobDesc,
19
+									 @Param("executorHandler") String executorHandler);
20
+	public int pageListCount(@Param("offset") int offset,
21
+							 @Param("pagesize") int pagesize,
22
+							 @Param("jobGroup") int jobGroup,
23
+							 @Param("jobDesc") String jobDesc,
24
+							 @Param("executorHandler") String executorHandler);
17
 	
25
 	
18
 	public int save(XxlJobInfo info);
26
 	public int save(XxlJobInfo info);
19
 
27
 

+ 1 - 1
xxl-job-admin/src/main/java/com/xxl/job/admin/service/XxlJobService.java View File

14
  */
14
  */
15
 public interface XxlJobService {
15
 public interface XxlJobService {
16
 	
16
 	
17
-	public Map<String, Object> pageList(int start, int length, int jobGroup, String executorHandler, String filterTime);
17
+	public Map<String, Object> pageList(int start, int length, int jobGroup, String jobDesc, String executorHandler, String filterTime);
18
 	
18
 	
19
 	public ReturnT<String> add(XxlJobInfo jobInfo);
19
 	public ReturnT<String> add(XxlJobInfo jobInfo);
20
 	
20
 	

+ 3 - 3
xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java View File

45
 	private XxlJobLogGlueDao xxlJobLogGlueDao;
45
 	private XxlJobLogGlueDao xxlJobLogGlueDao;
46
 	
46
 	
47
 	@Override
47
 	@Override
48
-	public Map<String, Object> pageList(int start, int length, int jobGroup, String executorHandler, String filterTime) {
48
+	public Map<String, Object> pageList(int start, int length, int jobGroup, String jobDesc, String executorHandler, String filterTime) {
49
 
49
 
50
 		// page list
50
 		// page list
51
-		List<XxlJobInfo> list = xxlJobInfoDao.pageList(start, length, jobGroup, executorHandler);
52
-		int list_count = xxlJobInfoDao.pageListCount(start, length, jobGroup, executorHandler);
51
+		List<XxlJobInfo> list = xxlJobInfoDao.pageList(start, length, jobGroup, jobDesc, executorHandler);
52
+		int list_count = xxlJobInfoDao.pageListCount(start, length, jobGroup, jobDesc, executorHandler);
53
 		
53
 		
54
 		// fill job info
54
 		// fill job info
55
 		if (list!=null && list.size()>0) {
55
 		if (list!=null && list.size()>0) {

+ 6 - 0
xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobInfoMapper.xml View File

58
 			<if test="jobGroup gt 0">
58
 			<if test="jobGroup gt 0">
59
 				AND t.job_group = #{jobGroup}
59
 				AND t.job_group = #{jobGroup}
60
 			</if>
60
 			</if>
61
+			<if test="jobDesc != null and jobDesc != ''">
62
+				AND t.job_desc like CONCAT(CONCAT('%', #{jobDesc}), '%')
63
+			</if>
61
 			<if test="executorHandler != null and executorHandler != ''">
64
 			<if test="executorHandler != null and executorHandler != ''">
62
 				AND t.executor_handler like CONCAT(CONCAT('%', #{executorHandler}), '%')
65
 				AND t.executor_handler like CONCAT(CONCAT('%', #{executorHandler}), '%')
63
 			</if>
66
 			</if>
73
 			<if test="jobGroup gt 0">
76
 			<if test="jobGroup gt 0">
74
 				AND t.job_group = #{jobGroup}
77
 				AND t.job_group = #{jobGroup}
75
 			</if>
78
 			</if>
79
+			<if test="jobDesc != null and jobDesc != ''">
80
+				AND t.job_desc like CONCAT(CONCAT('%', #{jobDesc}), '%')
81
+			</if>
76
 			<if test="executorHandler != null and executorHandler != ''">
82
 			<if test="executorHandler != null and executorHandler != ''">
77
 				AND t.executor_handler like CONCAT(CONCAT('%', #{executorHandler}), '%')
83
 				AND t.executor_handler like CONCAT(CONCAT('%', #{executorHandler}), '%')
78
 			</if>
84
 			</if>

+ 9 - 3
xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl View File

32
 	    <section class="content">
32
 	    <section class="content">
33
 	    
33
 	    
34
 	    	<div class="row">
34
 	    	<div class="row">
35
-	    		<div class="col-xs-4">
35
+	    		<div class="col-xs-3">
36
 	              	<div class="input-group">
36
 	              	<div class="input-group">
37
 	                	<span class="input-group-addon">执行器</span>
37
 	                	<span class="input-group-addon">执行器</span>
38
                 		<select class="form-control" id="jobGroup" >
38
                 		<select class="form-control" id="jobGroup" >
42
 	                  	</select>
42
 	                  	</select>
43
 	              	</div>
43
 	              	</div>
44
 	            </div>
44
 	            </div>
45
-                <div class="col-xs-4">
45
+                <div class="col-xs-3">
46
+                    <div class="input-group">
47
+                        <span class="input-group-addon">任务描述</span>
48
+                        <input type="text" class="form-control" id="jobDesc" autocomplete="on" >
49
+                    </div>
50
+                </div>
51
+                <div class="col-xs-3">
46
                     <div class="input-group">
52
                     <div class="input-group">
47
                         <span class="input-group-addon">JobHandler</span>
53
                         <span class="input-group-addon">JobHandler</span>
48
                         <input type="text" class="form-control" id="executorHandler" autocomplete="on" >
54
                         <input type="text" class="form-control" id="executorHandler" autocomplete="on" >
49
                     </div>
55
                     </div>
50
                 </div>
56
                 </div>
51
-	            <div class="col-xs-2">
57
+	            <div class="col-xs-1">
52
 	            	<button class="btn btn-block btn-info" id="searchBtn">搜索</button>
58
 	            	<button class="btn btn-block btn-info" id="searchBtn">搜索</button>
53
 	            </div>
59
 	            </div>
54
 	            <div class="col-xs-2">
60
 	            <div class="col-xs-2">

+ 1 - 0
xxl-job-admin/src/main/webapp/static/js/jobinfo.index.1.js View File

10
 	        data : function ( d ) {
10
 	        data : function ( d ) {
11
 	        	var obj = {};
11
 	        	var obj = {};
12
 	        	obj.jobGroup = $('#jobGroup').val();
12
 	        	obj.jobGroup = $('#jobGroup').val();
13
+                obj.jobDesc = $('#jobDesc').val();
13
 	        	obj.executorHandler = $('#executorHandler').val();
14
 	        	obj.executorHandler = $('#executorHandler').val();
14
 	        	obj.start = d.start;
15
 	        	obj.start = d.start;
15
 	        	obj.length = d.length;
16
 	        	obj.length = d.length;

+ 2 - 2
xxl-job-admin/src/test/java/com/xxl/job/admin/dao/XxlJobInfoDaoTest.java View File

20
 	
20
 	
21
 	@Test
21
 	@Test
22
 	public void pageList(){
22
 	public void pageList(){
23
-		List<XxlJobInfo> list = xxlJobInfoDao.pageList(0, 20, 0, null);
24
-		int list_count = xxlJobInfoDao.pageListCount(0, 20, 0, null);
23
+		List<XxlJobInfo> list = xxlJobInfoDao.pageList(0, 20, 0, null, null);
24
+		int list_count = xxlJobInfoDao.pageListCount(0, 20, 0, null, null);
25
 		
25
 		
26
 		System.out.println(list);
26
 		System.out.println(list);
27
 		System.out.println(list_count);
27
 		System.out.println(list_count);