From 5be3cf217d2723a36e7f7e25694644c9f73804d8 Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Tue, 11 Jun 2024 10:30:57 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):?=
 =?UTF-8?q?=20=E6=8E=A5=E5=8F=A3=E6=8A=A5=E5=91=8A=E5=81=9C=E6=AD=A2?=
 =?UTF-8?q?=E9=80=82=E9=85=8D=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E7=9A=84?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=8A=A5=E5=91=8A=E5=81=9C=E6=AD=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../metersphere/api/mapper/ExtApiReportMapper.xml |  6 ++++--
 .../api/mapper/ExtApiScenarioReportMapper.xml     | 15 ++++++++++-----
 .../api/service/ApiTaskCenterService.java         | 15 ++++++++++++---
 .../controller/ApiTaskCenterControllerTests.java  |  2 ++
 4 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiReportMapper.xml b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiReportMapper.xml
index c2d5d62ddd..3b6565c7f7 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiReportMapper.xml
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiReportMapper.xml
@@ -212,11 +212,13 @@
         </include>
     </select>
     <select id="getReports" resultType="io.metersphere.api.dto.report.ReportDTO">
-       select distinct ar.* , project.organization_id , a.api_test_case_id as resourceId from api_report ar
+       select distinct ar.* , project.organization_id ,
+        ar.test_plan_case_id as testPlanId,
+        if (ar.test_plan_case_id = 'NONE' , a.api_test_case_id , ar.test_plan_case_id) as resourceId from api_report ar
         LEFT JOIN api_test_case_record a ON ar.id = a.api_report_id
         LEFT JOIN api_test_case c ON a.api_test_case_id = c.id
         left join project on ar.project_id = project.id
-                           where
+        where
         ar.deleted = false and ar.plan = 0
         and ar.start_time BETWEEN #{startTime} AND #{endTime}
         and ar.exec_status in ('PENDING', 'RUNNING', 'RERUNNING')
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioReportMapper.xml b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioReportMapper.xml
index 4407b4970a..f6121a9cbf 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioReportMapper.xml
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioReportMapper.xml
@@ -105,7 +105,10 @@
     </select>
     <select id="getReports" resultType="io.metersphere.api.dto.report.ReportDTO">
 
-        select distinct asr.*, project.organization_id, a.api_scenario_id as resourceId from api_scenario_report asr
+        select distinct asr.*, project.organization_id,
+        asr.test_plan_scenario_id as testPlanId,
+        if (asr.test_plan_scenario_id = 'NONE' , a.api_scenario_id , asr.test_plan_scenario_id) as resourceId
+         from api_scenario_report asr
         left join api_scenario_record a on asr.id = a.api_scenario_report_id
         left JOIN api_scenario s on a.api_scenario_id = s.id
                       left join project on asr.project_id = project.id
@@ -202,10 +205,12 @@
         o.id as organizationId
         from project p
         inner join organization o on p.organization_id = o.id
-        where p.id in
-        <foreach collection="ids" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
+        <if test="ids != null and ids.size() > 0">
+            where p.id in
+            <foreach collection="ids" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
     </select>
     <select id="getScenarioBlob" resultType="io.metersphere.api.domain.ApiScenarioBlob">
         select
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/service/ApiTaskCenterService.java b/backend/services/api-test/src/main/java/io/metersphere/api/service/ApiTaskCenterService.java
index 0c74af2866..81b40004dc 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/service/ApiTaskCenterService.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/service/ApiTaskCenterService.java
@@ -275,6 +275,8 @@ public class ApiTaskCenterService {
                 .collect(Collectors.toMap(ReportDTO::getId, ReportDTO::getIntegrated));
         Map<String, String> resourceIdMap = reports.stream()
                 .collect(Collectors.toMap(ReportDTO::getId, ReportDTO::getResourceId));
+        Map<String, String> testPlanIdMap = reports.stream()
+                .collect(Collectors.toMap(ReportDTO::getId, ReportDTO::getTestPlanId));
         nodesList.parallelStream().forEach(node -> {
             String endpoint = TaskRunnerClient.getEndpoint(node.getIp(), node.getPort());
             //需要去除取消勾选的report
@@ -300,10 +302,17 @@ public class ApiTaskCenterService {
                         TaskInfo taskInfo = taskRequestDTO.getTaskInfo();
                         TaskItem taskItem = new TaskItem();
                         taskItem.setReportId(reportId);
-                        taskItem.setResourceId(resourceIdMap.getOrDefault(reportId, null));
-                        // TODO  这里需要兼容测试计划批量执行的类型
-
                         taskInfo.setResourceType(request.getModuleType());
+                        taskItem.setResourceId(resourceIdMap.getOrDefault(reportId, null));
+                        // 这里需要兼容测试计划批量执行的类型
+                        if (StringUtils.isNotEmpty(testPlanIdMap.get(reportId))
+                                && !StringUtils.equals(testPlanIdMap.get(reportId), "NONE")) {
+                            if (StringUtils.equals(request.getModuleType(), TaskCenterResourceType.API_CASE.toString())) {
+                                taskInfo.setResourceType(ApiExecuteResourceType.TEST_PLAN_API_CASE.name());
+                            } else if (StringUtils.equals(request.getModuleType(), TaskCenterResourceType.API_SCENARIO.toString())) {
+                                taskInfo.setResourceType(ApiExecuteResourceType.TEST_PLAN_API_SCENARIO.name());
+                            }
+                        }
                         taskInfo.getRunModeConfig().setIntegratedReport(integrationMap.get(reportId));
                         if (BooleanUtils.isTrue(integrationMap.get(reportId))) {
                             taskInfo.getRunModeConfig().getCollectionReport().setReportId(reportId);
diff --git a/backend/services/api-test/src/test/java/io/metersphere/api/controller/ApiTaskCenterControllerTests.java b/backend/services/api-test/src/test/java/io/metersphere/api/controller/ApiTaskCenterControllerTests.java
index 7e276d3398..4db0680b0a 100644
--- a/backend/services/api-test/src/test/java/io/metersphere/api/controller/ApiTaskCenterControllerTests.java
+++ b/backend/services/api-test/src/test/java/io/metersphere/api/controller/ApiTaskCenterControllerTests.java
@@ -242,6 +242,7 @@ public class ApiTaskCenterControllerTests extends BaseTest {
             apiReport.setEnvironmentId("api-environment-id" + i);
             apiReport.setRunMode("api-run-mode" + i);
             if (i % 2 == 0) {
+                apiReport.setTestPlanCaseId("task-api-resource-id" + i);
                 apiReport.setStatus(ExecStatus.PENDING.name());
             } else {
                 apiReport.setStatus(ExecStatus.RUNNING.name());
@@ -266,6 +267,7 @@ public class ApiTaskCenterControllerTests extends BaseTest {
             scenarioReport.setCreateUser("admin");
             scenarioReport.setUpdateUser("admin");
             if (i % 2 == 0) {
+                scenarioReport.setTestPlanScenarioId("task-api-resource-id" + i);
                 scenarioReport.setStatus(ExecStatus.PENDING.name());
             } else {
                 scenarioReport.setStatus(ExecStatus.RUNNING.name());