From 0d74d9aac954489d9e22285c425241bc0ad5884d Mon Sep 17 00:00:00 2001 From: fit2-zhao Date: Thu, 23 Dec 2021 18:03:50 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A7=A6=E5=8F=91=E6=96=B9=E5=BC=8F=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --bug=1009180 --user=赵勇 【任务中心】测试计划里，手动点击执行按钮执行接口用例，显示了定时任务触发 https://www.tapd.cn/55049933/s/1086387 --- .../metersphere/api/controller/ApiTestCaseController.java | 2 ++ .../main/java/io/metersphere/api/dto/ApiCaseRunRequest.java | 1 + .../java/io/metersphere/api/exec/api/ApiExecuteService.java | 1 + .../api/service/ApiDefinitionExecResultService.java | 6 +----- .../java/io/metersphere/api/service/ApiTestCaseService.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/src/main/java/io/metersphere/api/controller/ApiTestCaseController.java b/backend/src/main/java/io/metersphere/api/controller/ApiTestCaseController.java index da79ff5da1..e0e7abcf8b 100644 --- a/backend/src/main/java/io/metersphere/api/controller/ApiTestCaseController.java +++ b/backend/src/main/java/io/metersphere/api/controller/ApiTestCaseController.java @@ -12,6 +12,7 @@ import io.metersphere.base.domain.ApiTestCaseWithBLOBs; import io.metersphere.base.domain.ApiTestEnvironment; import io.metersphere.commons.constants.NoticeConstants; import io.metersphere.commons.constants.OperLogConstants; +import io.metersphere.commons.constants.ReportTriggerMode; import io.metersphere.commons.utils.PageUtils; import io.metersphere.commons.utils.Pager; import io.metersphere.controller.request.ResetOrderRequest; @@ -192,6 +193,7 @@ public class ApiTestCaseController { @PostMapping(value = "/batch/run") @MsAuditLog(module = "api_definition_case", type = OperLogConstants.EXECUTE, content = "#msClass.getLogDetails(#request.caseId)", msClass = ApiTestCaseService.class) public void batchRun(@RequestBody ApiCaseRunRequest request) { + request.setTriggerMode(ReportTriggerMode.BATCH.name()); apiTestCaseService.batchRun(request); } diff --git a/backend/src/main/java/io/metersphere/api/dto/ApiCaseRunRequest.java b/backend/src/main/java/io/metersphere/api/dto/ApiCaseRunRequest.java index 81323d7bf5..65c3ecbbe3 100644 --- a/backend/src/main/java/io/metersphere/api/dto/ApiCaseRunRequest.java +++ b/backend/src/main/java/io/metersphere/api/dto/ApiCaseRunRequest.java @@ -11,6 +11,7 @@ import java.util.List; @Setter public class ApiCaseRunRequest { private String reportId; + private String triggerMode; private String id; private List ids; private List orders; diff --git a/backend/src/main/java/io/metersphere/api/exec/api/ApiExecuteService.java b/backend/src/main/java/io/metersphere/api/exec/api/ApiExecuteService.java index 835e528bca..b9228b5897 100644 --- a/backend/src/main/java/io/metersphere/api/exec/api/ApiExecuteService.java +++ b/backend/src/main/java/io/metersphere/api/exec/api/ApiExecuteService.java @@ -91,6 +91,7 @@ public class ApiExecuteService { for (ApiTestCaseWithBLOBs caseWithBLOBs : list) { ApiDefinitionExecResult report = ApiDefinitionExecResultUtil.initBase(caseWithBLOBs.getId(), APITestStatus.Running.name(), null); report.setName(caseWithBLOBs.getName()); + report.setTriggerMode(request.getTriggerMode()); caseWithBLOBs.setLastResultId(report.getId()); caseWithBLOBs.setUpdateTime(System.currentTimeMillis()); caseWithBLOBs.setStatus(APITestStatus.Running.name()); diff --git a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java index 7ad7ebe403..2f1fe350b0 100644 --- a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java +++ b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java @@ -325,11 +325,7 @@ public class ApiDefinitionExecResultService { saveResult.setId(reportId); saveResult.setActuator("LOCAL"); saveResult.setName(item.getName()); - if (StringUtils.equals(type, ApiRunMode.JENKINS_API_PLAN.name())) { - saveResult.setTriggerMode(TriggerMode.API.name()); - } else if (StringUtils.equals(type, ApiRunMode.MANUAL_PLAN.name())) { - saveResult.setTriggerMode(TriggerMode.MANUAL.name()); - } else { + if (StringUtils.equals(type, TriggerMode.SCHEDULE.name())) { saveResult.setTriggerMode(TriggerMode.SCHEDULE.name()); } saveResult.setType(type); diff --git a/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java b/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java index 76fe1dd978..4fbf3c3e00 100644 --- a/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java +++ b/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java @@ -768,7 +768,7 @@ public class ApiTestCaseService { //提前生成报告 ApiDefinitionExecResult report = ApiDefinitionExecResultUtil.add(caseWithBLOBs.getId(), APITestStatus.Running.name(), request.getReportId()); report.setName(caseWithBLOBs.getName()); - report.setTriggerMode(ApiRunMode.API.name()); + report.setTriggerMode(ApiRunMode.JENKINS.name()); report.setType(ApiRunMode.JENKINS.name()); apiDefinitionExecResultMapper.insert(report); //更新接口案例的最后执行状态等信息