Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
DolphinScheduler
提交
5c037289
DolphinScheduler
项目概览
apache
/
DolphinScheduler
上一次同步 1 年多
通知
707
Star
9572
Fork
3514
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
DolphinScheduler
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
5c037289
编写于
4月 22, 2019
作者:
B
baoliang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
update worker group
上级
e76d2dcd
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
75 addition
and
1 deletion
+75
-1
escheduler-api/src/main/java/cn/escheduler/api/controller/WorkerGroupController.java
...a/cn/escheduler/api/controller/WorkerGroupController.java
+44
-1
escheduler-api/src/main/java/cn/escheduler/api/service/WorkerGroupService.java
...in/java/cn/escheduler/api/service/WorkerGroupService.java
+31
-0
未找到文件。
escheduler-api/src/main/java/cn/escheduler/api/controller/WorkerGroupController.java
浏览文件 @
5c037289
...
...
@@ -44,6 +44,14 @@ public class WorkerGroupController extends BaseController{
WorkerGroupService
workerGroupService
;
/**
* create or update a worker group
* @param loginUser
* @param id
* @param name
* @param ipList
* @return
*/
@PostMapping
(
value
=
"/save"
)
@ResponseStatus
(
HttpStatus
.
OK
)
public
Result
saveWorkerGroup
(
@RequestAttribute
(
value
=
Constants
.
SESSION_USER
)
User
loginUser
,
...
...
@@ -63,6 +71,14 @@ public class WorkerGroupController extends BaseController{
}
}
/**
* query worker groups paging
* @param loginUser
* @param pageNo
* @param searchVal
* @param pageSize
* @return
*/
@GetMapping
(
value
=
"/list-paging"
)
@ResponseStatus
(
HttpStatus
.
OK
)
public
Result
queryAllWorkerGroupsPaging
(
@RequestAttribute
(
value
=
Constants
.
SESSION_USER
)
User
loginUser
,
...
...
@@ -70,7 +86,7 @@ public class WorkerGroupController extends BaseController{
@RequestParam
(
value
=
"searchVal"
,
required
=
false
)
String
searchVal
,
@RequestParam
(
"pageSize"
)
Integer
pageSize
)
{
logger
.
info
(
"query all worker group: login user {}, pageNo:{}, pageSize:{}, searchVal:{}"
,
logger
.
info
(
"query all worker group
paging
: login user {}, pageNo:{}, pageSize:{}, searchVal:{}"
,
loginUser
.
getUserName
()
,
pageNo
,
pageSize
,
searchVal
);
try
{
...
...
@@ -82,6 +98,33 @@ public class WorkerGroupController extends BaseController{
}
}
/**
* query all worker groups
* @param loginUser
* @return
*/
@GetMapping
(
value
=
"/all-groups"
)
@ResponseStatus
(
HttpStatus
.
OK
)
public
Result
queryAllWorkerGroups
(
@RequestAttribute
(
value
=
Constants
.
SESSION_USER
)
User
loginUser
)
{
logger
.
info
(
"query all worker group: login user {}"
,
loginUser
.
getUserName
()
);
try
{
Map
<
String
,
Object
>
result
=
workerGroupService
.
queryAllGroup
();
return
returnDataListPaging
(
result
);
}
catch
(
Exception
e
){
logger
.
error
(
Status
.
SAVE_ERROR
.
getMsg
(),
e
);
return
error
(
Status
.
SAVE_ERROR
.
getCode
(),
Status
.
SAVE_ERROR
.
getMsg
());
}
}
/**
* delete worker group by id
* @param loginUser
* @param id
* @return
*/
@GetMapping
(
value
=
"/delete-by-id"
)
@ResponseStatus
(
HttpStatus
.
OK
)
public
Result
deleteById
(
@RequestAttribute
(
value
=
Constants
.
SESSION_USER
)
User
loginUser
,
...
...
escheduler-api/src/main/java/cn/escheduler/api/service/WorkerGroupService.java
浏览文件 @
5c037289
...
...
@@ -41,6 +41,13 @@ public class WorkerGroupService extends BaseService {
@Autowired
WorkerGroupMapper
workerGroupMapper
;
/**
* create or update a worker group
* @param id
* @param name
* @param ipList
* @return
*/
public
Map
<
String
,
Object
>
saveWorkerGroup
(
int
id
,
String
name
,
String
ipList
){
Map
<
String
,
Object
>
result
=
new
HashMap
<>(
5
);
...
...
@@ -97,6 +104,13 @@ public class WorkerGroupService extends BaseService {
return
false
;
}
/**
* query worker group paging
* @param pageNo
* @param pageSize
* @param searchVal
* @return
*/
public
Map
<
String
,
Object
>
queryAllGroupPaging
(
Integer
pageNo
,
Integer
pageSize
,
String
searchVal
)
{
Map
<
String
,
Object
>
result
=
new
HashMap
<>(
5
);
...
...
@@ -112,6 +126,11 @@ public class WorkerGroupService extends BaseService {
return
result
;
}
/**
* delete worker group by id
* @param id
* @return
*/
public
Map
<
String
,
Object
>
deleteWorkerGroupById
(
Integer
id
)
{
Map
<
String
,
Object
>
result
=
new
HashMap
<>(
5
);
...
...
@@ -120,4 +139,16 @@ public class WorkerGroupService extends BaseService {
putMsg
(
result
,
Status
.
SUCCESS
);
return
result
;
}
/**
* query all worker group
* @return
*/
public
Map
<
String
,
Object
>
queryAllGroup
()
{
Map
<
String
,
Object
>
result
=
new
HashMap
<>(
5
);
List
<
WorkerGroup
>
workerGroupList
=
workerGroupMapper
.
queryAllWorkerGroup
();
result
.
put
(
Constants
.
DATA_LIST
,
workerGroupList
);
putMsg
(
result
,
Status
.
SUCCESS
);
return
result
;
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录