Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
xiaofang li
MeterSphere
Commits
990705be
Commit
990705be
authored
4 years ago
by
fit2-zhao
Committed by
fit2-zhao
4 years ago
Browse files
Options
Download
Email Patches
Plain Diff
fix(接口测试): 执行时更改报告状态增加保护
parent
53916b8d
v1.10
pr@v1.10@feat_参数添加长度描述
pr@v1.10@feat_同步禅道缺陷
pr@v1.10@feat_同步第三方平台缺陷状态
pr@v1.10@fix_
pr@v1.10@fix_32
pr@v1.10@fix_APIBackendListenerClient优化
pr@v1.10@fix_api_homepage
pr@v1.10@fix_bug09
pr@v1.10@fix_bug3307dev_bug
pr@v1.10@fix_jira提交空的非必填字段报错
pr@v1.10@fix_postman导入报错
pr@v1.10@fix_sql脚本中带了库名
pr@v1.10@fix_swagger导入报错
pr@v1.10@fix_swagger未导入到指定模块
pr@v1.10@fix_修改SQL中大小写与实际表名不一致问题
pr@v1.10@fix_修改prometheus内存使用率查询公式
pr@v1.10@fix_删除用例后数量统计错误
pr@v1.10@fix_删除项目清理定时任务
pr@v1.10@fix_同步缺陷失败
pr@v1.10@fix_回退问题PR
pr@v1.10@fix_失败继续无效
pr@v1.10@fix_导出场景文件名为null
pr@v1.10@fix_开多个窗口编辑场景样式错乱
pr@v1.10@fix_批量操作数量显示错误
pr@v1.10@fix_接口定义_列表筛选
pr@v1.10@fix_接口定义导入用例id重复
pr@v1.10@fix_接口导入MS格式报空指针
pr@v1.10@fix_接口模块名带有斜杠导出导入异常
pr@v1.10@fix_操作日志列表报错
pr@v1.10@fix_测试用例关联缺陷列表状态没更新
pr@v1.10@fix_测试用例导入更新文本错误
pr@v1.10@fix_测试用例显示了已删除的缺陷
pr@v1.10@fix_测试计划-场景测试执行结果筛选失败
pr@v1.10@fix_测试计划-用例状态过滤失效
pr@v1.10@fix_测试计划报告报错
pr@v1.10@fix_测试计划页面优化
pr@v1.10@fix_用例导入文件限制改为100M
pr@v1.10@fix_用例导入无法显示责任人
pr@v1.10@fix_编辑场景滑动滚动条控制台报错
pr@v1.10@fix_编辑用例点击关联缺陷缺少数据
pr@v1.10@fix_脑图创建用例自定义ID为空
pr@v1.10@fix_脑图无法删除用例
pr@v1.10@fix_自定义表头国际化问题
pr@v1.10@fix_选中模块后删除用例会显示全部用例
pr@v1.10@refactor_jira缺陷描述支持图片
pr@v1.10@refactor_postman导入变量格式转换
pr@v1.10@refactor_tapd详情支持图片
pr@v1.10@refactor_勾选批量操作提示
pr@v1.10@refactor_右上角的帮助文档,修改为新页面打开
pr@v1.10@refactor_场景导入页面高度优化
pr@v1.10@refactor_接口定时任务编辑页面样式优化
pr@v1.10@refactor_测试用例页面创建人显示名称
pr@v1.10@refactor_用例上传大小限制改为50M
pr@v1.10@refactor_缺陷列表增加用例数字段
pr@v1.10@refactor_缺陷列表添加过滤排序条件
pr@v1.10@refactor_缺陷列表点击关联用例跳转到用例列表过滤
pr@v1.10@refactor_规范建表语句
pr@v1.10@refactor_重构测试计划-场景测试
pr@v1.10@refactor_重构测试计划-性能测试页面
pr@v1.10@refactor_重构测试计划-接口测试页面
pr@v1.10@refactor_首页定时任务展示优化
pr@v1.10@style_调整多处样式使布局更加紧凑
pr@v1.10@去掉测试跟踪及接口测试首页tips
pr@v1.10@构建完成后清理构建产物
pr@v1.10@编辑用例页面mock显示优化
prv1.10@fix_测试跟踪_变更历史
repr@dev_v1.10@678b9a6a3a9c4636aa1b9493850d60c4a6aed2df@fix_接口模块名带有斜杠导出导入异常
repr@dev_v1.10@70bf87ed@fix_接口自动化_场景步骤
repr@dev_v1.10@82e11e464edb0da216c6660c8ffde45819d27570@refactor_重构测试计划-接口测试页面
repr@dev_v1.10@cfebb59139baf5d4375384a15872ba6f90a7c6f1@refactor_重构测试计划-场景测试
repr@dev_v1.10@e9fceb49@fix_接口自动化_提示
repr@v1.10_dev@10e3fbec@fix_api_homepage
v1.10.11-lts
v1.10.10-lts
v1.10.9-lts
v1.10.8-lts
v1.10.7-lts
v1.10.7-lts-rc2
v1.10.7-lts-rc1
v1.10.6
v1.10.6-rc2
v1.10.6-rc1
v1.10.6-lts
v1.10.5
v1.10.5-rc1
v1.10.5-lts
v1.10.4
v1.10.4-rc2
v1.10.4-rc1
v1.10.4-lts
v1.10.3
v1.10.3-rc3
v1.10.3-rc2
v1.10.3-rc1
v1.10.3-lts
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java
+25
-23
.../io/metersphere/api/service/ApiScenarioReportService.java
with
25 additions
and
23 deletions
+25
-23
backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java
+
25
-
23
View file @
990705be
...
...
@@ -337,26 +337,28 @@ public class ApiScenarioReportService {
}
catch
(
Exception
e
)
{
list
.
add
(
reportId
);
}
ApiScenarioReportExample
scenarioReportExample
=
new
ApiScenarioReportExample
();
scenarioReportExample
.
createCriteria
().
andIdIn
(
list
);
List
<
ApiScenarioReport
>
reportList
=
apiScenarioReportMapper
.
selectByExample
(
scenarioReportExample
);
SqlSession
sqlSession
=
sqlSessionFactory
.
openSession
(
ExecutorType
.
BATCH
);
ApiScenarioReportMapper
scenarioReportMapper
=
sqlSession
.
getMapper
(
ApiScenarioReportMapper
.
class
);
if
(
CollectionUtils
.
isNotEmpty
(
reportList
))
{
reportList
.
forEach
(
report
->
{
report
.
setUpdateTime
(
System
.
currentTimeMillis
());
String
status
=
"Error"
;
report
.
setStatus
(
status
);
scenarioReportMapper
.
updateByPrimaryKeySelective
(
report
);
// 把上一条调试的数据内容清空
ApiScenarioReport
prevResult
=
extApiScenarioReportMapper
.
selectPreviousReportByScenarioId
(
report
.
getScenarioId
(),
reportId
);
if
(
prevResult
!=
null
)
{
ApiScenarioReportDetailExample
example
=
new
ApiScenarioReportDetailExample
();
example
.
createCriteria
().
andReportIdEqualTo
(
prevResult
.
getId
());
apiScenarioReportDetailMapper
.
deleteByExample
(
example
);
}
});
sqlSession
.
flushStatements
();
if
(
CollectionUtils
.
isNotEmpty
(
list
))
{
ApiScenarioReportExample
scenarioReportExample
=
new
ApiScenarioReportExample
();
scenarioReportExample
.
createCriteria
().
andIdIn
(
list
);
List
<
ApiScenarioReport
>
reportList
=
apiScenarioReportMapper
.
selectByExample
(
scenarioReportExample
);
SqlSession
sqlSession
=
sqlSessionFactory
.
openSession
(
ExecutorType
.
BATCH
);
ApiScenarioReportMapper
scenarioReportMapper
=
sqlSession
.
getMapper
(
ApiScenarioReportMapper
.
class
);
if
(
CollectionUtils
.
isNotEmpty
(
reportList
))
{
reportList
.
forEach
(
report
->
{
report
.
setUpdateTime
(
System
.
currentTimeMillis
());
String
status
=
"Error"
;
report
.
setStatus
(
status
);
scenarioReportMapper
.
updateByPrimaryKeySelective
(
report
);
// 把上一条调试的数据内容清空
ApiScenarioReport
prevResult
=
extApiScenarioReportMapper
.
selectPreviousReportByScenarioId
(
report
.
getScenarioId
(),
reportId
);
if
(
prevResult
!=
null
)
{
ApiScenarioReportDetailExample
example
=
new
ApiScenarioReportDetailExample
();
example
.
createCriteria
().
andReportIdEqualTo
(
prevResult
.
getId
());
apiScenarioReportDetailMapper
.
deleteByExample
(
example
);
}
});
sqlSession
.
flushStatements
();
}
}
}
}
...
...
@@ -413,9 +415,9 @@ public class ApiScenarioReportService {
testResult
.
setScenarioSuccess
(
testResult
.
getScenarioSuccess
()
+
scenarioResult
.
getScenarioSuccess
());
testResult
.
setScenarioError
(
testResult
.
getScenarioError
()
+
scenarioResult
.
getScenarioError
());
testResult
.
setConsole
(
scenarioResult
.
getConsole
());
testResult
.
setScenarioStepError
(
scenarioResult
.
getScenarioStepError
()
+
testResult
.
getScenarioStepError
());
testResult
.
setScenarioStepSuccess
(
scenarioResult
.
getScenarioStepSuccess
()
+
testResult
.
getScenarioStepSuccess
());
testResult
.
setScenarioStepTotal
(
scenarioResult
.
getScenarioStepTotal
()
+
testResult
.
getScenarioStepTotal
());
testResult
.
setScenarioStepError
(
scenarioResult
.
getScenarioStepError
()
+
testResult
.
getScenarioStepError
());
testResult
.
setScenarioStepSuccess
(
scenarioResult
.
getScenarioStepSuccess
()
+
testResult
.
getScenarioStepSuccess
());
testResult
.
setScenarioStepTotal
(
scenarioResult
.
getScenarioStepTotal
()
+
testResult
.
getScenarioStepTotal
());
}
catch
(
Exception
e
)
{
LogUtil
.
error
(
e
.
getMessage
());
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help