From c15a5881c22a0f0576f3524cc77f416a5a16237d Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Wed, 9 Oct 2024 18:17:32 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=8E=A5=E5=8F=A3=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=9C=BA=E6=99=AF=E5=AF=BC=E5=85=A5=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E5=8F=82=E6=95=B0=E6=A8=A1=E5=9D=97=E5=A4=9A=E9=80=89?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ApiScenarioSelectAssociateController.java |  35 ++++
 .../ApiScenarioSelectAssociateDTO.java        |   7 +
 .../api/mapper/ExtApiDefinitionMapper.java    |   7 +-
 .../api/mapper/ExtApiDefinitionMapper.xml     |   8 +-
 .../api/mapper/ExtApiScenarioMapper.java      |   1 +
 .../api/mapper/ExtApiScenarioMapper.xml       |  13 ++
 .../api/mapper/ExtApiTestCaseMapper.xml       |  15 +-
 .../ApiScenarioSelectAssociateService.java    | 192 +++++++++++++++---
 .../service/scenario/ApiScenarioService.java  |  14 +-
 ...cenarioSelectAssociateControllerTests.java | 115 +++++++++++
 10 files changed, 369 insertions(+), 38 deletions(-)
 create mode 100644 backend/services/api-test/src/main/java/io/metersphere/api/controller/scenario/ApiScenarioSelectAssociateController.java
 create mode 100644 backend/services/api-test/src/test/java/io/metersphere/api/controller/ApiScenarioSelectAssociateControllerTests.java

diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/controller/scenario/ApiScenarioSelectAssociateController.java b/backend/services/api-test/src/main/java/io/metersphere/api/controller/scenario/ApiScenarioSelectAssociateController.java
new file mode 100644
index 0000000000..274d791465
--- /dev/null
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/controller/scenario/ApiScenarioSelectAssociateController.java
@@ -0,0 +1,35 @@
+package io.metersphere.api.controller.scenario;
+
+import io.metersphere.api.dto.scenario.ApiScenarioSelectAssociateDTO;
+import io.metersphere.api.dto.scenario.ApiScenarioStepDTO;
+import io.metersphere.api.service.scenario.ApiScenarioSelectAssociateService;
+import io.metersphere.sdk.constants.PermissionConstants;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping(value = "/api/scenario/associate")
+@Tag(name = "接口测试-接口场景管理-场景导入系统参数")
+public class ApiScenarioSelectAssociateController {
+
+    @Resource
+    private ApiScenarioSelectAssociateService apiScenarioSelectAssociateService;
+
+
+    @PostMapping("/all")
+    @Operation(summary = "接口场景管理-场景导入系统参数")
+    @RequiresPermissions(PermissionConstants.PROJECT_API_SCENARIO_UPDATE)
+    public List<ApiScenarioStepDTO> getSelectDto(@Validated @RequestBody Map<String, ApiScenarioSelectAssociateDTO> requestMap) {
+        return apiScenarioSelectAssociateService.getSelectDto(requestMap);
+    }
+}
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/dto/scenario/ApiScenarioSelectAssociateDTO.java b/backend/services/api-test/src/main/java/io/metersphere/api/dto/scenario/ApiScenarioSelectAssociateDTO.java
index c6d698a43b..2b75de620e 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/dto/scenario/ApiScenarioSelectAssociateDTO.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/dto/scenario/ApiScenarioSelectAssociateDTO.java
@@ -1,5 +1,7 @@
 package io.metersphere.api.dto.scenario;
 
+import io.metersphere.api.constants.ApiScenarioStepRefType;
+import io.metersphere.sdk.valid.EnumValue;
 import io.metersphere.system.dto.ModuleSelectDTO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
@@ -29,6 +31,11 @@ public class ApiScenarioSelectAssociateDTO implements Serializable {
     @Schema(description = "模块下的id集合属性", requiredMode = Schema.RequiredMode.REQUIRED)
     private Map<String, ModuleSelectDTO> moduleMaps;
 
+    @Schema(description = "关联类型 COPY:复制  REF:引用")
+    @EnumValue(enumClass = ApiScenarioStepRefType.class)
+    @NotBlank
+    private String refType;
+
     @Schema(description = "关联关系的type(接口定义：API/接口用例：API_CASE/场景：API_SCENARIO)", requiredMode = Schema.RequiredMode.REQUIRED)
     private String associateType;
 
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDefinitionMapper.java b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDefinitionMapper.java
index 293683d1b8..73433bb88e 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDefinitionMapper.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDefinitionMapper.java
@@ -20,6 +20,7 @@ import java.util.List;
 
 public interface ExtApiDefinitionMapper {
     void deleteApiToGc(@Param("ids") List<String> ids, @Param("userId") String userId, @Param("time") long time);
+
     @BaseConditionFilter
     List<ApiDefinitionDTO> list(@Param("request") ApiDefinitionPageRequest request);
 
@@ -94,10 +95,10 @@ public interface ExtApiDefinitionMapper {
 
     List<ApiDefinitionWithBlob> selectApiDefinitionWithBlob(@Param("ids") List<String> ids);
 
-    List<ApiDefinition> selectAllApi(@Param("projectId") String projectId,  @Param("protocols") List<String> protocols);
+    List<ApiDefinition> selectAllApi(@Param("projectId") String projectId, @Param("protocols") List<String> protocols);
 
 
-    List<ApiDefinition> getListBySelectModules(@Param("projectId") String projectId, @Param("moduleIds") List<String> moduleIds,  @Param("protocols") List<String> protocols);
+    List<ApiDefinition> getListBySelectModules(@Param("projectId") String projectId, @Param("moduleIds") List<String> moduleIds, @Param("protocols") List<String> protocols);
 
-    List<ApiDefinition> getListBySelectIds(@Param("ids") List<String> ids,  @Param("protocols") List<String> protocols);
+    List<ApiDefinition> getListBySelectIds(@Param("projectId") String projectId, @Param("ids") List<String> ids, @Param("protocols") List<String> protocols);
 }
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDefinitionMapper.xml b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDefinitionMapper.xml
index 32f8dca35c..9012a46e1d 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDefinitionMapper.xml
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDefinitionMapper.xml
@@ -680,12 +680,14 @@
         </foreach>
     </select>
 
-    <select id="selectAllCase" resultType="io.metersphere.api.domain.ApiDefinition">
+    <select id="selectAllApi" resultType="io.metersphere.api.domain.ApiDefinition">
         select
         api_definition.id,
         api_definition.name,
         api_definition.method,
         api_definition.num,
+        api_definition.project_id,
+        api_definition.version_id,
         api_definition.pos
         from api_definition
         where api_definition.deleted = false
@@ -705,6 +707,8 @@
         api_definition.name,
         api_definition.method,
         api_definition.num,
+        api_definition.project_id,
+        api_definition.version_id,
         api_definition.pos
         from api_definition
         where api_definition.deleted = false
@@ -727,6 +731,8 @@
         api_definition.name,
         api_definition.method,
         api_definition.num,
+        api_definition.project_id,
+        api_definition.version_id,
         api_definition.pos
         from api_definition
         where api_definition.deleted = false
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioMapper.java b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioMapper.java
index d45d8a5c18..d66582d5d1 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioMapper.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioMapper.java
@@ -89,6 +89,7 @@ public interface ExtApiScenarioMapper {
 
     List<ApiScenario> selectAllCase(@Param("isRepeat") boolean isRepeat, @Param("projectId") String projectId, @Param("testPlanId") String testPlanId);
 
+    List<ApiScenario> selectAllCaseExcludeSelf(@Param("projectId") String projectId);
 
     List<ApiScenario> getListBySelectModules(@Param("isRepeat") boolean isRepeat, @Param("projectId") String projectId, @Param("moduleIds") List<String> moduleIds, @Param("testPlanId") String testPlanId);
 
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioMapper.xml b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioMapper.xml
index b82025f538..c8ac6e11b2 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioMapper.xml
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioMapper.xml
@@ -698,6 +698,19 @@
         order by api_scenario.pos asc
     </select>
 
+    <select id="selectAllCaseExcludeSelf" resultType="io.metersphere.api.domain.ApiScenario">
+        select
+        api_scenario.id,
+        api_scenario.name,
+        api_scenario.project_id,
+        api_scenario.num,
+        api_scenario.version_id
+        from api_scenario
+        where api_scenario.deleted = false
+        and api_scenario.project_id = #{projectId}
+        order by api_scenario.pos asc
+    </select>
+
     <select id="getListBySelectModules" resultType="io.metersphere.api.domain.ApiScenario">
         select
         api_scenario.id,
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiTestCaseMapper.xml b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiTestCaseMapper.xml
index 6ba885e051..5d2379385b 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiTestCaseMapper.xml
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiTestCaseMapper.xml
@@ -765,7 +765,12 @@
         select
         api_test_case.id,
         api_test_case.create_user,
-        api_test_case.environment_id
+        api_test_case.environment_id,
+        api_test_case.name,
+        api_test_case.project_id,
+        api_test_case.num,
+        api_test_case.version_id,
+        api_test_case.pos
         from api_test_case
         INNER JOIN api_definition ON api_test_case.api_definition_id = api_definition.id
         where api_test_case.deleted = false
@@ -790,6 +795,10 @@
         api_test_case.id,
         api_test_case.create_user,
         api_test_case.environment_id,
+        api_test_case.name,
+        api_test_case.project_id,
+        api_test_case.num,
+        api_test_case.version_id,
         api_test_case.pos
         from api_test_case
         inner join api_definition on api_definition.id = api_test_case.api_definition_id
@@ -817,6 +826,10 @@
         api_test_case.id,
         api_test_case.create_user,
         api_test_case.environment_id,
+        api_test_case.name,
+        api_test_case.project_id,
+        api_test_case.num,
+        api_test_case.version_id,
         api_test_case.pos
         from api_test_case
         inner join api_definition on api_definition.id = api_test_case.api_definition_id
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/service/scenario/ApiScenarioSelectAssociateService.java b/backend/services/api-test/src/main/java/io/metersphere/api/service/scenario/ApiScenarioSelectAssociateService.java
index ccbeb49f0d..1dbb6c351d 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/service/scenario/ApiScenarioSelectAssociateService.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/service/scenario/ApiScenarioSelectAssociateService.java
@@ -1,11 +1,28 @@
 package io.metersphere.api.service.scenario;
 
+import io.metersphere.api.constants.ApiScenarioStepType;
+import io.metersphere.api.domain.ApiDefinition;
+import io.metersphere.api.domain.ApiScenario;
+import io.metersphere.api.domain.ApiScenarioCsvStep;
+import io.metersphere.api.domain.ApiTestCase;
+import io.metersphere.api.dto.scenario.ApiScenarioSelectAssociateDTO;
+import io.metersphere.api.dto.scenario.ApiScenarioStepCommonDTO;
+import io.metersphere.api.dto.scenario.ApiScenarioStepDTO;
 import io.metersphere.api.mapper.ExtApiDefinitionMapper;
 import io.metersphere.api.mapper.ExtApiScenarioMapper;
+import io.metersphere.api.mapper.ExtApiScenarioStepMapper;
 import io.metersphere.api.mapper.ExtApiTestCaseMapper;
+import io.metersphere.sdk.dto.AssociateCaseDTO;
+import io.metersphere.system.dto.ModuleSelectDTO;
 import jakarta.annotation.Resource;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.BooleanUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
+import java.util.*;
+import java.util.stream.Collectors;
+
 @Service
 public class ApiScenarioSelectAssociateService {
 
@@ -15,30 +32,42 @@ public class ApiScenarioSelectAssociateService {
     private ExtApiTestCaseMapper extApiTestCaseMapper;
     @Resource
     private ExtApiDefinitionMapper extApiDefinitionMapper;
+    @Resource
+    private ApiScenarioService apiScenarioService;
+    @Resource
+    private ExtApiScenarioStepMapper extApiScenarioStepMapper;
+
 
     public static final String MODULE_ALL = "all";
 
 
-    /*public void getSelectDto(ApiScenarioSelectAssociateDTO request) {
+    public List<ApiScenarioStepDTO> getSelectDto(Map<String, ApiScenarioSelectAssociateDTO> request) {
+        List<ApiScenarioStepDTO> steps = new ArrayList<>();
+        for (String key : request.keySet()) {
+            switch (key) {
+                case "SCENARIO":
+                    List<ApiScenarioStepDTO> apiScenarioStepDTOs = handleApiScenarioData(request.get(key));
+                    steps.addAll(apiScenarioStepDTOs);
+                case "CASE":
+                    List<ApiScenarioStepDTO> apiCaseStepDTOs = handleApiCaseData(request.get(key));
+                    steps.addAll(apiCaseStepDTOs);
+                default:
+                    List<ApiScenarioStepDTO> apiStepDTOs = handleApiData(request.get(key));
+                    steps.addAll(apiStepDTOs);
+            }
+        }
+        return steps;
+    }
+
+    private List<ApiScenarioStepDTO> handleApiData(ApiScenarioSelectAssociateDTO request) {
+        List<ApiScenarioStepDTO> steps = new ArrayList<>();
         boolean selectAllModule = request.isSelectAllModule();
         Map<String, ModuleSelectDTO> moduleMaps = request.getModuleMaps();
         moduleMaps.remove(MODULE_ALL);
-
-        switch (request.getAssociateType()) {
-            case "API_SCENARIO":
-                handleApiScenarioData(selectAllModule, moduleMaps, request);
-            case "API_CASE":
-                handleApiCaseData(selectAllModule, moduleMaps, request);
-            default:
-                handleApiData(selectAllModule, moduleMaps, request);
-        }
-
-    }
-
-    private void handleApiData(boolean selectAllModule, Map<String, ModuleSelectDTO> moduleMaps, ApiScenarioSelectAssociateDTO request) {
         if (selectAllModule) {
             // 选择了全部模块
             List<ApiDefinition> apiDefinitionList = extApiDefinitionMapper.selectAllApi(request.getProjectId(), request.getProtocols());
+            getApiSteps(request, apiDefinitionList, steps);
         } else {
             AssociateCaseDTO dto = getCaseIds(moduleMaps);
             List<ApiDefinition> apiDefinitionList = new ArrayList<>();
@@ -50,27 +79,46 @@ public class ApiScenarioSelectAssociateService {
             if (CollectionUtils.isNotEmpty(dto.getSelectIds())) {
                 CollectionUtils.removeAll(dto.getSelectIds(), apiDefinitionList.stream().map(ApiDefinition::getId).toList());
                 //获取选中的ids数据
-                List<ApiDefinition> selectIdList = extApiDefinitionMapper.getListBySelectIds(dto.getSelectIds(), request.getProtocols());
+                List<ApiDefinition> selectIdList = extApiDefinitionMapper.getListBySelectIds(request.getProjectId(), dto.getSelectIds(), request.getProtocols());
                 apiDefinitionList.addAll(selectIdList);
             }
-
             if (CollectionUtils.isNotEmpty(dto.getExcludeIds())) {
                 //排除的ids
                 List<String> excludeIds = dto.getExcludeIds();
                 apiDefinitionList = apiDefinitionList.stream().filter(item -> !excludeIds.contains(item.getId())).toList();
             }
-
             if (CollectionUtils.isNotEmpty(apiDefinitionList)) {
                 List<ApiDefinition> list = apiDefinitionList.stream().sorted(Comparator.comparing(ApiDefinition::getPos)).toList();
+                getApiSteps(request, list, steps);
             }
 
         }
+        return steps;
     }
 
-    private void handleApiCaseData(boolean selectAllModule, Map<String, ModuleSelectDTO> moduleMaps, ApiScenarioSelectAssociateDTO request) {
+    private static void getApiSteps(ApiScenarioSelectAssociateDTO request, List<ApiDefinition> apiDefinitionList, List<ApiScenarioStepDTO> steps) {
+        apiDefinitionList.forEach(item -> {
+            ApiScenarioStepDTO step = new ApiScenarioStepDTO();
+            step.setStepType(ApiScenarioStepType.API.name());
+            step.setName(item.getName());
+            step.setResourceId(item.getId());
+            step.setRefType(request.getRefType());
+            step.setProjectId(item.getProjectId());
+            step.setResourceNum(item.getNum().toString());
+            step.setVersionId(item.getVersionId());
+            steps.add(step);
+        });
+    }
+
+    private List<ApiScenarioStepDTO> handleApiCaseData(ApiScenarioSelectAssociateDTO request) {
+        List<ApiScenarioStepDTO> steps = new ArrayList<>();
+        boolean selectAllModule = request.isSelectAllModule();
+        Map<String, ModuleSelectDTO> moduleMaps = request.getModuleMaps();
+        moduleMaps.remove(MODULE_ALL);
         if (selectAllModule) {
             // 选择了全部模块
             List<ApiTestCase> apiTestCaseList = extApiTestCaseMapper.selectAllApiCase(true, request.getProjectId(), null, request.getProtocols());
+            getCaseSteps(request, apiTestCaseList, steps);
         } else {
             AssociateCaseDTO dto = getCaseIds(moduleMaps);
             List<ApiTestCase> apiTestCaseList = new ArrayList<>();
@@ -94,15 +142,37 @@ public class ApiScenarioSelectAssociateService {
 
             if (CollectionUtils.isNotEmpty(apiTestCaseList)) {
                 List<ApiTestCase> list = apiTestCaseList.stream().sorted(Comparator.comparing(ApiTestCase::getPos)).toList();
+                getCaseSteps(request, list, steps);
             }
 
         }
+
+        return steps;
     }
 
-    private void handleApiScenarioData(boolean selectAllModule, Map<String, ModuleSelectDTO> moduleMaps, ApiScenarioSelectAssociateDTO request) {
+    private static void getCaseSteps(ApiScenarioSelectAssociateDTO request, List<ApiTestCase> apiTestCaseList, List<ApiScenarioStepDTO> steps) {
+        apiTestCaseList.forEach(item -> {
+            ApiScenarioStepDTO step = new ApiScenarioStepDTO();
+            step.setStepType(ApiScenarioStepType.API_CASE.name());
+            step.setName(item.getName());
+            step.setResourceId(item.getId());
+            step.setRefType(request.getRefType());
+            step.setProjectId(item.getProjectId());
+            step.setResourceNum(item.getNum().toString());
+            step.setVersionId(item.getVersionId());
+            steps.add(step);
+        });
+    }
+
+    private List<ApiScenarioStepDTO> handleApiScenarioData(ApiScenarioSelectAssociateDTO request) {
+        List<ApiScenarioStepDTO> steps = new ArrayList<>();
+        boolean selectAllModule = request.isSelectAllModule();
+        Map<String, ModuleSelectDTO> moduleMaps = request.getModuleMaps();
+        moduleMaps.remove(MODULE_ALL);
         if (selectAllModule) {
             // 选择了全部模块
-            List<ApiScenario> scenarioList = extApiScenarioMapper.selectAllCase(true, request.getProjectId(), null);
+            List<ApiScenario> scenarioList = extApiScenarioMapper.selectAllCaseExcludeSelf(request.getProjectId());
+            getScenarioStepDto(request, scenarioList, steps);
         } else {
             AssociateCaseDTO dto = getCaseIds(moduleMaps);
             List<ApiScenario> scenarioList = new ArrayList<>();
@@ -110,31 +180,76 @@ public class ApiScenarioSelectAssociateService {
             if (CollectionUtils.isNotEmpty(dto.getModuleIds())) {
                 scenarioList = extApiScenarioMapper.getListBySelectModules(true, request.getProjectId(), dto.getModuleIds(), null);
             }
-
             if (CollectionUtils.isNotEmpty(dto.getSelectIds())) {
                 CollectionUtils.removeAll(dto.getSelectIds(), scenarioList.stream().map(ApiScenario::getId).toList());
                 //获取选中的ids数据
                 List<ApiScenario> selectIdList = extApiScenarioMapper.getListBySelectIds(request.getProjectId(), dto.getSelectIds(), null);
                 scenarioList.addAll(selectIdList);
             }
-
+            List<String> excludeIds = new ArrayList<>();
+            excludeIds.add(request.getScenarioId());
             if (CollectionUtils.isNotEmpty(dto.getExcludeIds())) {
                 //排除的ids
-                List<String> excludeIds = dto.getExcludeIds();
-                excludeIds.add(request.getScenarioId());
+                excludeIds.addAll(dto.getExcludeIds());
                 scenarioList = scenarioList.stream().filter(item -> !excludeIds.contains(item.getId())).toList();
             }
 
             if (CollectionUtils.isNotEmpty(scenarioList)) {
                 List<ApiScenario> list = scenarioList.stream().sorted(Comparator.comparing(ApiScenario::getPos)).toList();
+                getScenarioStepDto(request, list, steps);
             }
+        }
+        return steps;
+    }
 
+    private void getScenarioStepDto(ApiScenarioSelectAssociateDTO request, List<ApiScenario> scenarioList, List<ApiScenarioStepDTO> steps) {
+        List<String> ids = scenarioList.stream().map(ApiScenario::getId).toList();
+        // 获取所有步骤
+        List<ApiScenarioStepDTO> allSteps = apiScenarioService.getAllStepsByScenarioIds(ids)
+                .stream()
+                .distinct() // 这里可能存在多次引用相同场景，步骤可能会重复，去重
+                .toList();
+
+        // 设置步骤的 csvIds
+        setStepCsvIds(ids, allSteps);
+
+        // 构造 map，key 为场景ID，value 为步骤列表
+        Map<String, List<ApiScenarioStepDTO>> scenarioStepMap = allSteps.stream()
+                .collect(Collectors.groupingBy(step -> Optional.ofNullable(step.getScenarioId()).orElse(StringUtils.EMPTY)));
+
+        // 查询步骤详情
+        Map<String, String> stepDetailMap = apiScenarioService.getPartialRefStepDetailMap(allSteps);
+
+        for (ApiScenario apiScenario : scenarioList) {
+            List<ApiScenarioStepDTO> apiScenarioStepDTOS = scenarioStepMap.get(apiScenario.getId());
+            List<ApiScenarioStepDTO> stepList = new ArrayList<>();
+            if (CollectionUtils.isNotEmpty(apiScenarioStepDTOS)) {
+                Map<String, List<ApiScenarioStepDTO>> currentScenarioParentStepMap = apiScenarioStepDTOS
+                        .stream()
+                        .collect(Collectors.groupingBy(step -> {
+                            if (StringUtils.equals(step.getParentId(), "NONE")) {
+                                step.setParentId(StringUtils.EMPTY);
+                            }
+                            return Optional.ofNullable(step.getParentId()).orElse(StringUtils.EMPTY);
+                        }));
+
+                stepList = apiScenarioService.buildStepTree(currentScenarioParentStepMap.get(StringUtils.EMPTY), currentScenarioParentStepMap, scenarioStepMap, new HashSet<>());
+                // 设置部分引用的步骤的启用状态
+                apiScenarioService.setPartialRefStepsEnable(stepList, stepDetailMap);
+            }
+            ApiScenarioStepDTO step = new ApiScenarioStepDTO();
+            step.setStepType(ApiScenarioStepType.API_SCENARIO.name());
+            step.setName(apiScenario.getName());
+            step.setResourceId(apiScenario.getId());
+            step.setRefType(request.getRefType());
+            step.setProjectId(apiScenario.getProjectId());
+            step.setResourceNum(apiScenario.getNum().toString());
+            step.setVersionId(apiScenario.getVersionId());
+            step.setChildren(stepList);
+            steps.add(step);
         }
     }
 
-    *//**
-     * 获取关联时的相关id数据
-     *//*
     protected AssociateCaseDTO getCaseIds(Map<String, ModuleSelectDTO> moduleMaps) {
         // 排除的ids
         List<String> excludeIds = moduleMaps.values().stream()
@@ -152,6 +267,27 @@ public class ApiScenarioSelectAssociateService {
                 .toList();
 
         return new AssociateCaseDTO(excludeIds, selectIds, moduleIds);
-    }*/
+    }
+
+
+    private void setStepCsvIds(List<String> scenarioIds, List<ApiScenarioStepDTO> allSteps) {
+        List<String> refScenarioIds = allSteps.stream()
+                .filter(apiScenarioService::isRefOrPartialScenario)
+                .map(ApiScenarioStepCommonDTO::getResourceId)
+                .collect(Collectors.toList());
+        refScenarioIds.addAll(scenarioIds);
+
+        //获取所有步骤的csv的关联关系
+        List<ApiScenarioCsvStep> csvSteps = extApiScenarioStepMapper.getCsvStepByScenarioIds(refScenarioIds);
+        // 构造 map，key 为步骤ID，value 为csv文件ID列表
+        Map<String, List<String>> stepsCsvMap = csvSteps.stream()
+                .collect(Collectors.groupingBy(ApiScenarioCsvStep::getStepId, Collectors.mapping(ApiScenarioCsvStep::getFileId, Collectors.toList())));
+
+        //将stepsCsvMap根据步骤id放入到allSteps中
+        if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(allSteps)) {
+            allSteps.forEach(step -> step.setCsvIds(stepsCsvMap.get(step.getId())));
+        }
+    }
+
 
 }
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/service/scenario/ApiScenarioService.java b/backend/services/api-test/src/main/java/io/metersphere/api/service/scenario/ApiScenarioService.java
index f54f4da2b2..7416a6049e 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/service/scenario/ApiScenarioService.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/service/scenario/ApiScenarioService.java
@@ -1393,6 +1393,9 @@ public class ApiScenarioService extends MoveNodeService {
      * 设置部分引用的步骤的启用状态
      */
     private void setChildPartialRefEnable(List<? extends ApiScenarioStepCommonDTO> steps, PartialRefStepDetail partialRefStepDetail) {
+        if (CollectionUtils.isEmpty(steps)) {
+            return;
+        }
         for (ApiScenarioStepCommonDTO step : steps) {
             if (StringUtils.equals(step.getRefType(), ApiScenarioStepRefType.REF.name())) {
                 // 引用的启用不修改
@@ -1429,7 +1432,8 @@ public class ApiScenarioService extends MoveNodeService {
      * @param steps
      * @return
      */
-    private Map<String, String> getPartialRefStepDetailMap(List<? extends ApiScenarioStepCommonDTO> steps) {
+
+    public Map<String, String> getPartialRefStepDetailMap(List<? extends ApiScenarioStepCommonDTO> steps) {
         steps.forEach(step -> {
             if (isPartialRef(step)) {
 
@@ -1671,7 +1675,7 @@ public class ApiScenarioService extends MoveNodeService {
     /**
      * 设置部分引用的步骤的启用状态
      */
-    private void setPartialRefStepsEnable(List<? extends ApiScenarioStepCommonDTO> steps, Map<String, String> stepDetailMap) {
+    public void setPartialRefStepsEnable(List<? extends ApiScenarioStepCommonDTO> steps, Map<String, String> stepDetailMap) {
         if (CollectionUtils.isEmpty(steps)) {
             return;
         }
@@ -1718,7 +1722,7 @@ public class ApiScenarioService extends MoveNodeService {
      * @param parentStepMap   当前场景所有的步骤，key 为父步骤ID，value 为子步骤列表
      * @param scenarioStepMap 所有场景步骤，key 为场景ID，value 为子步骤列表
      */
-    private List<ApiScenarioStepDTO> buildStepTree(List<ApiScenarioStepDTO> steps,
+    public List<ApiScenarioStepDTO> buildStepTree(List<ApiScenarioStepDTO> steps,
                                                    Map<String, List<ApiScenarioStepDTO>> parentStepMap,
                                                    Map<String, List<ApiScenarioStepDTO>> scenarioStepMap,
                                                    Set<String> stepIdSet) {
@@ -1779,14 +1783,14 @@ public class ApiScenarioService extends MoveNodeService {
     /**
      * 判断步骤是否是引用的场景
      */
-    private boolean isRefOrPartialScenario(ApiScenarioStepDTO step) {
+    public boolean isRefOrPartialScenario(ApiScenarioStepDTO step) {
         return isRefOrPartialRef(step.getRefType()) && isScenarioStep(step.getStepType());
     }
 
     /**
      * 递归获取所有的场景步骤
      */
-    private List<ApiScenarioStepDTO> getAllStepsByScenarioIds(List<String> scenarioIds) {
+    public List<ApiScenarioStepDTO> getAllStepsByScenarioIds(List<String> scenarioIds) {
         List<ApiScenarioStepDTO> steps = getStepDTOByScenarioIds(scenarioIds);
         if (CollectionUtils.isEmpty(steps)) {
             return steps;
diff --git a/backend/services/api-test/src/test/java/io/metersphere/api/controller/ApiScenarioSelectAssociateControllerTests.java b/backend/services/api-test/src/test/java/io/metersphere/api/controller/ApiScenarioSelectAssociateControllerTests.java
new file mode 100644
index 0000000000..4b297f5349
--- /dev/null
+++ b/backend/services/api-test/src/test/java/io/metersphere/api/controller/ApiScenarioSelectAssociateControllerTests.java
@@ -0,0 +1,115 @@
+package io.metersphere.api.controller;
+
+import io.metersphere.api.domain.ApiDefinition;
+import io.metersphere.api.domain.ApiDefinitionExample;
+import io.metersphere.api.domain.ApiScenario;
+import io.metersphere.api.domain.ApiScenarioExample;
+import io.metersphere.api.dto.scenario.ApiScenarioSelectAssociateDTO;
+import io.metersphere.api.dto.scenario.ApiScenarioStepDTO;
+import io.metersphere.api.mapper.ApiDefinitionMapper;
+import io.metersphere.api.mapper.ApiScenarioMapper;
+import io.metersphere.sdk.util.JSON;
+import io.metersphere.system.base.BaseTest;
+import io.metersphere.system.controller.handler.ResultHolder;
+import io.metersphere.system.dto.ModuleSelectDTO;
+import jakarta.annotation.Resource;
+import org.apache.commons.collections4.CollectionUtils;
+import org.junit.jupiter.api.*;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.web.servlet.MvcResult;
+
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
+@AutoConfigureMockMvc
+public class ApiScenarioSelectAssociateControllerTests extends BaseTest {
+
+    private static final String URL = "/api/scenario/associate/all";
+
+    @Resource
+    private ApiScenarioMapper apiScenarioMapper;
+    @Resource
+    private ApiDefinitionMapper apiDefinitionMapper;
+
+
+    @Test
+    @Order(0)
+    public void testBatchExportReport() throws Exception {
+        ApiScenarioExample apiScenarioExample = new ApiScenarioExample();
+        apiScenarioExample.createCriteria().andProjectIdEqualTo(DEFAULT_PROJECT_ID);
+        List<ApiScenario> apiScenarios = apiScenarioMapper.selectByExample(apiScenarioExample);
+        ApiScenario apiScenario = apiScenarios.get(0);
+
+
+        ApiDefinitionExample apiDefinitionExample = new ApiDefinitionExample();
+        apiDefinitionExample.createCriteria().andProjectIdEqualTo(DEFAULT_PROJECT_ID);
+        List<ApiDefinition> apiDefinitionList = apiDefinitionMapper.selectByExample(apiDefinitionExample);
+        ApiDefinition apiDefinition = apiDefinitionList.get(0);
+        ApiDefinition apiDefinition1 = apiDefinitionList.get(1);
+
+        ApiScenarioSelectAssociateDTO apiScenarioSelectAssociateDTO = new ApiScenarioSelectAssociateDTO();
+        apiScenarioSelectAssociateDTO.setScenarioId(apiScenario.getId());
+        apiScenarioSelectAssociateDTO.setProjectId(DEFAULT_PROJECT_ID);
+        apiScenarioSelectAssociateDTO.setAssociateType("CASE");
+        apiScenarioSelectAssociateDTO.setSelectAllModule(true);
+        apiScenarioSelectAssociateDTO.setModuleMaps(new HashMap<>());
+        apiScenarioSelectAssociateDTO.setRefType("REF");
+        Map<String, ApiScenarioSelectAssociateDTO> requestMap = new HashMap<>();
+        requestMap.put("CASE", apiScenarioSelectAssociateDTO);
+        requestMap.put("SCENARIO",apiScenarioSelectAssociateDTO);
+        requestMap.put("API",apiScenarioSelectAssociateDTO);
+        MvcResult mvcResult = this.requestPostWithOkAndReturn(URL, requestMap);
+        String returnData = mvcResult.getResponse().getContentAsString(StandardCharsets.UTF_8);
+        ResultHolder resultHolder = JSON.parseObject(returnData, ResultHolder.class);
+        List<ApiScenarioStepDTO> testCaseProviderDTOS = JSON.parseArray(JSON.toJSONString(resultHolder.getData()), ApiScenarioStepDTO.class);
+        Assertions.assertTrue(CollectionUtils.isNotEmpty(testCaseProviderDTOS));
+        Map<String, ModuleSelectDTO> moduleMaps = new HashMap<>();
+        ModuleSelectDTO moduleSelectDTO = new ModuleSelectDTO();
+        moduleSelectDTO.setSelectAll(false);
+        moduleSelectDTO.setSelectIds(List.of(apiScenarios.get(0).getId()));
+        moduleSelectDTO.setExcludeIds(List.of(apiScenarios.get(1).getId()));
+        moduleMaps.put(apiScenarios.get(0).getModuleId(),moduleSelectDTO);
+        apiScenarioSelectAssociateDTO.setSelectAllModule(false);
+        apiScenarioSelectAssociateDTO.setModuleMaps(moduleMaps);
+        apiScenarioSelectAssociateDTO.setProtocols(List.of("HTTP"));
+        Map<String, ModuleSelectDTO> caseModuleMaps = new HashMap<>();
+        ModuleSelectDTO caseModuleSelectDTO = new ModuleSelectDTO();
+        caseModuleSelectDTO.setSelectAll(false);
+        caseModuleSelectDTO.setSelectIds(List.of("sss"));
+        caseModuleSelectDTO.setExcludeIds(List.of("fff"));
+        caseModuleMaps.put(apiDefinitionList.get(3).getModuleId(),caseModuleSelectDTO);
+        ApiScenarioSelectAssociateDTO caseScenarioSelectAssociateDTO = new ApiScenarioSelectAssociateDTO();
+        caseScenarioSelectAssociateDTO.setScenarioId(apiScenario.getId());
+        caseScenarioSelectAssociateDTO.setProjectId(DEFAULT_PROJECT_ID);
+        caseScenarioSelectAssociateDTO.setAssociateType("CASE");
+        caseScenarioSelectAssociateDTO.setProtocols(List.of("HTTP"));
+        caseScenarioSelectAssociateDTO.setSelectAllModule(false);
+        caseScenarioSelectAssociateDTO.setModuleMaps(caseModuleMaps);
+        caseScenarioSelectAssociateDTO.setRefType("REF");
+        Map<String, ModuleSelectDTO> apiModuleMaps = new HashMap<>();
+        ModuleSelectDTO apiModuleSelectDTO = new ModuleSelectDTO();
+        apiModuleSelectDTO.setSelectAll(false);
+        apiModuleSelectDTO.setSelectIds(List.of(apiDefinition.getId()));
+        apiModuleSelectDTO.setExcludeIds(List.of(apiDefinition1.getId()));
+        apiModuleMaps.put(apiDefinitionList.get(3).getModuleId(),caseModuleSelectDTO);
+        ApiScenarioSelectAssociateDTO apiDScenarioSelectAssociateDTO = new ApiScenarioSelectAssociateDTO();
+        apiDScenarioSelectAssociateDTO.setScenarioId(apiScenario.getId());
+        apiDScenarioSelectAssociateDTO.setProtocols(List.of("HTTP"));
+        apiDScenarioSelectAssociateDTO.setProjectId(DEFAULT_PROJECT_ID);
+        apiDScenarioSelectAssociateDTO.setAssociateType("CASE");
+        apiDScenarioSelectAssociateDTO.setSelectAllModule(false);
+        apiDScenarioSelectAssociateDTO.setModuleMaps(apiModuleMaps);
+        apiDScenarioSelectAssociateDTO.setRefType("REF");
+        requestMap = new HashMap<>();
+        requestMap.put("CASE", apiScenarioSelectAssociateDTO);
+        requestMap.put("SCENARIO",caseScenarioSelectAssociateDTO);
+        requestMap.put("API",apiDScenarioSelectAssociateDTO);
+        this.requestPostWithOkAndReturn(URL, requestMap);
+    }
+
+}