|
|
@@ -1,22 +1,30 @@
|
|
1
|
1
|
package com.xxl.job.admin.controller;
|
|
2
|
2
|
|
|
|
3
|
+import com.xxl.job.admin.core.exception.XxlJobException;
|
|
3
|
4
|
import com.xxl.job.admin.core.model.XxlJobGroup;
|
|
4
|
5
|
import com.xxl.job.admin.core.model.XxlJobInfo;
|
|
|
6
|
+import com.xxl.job.admin.core.model.XxlJobUser;
|
|
5
|
7
|
import com.xxl.job.admin.core.route.ExecutorRouteStrategyEnum;
|
|
6
|
8
|
import com.xxl.job.admin.core.thread.JobTriggerPoolHelper;
|
|
7
|
9
|
import com.xxl.job.admin.core.trigger.TriggerTypeEnum;
|
|
|
10
|
+import com.xxl.job.admin.core.util.I18nUtil;
|
|
8
|
11
|
import com.xxl.job.admin.dao.XxlJobGroupDao;
|
|
|
12
|
+import com.xxl.job.admin.service.LoginService;
|
|
9
|
13
|
import com.xxl.job.admin.service.XxlJobService;
|
|
10
|
14
|
import com.xxl.job.core.biz.model.ReturnT;
|
|
11
|
15
|
import com.xxl.job.core.enums.ExecutorBlockStrategyEnum;
|
|
12
|
16
|
import com.xxl.job.core.glue.GlueTypeEnum;
|
|
13
|
17
|
import org.springframework.stereotype.Controller;
|
|
14
|
18
|
import org.springframework.ui.Model;
|
|
|
19
|
+import org.springframework.util.StringUtils;
|
|
15
|
20
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
16
|
21
|
import org.springframework.web.bind.annotation.RequestParam;
|
|
17
|
22
|
import org.springframework.web.bind.annotation.ResponseBody;
|
|
18
|
23
|
|
|
19
|
24
|
import javax.annotation.Resource;
|
|
|
25
|
+import javax.servlet.http.HttpServletRequest;
|
|
|
26
|
+import java.util.ArrayList;
|
|
|
27
|
+import java.util.Arrays;
|
|
20
|
28
|
import java.util.List;
|
|
21
|
29
|
import java.util.Map;
|
|
22
|
30
|
|
|
|
@@ -34,15 +42,38 @@ public class JobInfoController {
|
|
34
|
42
|
private XxlJobService xxlJobService;
|
|
35
|
43
|
|
|
36
|
44
|
@RequestMapping
|
|
37
|
|
- public String index(Model model, @RequestParam(required = false, defaultValue = "-1") int jobGroup) {
|
|
|
45
|
+ public String index(HttpServletRequest request, Model model, @RequestParam(required = false, defaultValue = "-1") int jobGroup) {
|
|
38
|
46
|
|
|
39
|
47
|
// 枚举-字典
|
|
40
|
48
|
model.addAttribute("ExecutorRouteStrategyEnum", ExecutorRouteStrategyEnum.values()); // 路由策略-列表
|
|
41
|
49
|
model.addAttribute("GlueTypeEnum", GlueTypeEnum.values()); // Glue类型-字典
|
|
42
|
50
|
model.addAttribute("ExecutorBlockStrategyEnum", ExecutorBlockStrategyEnum.values()); // 阻塞处理策略-字典
|
|
43
|
51
|
|
|
44
|
|
- // 任务组
|
|
45
|
|
- List<XxlJobGroup> jobGroupList = xxlJobGroupDao.findAll();
|
|
|
52
|
+ // 执行器列表
|
|
|
53
|
+ List<XxlJobGroup> jobGroupList_all = xxlJobGroupDao.findAll();
|
|
|
54
|
+
|
|
|
55
|
+ // filter group
|
|
|
56
|
+ List<XxlJobGroup> jobGroupList = new ArrayList<>();
|
|
|
57
|
+ if (jobGroupList_all!=null && jobGroupList_all.size()>0) {
|
|
|
58
|
+ XxlJobUser loginUser = (XxlJobUser) request.getAttribute(LoginService.LOGIN_IDENTITY_KEY);
|
|
|
59
|
+ if (loginUser.getRole() == 1) {
|
|
|
60
|
+ jobGroupList = jobGroupList_all;
|
|
|
61
|
+ } else {
|
|
|
62
|
+ List<String> groupIdStrs = new ArrayList<>();
|
|
|
63
|
+ if (loginUser.getPermission()!=null && loginUser.getPermission().trim().length()>0) {
|
|
|
64
|
+ groupIdStrs = Arrays.asList(loginUser.getPermission().trim().split(","));
|
|
|
65
|
+ }
|
|
|
66
|
+ for (XxlJobGroup groupItem:jobGroupList_all) {
|
|
|
67
|
+ if (groupIdStrs.contains(String.valueOf(groupItem.getId()))) {
|
|
|
68
|
+ jobGroupList.add(groupItem);
|
|
|
69
|
+ }
|
|
|
70
|
+ }
|
|
|
71
|
+ }
|
|
|
72
|
+ }
|
|
|
73
|
+ if (jobGroupList==null || jobGroupList.size()==0) {
|
|
|
74
|
+ throw new XxlJobException(I18nUtil.getString("jobgroup_empty"));
|
|
|
75
|
+ }
|
|
|
76
|
+
|
|
46
|
77
|
model.addAttribute("JobGroupList", jobGroupList);
|
|
47
|
78
|
model.addAttribute("jobGroup", jobGroup);
|
|
48
|
79
|
|
xuxueli