Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
MeterSphere
metersphere
提交
8456c4c5
M
metersphere
项目概览
MeterSphere
/
metersphere
上一次同步 大约 3 年
通知
25
Star
1
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
metersphere
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
8456c4c5
编写于
7月 01, 2020
作者:
W
wenyann
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
jenkins相关接口
上级
a9f81bc5
变更
17
隐藏空白更改
内联
并排
Showing
17 changed file
with
138 addition
and
11 deletion
+138
-11
backend/src/main/java/io/metersphere/api/controller/APITestController.java
...java/io/metersphere/api/controller/APITestController.java
+5
-3
backend/src/main/java/io/metersphere/api/service/APITestService.java
.../main/java/io/metersphere/api/service/APITestService.java
+2
-2
backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestMapper.xml
.../java/io/metersphere/base/mapper/ext/ExtApiTestMapper.xml
+1
-1
backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.java
...ava/io/metersphere/base/mapper/ext/ExtTestCaseMapper.java
+3
-0
backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
...java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
+19
-0
backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.java
...etersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.java
+2
-0
backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
...metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
+36
-0
backend/src/main/java/io/metersphere/controller/ProjectController.java
...ain/java/io/metersphere/controller/ProjectController.java
+8
-0
backend/src/main/java/io/metersphere/performance/controller/PerformanceTestController.java
...ere/performance/controller/PerformanceTestController.java
+6
-0
backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java
...tersphere/performance/service/PerformanceTestService.java
+4
-0
backend/src/main/java/io/metersphere/track/controller/TestCaseController.java
...a/io/metersphere/track/controller/TestCaseController.java
+17
-0
backend/src/main/java/io/metersphere/track/controller/TestCaseNodeController.java
.../metersphere/track/controller/TestCaseNodeController.java
+1
-1
backend/src/main/java/io/metersphere/track/controller/TestPlanController.java
...a/io/metersphere/track/controller/TestPlanController.java
+9
-0
backend/src/main/java/io/metersphere/track/controller/TestPlanTestCaseController.java
...ersphere/track/controller/TestPlanTestCaseController.java
+11
-3
backend/src/main/java/io/metersphere/track/request/testplancase/QueryTestPlanCaseRequest.java
.../track/request/testplancase/QueryTestPlanCaseRequest.java
+2
-0
backend/src/main/java/io/metersphere/track/service/TestCaseService.java
...in/java/io/metersphere/track/service/TestCaseService.java
+7
-1
backend/src/main/java/io/metersphere/track/service/TestPlanTestCaseService.java
...io/metersphere/track/service/TestPlanTestCaseService.java
+5
-0
未找到文件。
backend/src/main/java/io/metersphere/api/controller/APITestController.java
浏览文件 @
8456c4c5
...
...
@@ -45,9 +45,10 @@ public class APITestController {
return
PageUtils
.
setPageInfo
(
page
,
apiTestService
.
list
(
request
));
}
@GetMapping
(
"/list/{projectId}"
)
public
List
<
ApiTest
>
list
(
@PathVariable
String
projectId
)
{
return
apiTestService
.
getApiTestByProjectId
(
projectId
);
/*查询某个api测试状态*/
@GetMapping
(
"/list/all/{testId}"
)
public
ApiTest
list
(
@PathVariable
String
testId
)
{
return
apiTestService
.
getApiTestByProjectId
(
testId
);
}
@PostMapping
(
value
=
"/schedule/update"
)
...
...
@@ -89,4 +90,5 @@ public class APITestController {
public
String
run
(
@RequestBody
SaveAPITestRequest
request
)
{
return
apiTestService
.
run
(
request
);
}
}
backend/src/main/java/io/metersphere/api/service/APITestService.java
浏览文件 @
8456c4c5
...
...
@@ -126,8 +126,8 @@ public class APITestService {
return
apiTest
;
}
public
List
<
ApiTest
>
getApiTestByProjectId
(
String
projec
tId
)
{
return
extApiTestMapper
.
getApiTestByProjectId
(
projec
tId
);
public
ApiTest
getApiTestByProjectId
(
String
tes
tId
)
{
return
apiTestMapper
.
selectByPrimaryKey
(
tes
tId
);
}
public
void
delete
(
String
testId
)
{
...
...
backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestMapper.xml
浏览文件 @
8456c4c5
...
...
@@ -45,7 +45,7 @@
</if>
</select>
<select
id=
"getApiTestByProjectId"
resultType=
"io.metersphere.base.domain.ApiTest"
>
select id,name
select id,name
,status
from api_test
where project_id = #{projectId}
</select>
...
...
backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.java
浏览文件 @
8456c4c5
...
...
@@ -12,4 +12,7 @@ public interface ExtTestCaseMapper {
List
<
TestCase
>
getTestCaseNames
(
@Param
(
"request"
)
QueryTestCaseRequest
request
);
List
<
TestCaseDTO
>
list
(
@Param
(
"request"
)
QueryTestCaseRequest
request
);
List
<
TestCaseDTO
>
listByMethod
(
@Param
(
"request"
)
QueryTestCaseRequest
request
);
}
backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
浏览文件 @
8456c4c5
...
...
@@ -53,4 +53,23 @@
</foreach>
</if>
</select>
<select
id=
"listByMethod"
resultType=
"io.metersphere.track.dto.TestCaseDTO"
>
select test_case.* from test_case
<where>
<if
test=
"request.method != null"
>
and test_case.method =#{request.method}
</if>
<if
test=
"request.nodeIds != null and request.nodeIds.size() > 0"
>
and test_case.node_id in
<foreach
collection=
"request.nodeIds"
item=
"nodeId"
separator=
","
open=
"("
close=
")"
>
#{nodeId}
</foreach>
</if>
<if
test=
"request.projectId != null"
>
and test_case.project_id = #{request.projectId}
</if>
</where>
</select>
</mapper>
\ No newline at end of file
backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.java
浏览文件 @
8456c4c5
...
...
@@ -16,6 +16,8 @@ public interface ExtTestPlanTestCaseMapper {
List
<
TestPlanCaseDTO
>
list
(
@Param
(
"request"
)
QueryTestPlanCaseRequest
request
);
List
<
TestPlanCaseDTO
>
listByNode
(
@Param
(
"request"
)
QueryTestPlanCaseRequest
request
);
List
<
String
>
findRelateTestPlanId
(
@Param
(
"userId"
)
String
userId
,
@Param
(
"workspaceId"
)
String
workspaceId
);
List
<
TestPlanCaseDTO
>
getRecentTestedTestCase
(
@Param
(
"request"
)
QueryTestPlanCaseRequest
request
);
...
...
backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
浏览文件 @
8456c4c5
...
...
@@ -63,6 +63,42 @@
</foreach>
</if>
</select>
<select
id=
"listByNode"
resultType=
"io.metersphere.track.dto.TestPlanCaseDTO"
>
select test_plan_test_case.*, test_case.*
from test_plan_test_case
inner join test_case on test_plan_test_case.case_id = test_case.id
<where>
<if
test=
"request.name != null"
>
and test_case.name like CONCAT('%', #{request.name},'%')
</if>
<if
test=
"request.id != null"
>
and test_case.id = #{request.id}
</if>
<if
test=
"request.node != null"
>
and test_case.node_id =#{request.node}
</if>
<if
test=
"request.status != null"
>
and test_plan_test_case.status = #{request.status}
</if>
<if
test=
"request.executor != null"
>
and test_plan_test_case.executor = #{request.executor}
</if>
<if
test=
"request.planId != null"
>
and test_plan_test_case.plan_id = #{request.planId}
</if>
<if
test=
"request.filters != null and request.filters.size() > 0"
>
<foreach
collection=
"request.filters.entrySet()"
index=
"key"
item=
"values"
>
<if
test=
"values != null and values.size() > 0"
>
and ${key} in
<foreach
collection=
"values"
item=
"value"
separator=
","
open=
"("
close=
")"
>
#{value}
</foreach>
</if>
</foreach>
</if>
</where>
</select>
<select
id=
"findRelateTestPlanId"
resultType=
"java.lang.String"
>
select distinct plan_id from test_plan_test_case
...
...
backend/src/main/java/io/metersphere/controller/ProjectController.java
浏览文件 @
8456c4c5
...
...
@@ -31,6 +31,14 @@ public class ProjectController {
return
projectService
.
getProjectList
(
request
);
}
/*jenkins项目列表*/
@GetMapping
(
"/listAll/{workspaceId}"
)
public
List
<
ProjectDTO
>
jlistAll
(
@PathVariable
String
workspaceId
)
{
ProjectRequest
request
=
new
ProjectRequest
();
request
.
setWorkspaceId
(
workspaceId
);
return
projectService
.
getProjectList
(
request
);
}
@GetMapping
(
"/recent/{count}"
)
@RequiresRoles
(
value
=
{
RoleConstants
.
TEST_MANAGER
,
RoleConstants
.
TEST_USER
,
RoleConstants
.
TEST_VIEWER
},
logical
=
Logical
.
OR
)
public
List
<
Project
>
recentProjects
(
@PathVariable
int
count
)
{
...
...
backend/src/main/java/io/metersphere/performance/controller/PerformanceTestController.java
浏览文件 @
8456c4c5
...
...
@@ -54,6 +54,12 @@ public class PerformanceTestController {
return
performanceTestService
.
getLoadTestByProjectId
(
projectId
);
}
/*查询某个测试状态*/
@GetMapping
(
"/list/all/{testId}"
)
public
LoadTest
listByTestId
(
@PathVariable
String
testId
)
{
return
performanceTestService
.
getLoadTestBytestId
(
testId
);
}
@PostMapping
(
value
=
"/save"
,
consumes
=
{
"multipart/form-data"
})
public
String
save
(
@RequestPart
(
"request"
)
SaveTestPlanRequest
request
,
...
...
backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java
浏览文件 @
8456c4c5
...
...
@@ -339,6 +339,10 @@ public class PerformanceTestService {
return
extLoadTestMapper
.
getLoadTestByProjectId
(
projectId
);
}
public
LoadTest
getLoadTestBytestId
(
String
testId
)
{
return
loadTestMapper
.
selectByPrimaryKey
(
testId
);
}
public
void
copy
(
SaveTestPlanRequest
request
)
{
// copy test
LoadTestWithBLOBs
copy
=
loadTestMapper
.
selectByPrimaryKey
(
request
.
getId
());
...
...
backend/src/main/java/io/metersphere/track/controller/TestCaseController.java
浏览文件 @
8456c4c5
...
...
@@ -36,6 +36,23 @@ public class TestCaseController {
return
PageUtils
.
setPageInfo
(
page
,
testCaseService
.
listTestCase
(
request
));
}
@GetMapping
(
"/list/{projectId}"
)
public
List
<
TestCaseDTO
>
list
(
@PathVariable
String
projectId
)
{
QueryTestCaseRequest
request
=
new
QueryTestCaseRequest
();
request
.
setProjectId
(
projectId
);
return
testCaseService
.
listTestCase
(
request
);
}
/*项目下自动测试用例*/
@GetMapping
(
"/list/method/{projectId}"
)
public
List
<
TestCaseDTO
>
listByMethod
(
@PathVariable
String
projectId
)
{
QueryTestCaseRequest
request
=
new
QueryTestCaseRequest
();
request
.
setProjectId
(
projectId
);
request
.
setMethod
(
"auto"
);
return
testCaseService
.
listTestCaseMthod
(
request
);
}
@GetMapping
(
"recent/{count}"
)
public
List
<
TestCase
>
recentTestPlans
(
@PathVariable
int
count
)
{
String
currentWorkspaceId
=
SessionUtils
.
getCurrentWorkspaceId
();
...
...
backend/src/main/java/io/metersphere/track/controller/TestCaseNodeController.java
浏览文件 @
8456c4c5
...
...
@@ -23,7 +23,7 @@ public class TestCaseNodeController {
public
List
<
TestCaseNodeDTO
>
getNodeByProjectId
(
@PathVariable
String
projectId
){
return
testCaseNodeService
.
getNodeTreeByProjectId
(
projectId
);
}
/*模块列表列表*/
@GetMapping
(
"/list/all/plan/{planId}"
)
public
List
<
TestCaseNodeDTO
>
getAllNodeByPlanId
(
@PathVariable
String
planId
){
return
testCaseNodeService
.
getAllNodeByPlanId
(
planId
);
...
...
backend/src/main/java/io/metersphere/track/controller/TestPlanController.java
浏览文件 @
8456c4c5
...
...
@@ -35,6 +35,15 @@ public class TestPlanController {
return
PageUtils
.
setPageInfo
(
page
,
testPlanService
.
listTestPlan
(
request
));
}
/*jenkins测试计划*/
@GetMapping
(
"/list/all/{projectId}/{workspaceId}"
)
public
List
<
TestPlanDTO
>
listByprojectId
(
@PathVariable
String
projectId
,
@PathVariable
String
workspaceId
)
{
QueryTestPlanRequest
request
=
new
QueryTestPlanRequest
();
request
.
setWorkspaceId
(
workspaceId
);
request
.
setProjectId
(
projectId
);
return
testPlanService
.
listTestPlan
(
request
);
}
@PostMapping
(
"/list/all"
)
public
List
<
TestPlan
>
listAll
()
{
String
currentWorkspaceId
=
SessionUtils
.
getCurrentWorkspaceId
();
...
...
backend/src/main/java/io/metersphere/track/controller/TestPlanTestCaseController.java
浏览文件 @
8456c4c5
...
...
@@ -26,18 +26,26 @@ public class TestPlanTestCaseController {
TestPlanTestCaseService
testPlanTestCaseService
;
@PostMapping
(
"/list/{goPage}/{pageSize}"
)
public
Pager
<
List
<
TestPlanCaseDTO
>>
getTestPlanCases
(
@PathVariable
int
goPage
,
@PathVariable
int
pageSize
,
@RequestBody
QueryTestPlanCaseRequest
request
){
public
Pager
<
List
<
TestPlanCaseDTO
>>
getTestPlanCases
(
@PathVariable
int
goPage
,
@PathVariable
int
pageSize
,
@RequestBody
QueryTestPlanCaseRequest
request
)
{
Page
<
Object
>
page
=
PageHelper
.
startPage
(
goPage
,
pageSize
,
true
);
return
PageUtils
.
setPageInfo
(
page
,
testPlanTestCaseService
.
list
(
request
));
}
@GetMapping
(
"/list/{planId}/{nodeId}"
)
public
List
<
TestPlanCaseDTO
>
getTestPlanCases
(
@PathVariable
String
planId
,
@PathVariable
String
nodeId
)
{
QueryTestPlanCaseRequest
request
=
new
QueryTestPlanCaseRequest
();
request
.
setPlanId
(
planId
);
request
.
setNode
(
nodeId
);
return
testPlanTestCaseService
.
listByNode
(
request
);
}
@GetMapping
(
"/get/{caseId}"
)
public
TestPlanCaseDTO
getTestPlanCases
(
@PathVariable
String
caseId
){
public
TestPlanCaseDTO
getTestPlanCases
(
@PathVariable
String
caseId
)
{
return
testPlanTestCaseService
.
get
(
caseId
);
}
@PostMapping
(
"recent/{count}"
)
public
List
<
TestPlanCaseDTO
>
getRecentTestCases
(
@PathVariable
int
count
,
@RequestBody
QueryTestPlanCaseRequest
request
){
public
List
<
TestPlanCaseDTO
>
getRecentTestCases
(
@PathVariable
int
count
,
@RequestBody
QueryTestPlanCaseRequest
request
)
{
return
testPlanTestCaseService
.
getRecentTestCases
(
request
,
count
);
}
...
...
backend/src/main/java/io/metersphere/track/request/testplancase/QueryTestPlanCaseRequest.java
浏览文件 @
8456c4c5
...
...
@@ -27,4 +27,6 @@ public class QueryTestPlanCaseRequest extends TestPlanTestCase {
private
String
name
;
private
String
status
;
private
String
node
;
}
backend/src/main/java/io/metersphere/track/service/TestCaseService.java
浏览文件 @
8456c4c5
...
...
@@ -125,14 +125,20 @@ public class TestCaseService {
return
extTestCaseMapper
.
list
(
request
);
}
public
List
<
TestCaseDTO
>
listTestCaseMthod
(
QueryTestCaseRequest
request
)
{
return
extTestCaseMapper
.
listByMethod
(
request
);
}
/**
* 获取测试用例
* 过滤已关联
*
* @param request
* @return
*/
public
List
<
TestCase
>
getTestCaseNames
(
QueryTestCaseRequest
request
)
{
if
(
StringUtils
.
isNotBlank
(
request
.
getPlanId
())
)
{
if
(
StringUtils
.
isNotBlank
(
request
.
getPlanId
())
)
{
TestPlan
testPlan
=
testPlanMapper
.
selectByPrimaryKey
(
request
.
getPlanId
());
request
.
setProjectId
(
testPlan
.
getProjectId
());
}
...
...
backend/src/main/java/io/metersphere/track/service/TestPlanTestCaseService.java
浏览文件 @
8456c4c5
...
...
@@ -55,6 +55,11 @@ public class TestPlanTestCaseService {
return
list
;
}
public
List
<
TestPlanCaseDTO
>
listByNode
(
QueryTestPlanCaseRequest
request
)
{
List
<
TestPlanCaseDTO
>
list
=
extTestPlanTestCaseMapper
.
listByNode
(
request
);
return
list
;
}
public
void
editTestCase
(
TestPlanTestCaseWithBLOBs
testPlanTestCase
)
{
if
(
StringUtils
.
equals
(
TestPlanTestCaseStatus
.
Prepare
.
name
(),
testPlanTestCase
.
getStatus
()))
{
testPlanTestCase
.
setStatus
(
TestPlanTestCaseStatus
.
Underway
.
name
());
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录