Commit 4d976f62 authored by 黎博's avatar 黎博

新增打回次数

parent 63e15758
...@@ -163,6 +163,7 @@ public class PipelineController { ...@@ -163,6 +163,7 @@ public class PipelineController {
if (dingRobotService.getOne(dingRobotQueryWrapper) != null) { if (dingRobotService.getOne(dingRobotQueryWrapper) != null) {
return JsonResult.buildErrorStateResult("项目已存在", false); return JsonResult.buildErrorStateResult("项目已存在", false);
} }
dingRobot.setRepulseNum(0);
boolean dingRobotResult = dingRobotService.save(dingRobot); boolean dingRobotResult = dingRobotService.save(dingRobot);
if (!dingRobotResult) { if (!dingRobotResult) {
return JsonResult.buildErrorStateResult("服务器异常,保存失败!", false); return JsonResult.buildErrorStateResult("服务器异常,保存失败!", false);
......
...@@ -200,6 +200,18 @@ public class JiraController { ...@@ -200,6 +200,18 @@ public class JiraController {
// @RequiresPermissions("qa:process:smoke") // @RequiresPermissions("qa:process:smoke")
@PostMapping("/send/smoking") @PostMapping("/send/smoking")
public JsonResult sendSmokingResult(@RequestBody SendSmokingResultVo sendSmokingResultVo) throws Exception { public JsonResult sendSmokingResult(@RequestBody SendSmokingResultVo sendSmokingResultVo) throws Exception {
if (!sendSmokingResultVo.getResult()) {
// 冒烟测试失败,则记录打回一次
QueryWrapper<DingRobot> dingRobotQueryWrapper = new QueryWrapper<>();
dingRobotQueryWrapper
.eq("project_name", sendSmokingResultVo.getTestProjectName())
.eq("jira_project_key", sendSmokingResultVo.getJiraProjectKey());
DingRobot dingRobot = dingRobotService.getOne(dingRobotQueryWrapper);
if (dingRobot != null) {
dingRobot.setRepulseNum(dingRobot.getRepulseNum() + 1);
dingRobotService.updateById(dingRobot);
}
}
String JQL = "project = " + sendSmokingResultVo.getJiraProjectKey() + " AND resolution = Unresolved AND text ~ \"" String JQL = "project = " + sendSmokingResultVo.getJiraProjectKey() + " AND resolution = Unresolved AND text ~ \""
+ sendSmokingResultVo.getTestProjectName() + "\" ORDER BY priority DESC, updated DESC"; + sendSmokingResultVo.getTestProjectName() + "\" ORDER BY priority DESC, updated DESC";
Iterable<Issue> issues = jiraService.getIssueListByJQL(JQL); Iterable<Issue> issues = jiraService.getIssueListByJQL(JQL);
......
...@@ -44,6 +44,8 @@ public class DingRobot { ...@@ -44,6 +44,8 @@ public class DingRobot {
*/ */
private Integer submitTestInstructionId; private Integer submitTestInstructionId;
private Integer repulseNum;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime; private Date createTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment