Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
DolphinScheduler
提交
6548195a
DolphinScheduler
项目概览
apache
/
DolphinScheduler
上一次同步 接近 2 年
通知
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,发现更多精彩内容 >>
提交
6548195a
编写于
4月 11, 2019
作者:
L
ligang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
update QueueController and QueueService
上级
303e1b75
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
242 addition
and
1 deletion
+242
-1
escheduler-api/src/main/java/cn/escheduler/api/controller/QueueController.java
...in/java/cn/escheduler/api/controller/QueueController.java
+79
-1
escheduler-api/src/main/java/cn/escheduler/api/service/QueueService.java
...src/main/java/cn/escheduler/api/service/QueueService.java
+103
-0
escheduler-api/src/test/java/cn/escheduler/api/controller/QueueControllerTest.java
...ava/cn/escheduler/api/controller/QueueControllerTest.java
+60
-0
未找到文件。
escheduler-api/src/main/java/cn/escheduler/api/controller/QueueController.java
浏览文件 @
6548195a
...
...
@@ -17,6 +17,7 @@
package
cn.escheduler.api.controller
;
import
cn.escheduler.api.enums.Status
;
import
cn.escheduler.api.service.QueueService
;
import
cn.escheduler.api.utils.Constants
;
import
cn.escheduler.api.utils.Result
;
...
...
@@ -29,7 +30,7 @@ import org.springframework.web.bind.annotation.*;
import
java.util.Map
;
import
static
cn
.
escheduler
.
api
.
enums
.
Status
.
QUERY_QUEUE_LIST_ERROR
;
import
static
cn
.
escheduler
.
api
.
enums
.
Status
.
*
;
/**
...
...
@@ -63,5 +64,82 @@ public class QueueController extends BaseController{
}
}
/**
* query queue list paging
* @param loginUser
* @return
*/
@GetMapping
(
value
=
"/list-paging"
)
@ResponseStatus
(
HttpStatus
.
OK
)
public
Result
queryQueueListPaging
(
@RequestAttribute
(
value
=
Constants
.
SESSION_USER
)
User
loginUser
,
@RequestParam
(
"pageNo"
)
Integer
pageNo
,
@RequestParam
(
value
=
"searchVal"
,
required
=
false
)
String
searchVal
,
@RequestParam
(
"pageSize"
)
Integer
pageSize
){
try
{
logger
.
info
(
"login user {}, query queue list,search value:{}"
,
loginUser
.
getUserName
(),
searchVal
);
Map
<
String
,
Object
>
result
=
checkPageParams
(
pageNo
,
pageSize
);
if
(
result
.
get
(
Constants
.
STATUS
)
!=
Status
.
SUCCESS
){
return
returnDataListPaging
(
result
);
}
result
=
queueService
.
queryList
(
loginUser
,
searchVal
,
pageNo
,
pageSize
);
return
returnDataList
(
result
);
}
catch
(
Exception
e
){
logger
.
error
(
QUERY_QUEUE_LIST_ERROR
.
getMsg
(),
e
);
return
error
(
QUERY_QUEUE_LIST_ERROR
.
getCode
(),
QUERY_QUEUE_LIST_ERROR
.
getMsg
());
}
}
/**
* create queue
*
* @param loginUser
* @param queue
* @param queueName
* @return
*/
@PostMapping
(
value
=
"/create"
)
@ResponseStatus
(
HttpStatus
.
CREATED
)
public
Result
createQueue
(
@RequestAttribute
(
value
=
Constants
.
SESSION_USER
)
User
loginUser
,
@RequestParam
(
value
=
"queue"
)
String
queue
,
@RequestParam
(
value
=
"queueName"
)
String
queueName
)
{
logger
.
info
(
"login user {}, create queue, queue: {}, queueName: {}"
,
loginUser
.
getUserName
(),
queue
,
queueName
);
try
{
Map
<
String
,
Object
>
result
=
queueService
.
createQueue
(
loginUser
,
queue
,
queueName
);
return
returnDataList
(
result
);
}
catch
(
Exception
e
){
logger
.
error
(
CREATE_QUEUE_ERROR
.
getMsg
(),
e
);
return
error
(
CREATE_QUEUE_ERROR
.
getCode
(),
CREATE_QUEUE_ERROR
.
getMsg
());
}
}
/**
* update queue
*
* @param loginUser
* @param queue
* @param queueName
* @return
*/
@PostMapping
(
value
=
"/update"
)
@ResponseStatus
(
HttpStatus
.
CREATED
)
public
Result
updateQueue
(
@RequestAttribute
(
value
=
Constants
.
SESSION_USER
)
User
loginUser
,
@RequestParam
(
value
=
"id"
)
int
id
,
@RequestParam
(
value
=
"queue"
)
String
queue
,
@RequestParam
(
value
=
"queueName"
)
String
queueName
)
{
logger
.
info
(
"login user {}, update queue, id: {}, queue: {}, queueName: {}"
,
loginUser
.
getUserName
(),
id
,
queue
,
queueName
);
try
{
Map
<
String
,
Object
>
result
=
queueService
.
updateQueue
(
loginUser
,
id
,
queue
,
queueName
);
return
returnDataList
(
result
);
}
catch
(
Exception
e
){
logger
.
error
(
UPDATE_QUEUE_ERROR
.
getMsg
(),
e
);
return
error
(
UPDATE_QUEUE_ERROR
.
getCode
(),
UPDATE_QUEUE_ERROR
.
getMsg
());
}
}
}
escheduler-api/src/main/java/cn/escheduler/api/service/QueueService.java
浏览文件 @
6548195a
...
...
@@ -18,12 +18,15 @@ package cn.escheduler.api.service;
import
cn.escheduler.api.enums.Status
;
import
cn.escheduler.api.utils.Constants
;
import
cn.escheduler.api.utils.PageInfo
;
import
cn.escheduler.dao.mapper.QueueMapper
;
import
cn.escheduler.dao.model.Queue
;
import
cn.escheduler.dao.model.User
;
import
org.apache.commons.lang.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
java.util.Date
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
...
...
@@ -57,4 +60,104 @@ public class QueueService extends BaseService{
return
result
;
}
/**
* query queue list paging
* @param loginUser
* @param searchVal
* @param pageNo
* @param pageSize
* @return
*/
public
Map
<
String
,
Object
>
queryList
(
User
loginUser
,
String
searchVal
,
Integer
pageNo
,
Integer
pageSize
)
{
Map
<
String
,
Object
>
result
=
new
HashMap
<>(
5
);
if
(
checkAdmin
(
loginUser
,
result
))
{
return
result
;
}
Integer
count
=
queueMapper
.
countQueuePaging
(
searchVal
);
PageInfo
<
Queue
>
pageInfo
=
new
PageInfo
<>(
pageNo
,
pageSize
);
List
<
Queue
>
queueList
=
queueMapper
.
queryQueuePaging
(
searchVal
,
pageInfo
.
getStart
(),
pageSize
);
pageInfo
.
setTotalCount
(
count
);
pageInfo
.
setLists
(
queueList
);
result
.
put
(
Constants
.
DATA_LIST
,
queueList
);
putMsg
(
result
,
Status
.
SUCCESS
);
return
result
;
}
public
Map
<
String
,
Object
>
createQueue
(
User
loginUser
,
String
queue
,
String
queueName
)
{
Map
<
String
,
Object
>
result
=
new
HashMap
<>(
5
);
if
(
checkAdmin
(
loginUser
,
result
))
{
return
result
;
}
if
(
checkQueueExists
(
queue
)){
putMsg
(
result
,
Status
.
QUEUE_EXIST
,
queue
);
return
result
;
}
Queue
queueObj
=
new
Queue
();
Date
now
=
new
Date
();
queueObj
.
setQueue
(
queue
);
queueObj
.
setQueueName
(
queueName
);
queueObj
.
setCreateTime
(
now
);
queueObj
.
setUpdateTime
(
now
);
queueMapper
.
insert
(
queueObj
);
putMsg
(
result
,
Status
.
SUCCESS
);
return
result
;
}
public
Map
<
String
,
Object
>
updateQueue
(
User
loginUser
,
int
id
,
String
queue
,
String
queueName
)
{
Map
<
String
,
Object
>
result
=
new
HashMap
<>(
5
);
if
(
checkAdmin
(
loginUser
,
result
))
{
return
result
;
}
Queue
queueObj
=
queueMapper
.
queryById
(
id
);
if
(
queueObj
==
null
)
{
putMsg
(
result
,
Status
.
QUEUE_NOT_EXIST
,
id
);
return
result
;
}
//update queue
if
(
StringUtils
.
isNotEmpty
(
queue
))
{
if
(!
queue
.
equals
(
queueObj
.
getQueue
())
&&
checkQueueExists
(
queue
))
{
putMsg
(
result
,
Status
.
QUEUE_EXIST
,
queue
);
return
result
;
}
queueObj
.
setQueue
(
queue
);
}
if
(
StringUtils
.
isNotEmpty
(
queueName
))
{
queueObj
.
setQueueName
(
queueName
);
}
Date
now
=
new
Date
();
queueObj
.
setUpdateTime
(
now
);
queueMapper
.
update
(
queueObj
);
putMsg
(
result
,
Status
.
SUCCESS
);
return
result
;
}
/**
* check queue exists
*
* @param queue
* @return
*/
private
boolean
checkQueueExists
(
String
queue
)
{
return
queueMapper
.
queryByQueue
(
queue
)
==
null
?
false
:
true
;
}
}
escheduler-api/src/test/java/cn/escheduler/api/controller/QueueControllerTest.java
浏览文件 @
6548195a
...
...
@@ -32,9 +32,12 @@ import org.springframework.test.context.junit4.SpringRunner;
import
org.springframework.test.web.servlet.MockMvc
;
import
org.springframework.test.web.servlet.MvcResult
;
import
org.springframework.test.web.servlet.setup.MockMvcBuilders
;
import
org.springframework.util.LinkedMultiValueMap
;
import
org.springframework.util.MultiValueMap
;
import
org.springframework.web.context.WebApplicationContext
;
import
static
org
.
springframework
.
test
.
web
.
servlet
.
request
.
MockMvcRequestBuilders
.
get
;
import
static
org
.
springframework
.
test
.
web
.
servlet
.
request
.
MockMvcRequestBuilders
.
post
;
import
static
org
.
springframework
.
test
.
web
.
servlet
.
result
.
MockMvcResultMatchers
.
content
;
import
static
org
.
springframework
.
test
.
web
.
servlet
.
result
.
MockMvcResultMatchers
.
status
;
...
...
@@ -65,4 +68,61 @@ public class QueueControllerTest {
Assert
.
assertEquals
(
Status
.
SUCCESS
.
getCode
(),
result
.
getCode
().
intValue
());
logger
.
info
(
mvcResult
.
getResponse
().
getContentAsString
());
}
@Test
public
void
queryPagingList
()
throws
Exception
{
MultiValueMap
<
String
,
String
>
paramsMap
=
new
LinkedMultiValueMap
<>();
//paramsMap.add("processInstanceId","1380");
paramsMap
.
add
(
"searchVal"
,
""
);
paramsMap
.
add
(
"pageNo"
,
"1"
);
paramsMap
.
add
(
"pageSize"
,
"20"
);
MvcResult
mvcResult
=
mockMvc
.
perform
(
get
(
"/queue/list-paging"
)
.
header
(
"sessionId"
,
"d4541e0d-0349-4f05-9c68-300176cd3c91"
)
.
params
(
paramsMap
))
.
andExpect
(
status
().
isOk
())
.
andExpect
(
content
().
contentType
(
MediaType
.
APPLICATION_JSON_UTF8
))
.
andReturn
();
Result
result
=
JSONUtils
.
parseObject
(
mvcResult
.
getResponse
().
getContentAsString
(),
Result
.
class
);
Assert
.
assertEquals
(
Status
.
SUCCESS
.
getCode
(),
result
.
getCode
().
intValue
());
logger
.
info
(
mvcResult
.
getResponse
().
getContentAsString
());
}
@Test
public
void
createQueue
()
throws
Exception
{
MultiValueMap
<
String
,
String
>
paramsMap
=
new
LinkedMultiValueMap
<>();
paramsMap
.
add
(
"queue"
,
"ait1111"
);
paramsMap
.
add
(
"queueName"
,
"aitName"
);
MvcResult
mvcResult
=
mockMvc
.
perform
(
post
(
"/queue/create"
)
.
header
(
"sessionId"
,
"d4541e0d-0349-4f05-9c68-300176cd3c91"
)
.
params
(
paramsMap
))
.
andExpect
(
status
().
isCreated
())
.
andExpect
(
content
().
contentType
(
MediaType
.
APPLICATION_JSON_UTF8
))
.
andReturn
();
Result
result
=
JSONUtils
.
parseObject
(
mvcResult
.
getResponse
().
getContentAsString
(),
Result
.
class
);
//Assert.assertEquals(Status.SUCCESS.getCode(),result.getCode().intValue());
logger
.
info
(
mvcResult
.
getResponse
().
getContentAsString
());
}
@Test
public
void
updateQueue
()
throws
Exception
{
MultiValueMap
<
String
,
String
>
paramsMap
=
new
LinkedMultiValueMap
<>();
paramsMap
.
add
(
"id"
,
"2"
);
paramsMap
.
add
(
"queue"
,
"ait1"
);
paramsMap
.
add
(
"queueName"
,
"aitName"
);
MvcResult
mvcResult
=
mockMvc
.
perform
(
post
(
"/queue/update"
)
.
header
(
"sessionId"
,
"d4541e0d-0349-4f05-9c68-300176cd3c91"
)
.
params
(
paramsMap
))
.
andExpect
(
status
().
isCreated
())
.
andExpect
(
content
().
contentType
(
MediaType
.
APPLICATION_JSON_UTF8
))
.
andReturn
();
Result
result
=
JSONUtils
.
parseObject
(
mvcResult
.
getResponse
().
getContentAsString
(),
Result
.
class
);
//Assert.assertEquals(Status.SUCCESS.getCode(),result.getCode().intValue());
logger
.
info
(
mvcResult
.
getResponse
().
getContentAsString
());
}
}
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录