From 9d3ebe1ec31672e371b417c6832b686f6b3a439c Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Fri, 24 May 2024 10:56:02 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):?=
 =?UTF-8?q?=20=E4=BC=98=E5=8C=96=E5=A4=A7=E6=95=B0=E6=8D=AE=E9=87=8F?=
 =?UTF-8?q?=EF=BC=8C=E6=9F=A5=E7=9C=8B=E6=8A=A5=E5=91=8A=E7=9A=84=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/ExtApiScenarioReportMapper.java    |   2 +-
 .../api/mapper/ExtApiScenarioReportMapper.xml |   3 +-
 .../scenario/ApiScenarioReportService.java    | 108 +++++++++++-------
 .../components/management/mock/mockTable.vue  |   1 +
 4 files changed, 68 insertions(+), 46 deletions(-)

diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioReportMapper.java b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioReportMapper.java
index b6f24739b4..d2d7359d9d 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioReportMapper.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioReportMapper.java
@@ -51,7 +51,7 @@ public interface ExtApiScenarioReportMapper {
 
     void updateApiScenario(List<String> ids);
 
-    List<ApiScenarioReportStepDTO> selectStepDetailByReportId(String id);
+    List<ApiScenarioReportStepDTO> selectStepDetailByReportId(@Param("id") String id, @Param("limit") int limit, @Param("offset") int offset);
 
     List<ApiReportMessageDTO> getNoticeList(@Param("ids") List<String> ids);
 
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 e61c315d71..428516fef9 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
@@ -221,7 +221,8 @@
                api_scenario_report_detail.script_identifier,
                api_scenario_report_detail.sort as loopIndex
         from api_scenario_report_detail
-        where api_scenario_report_detail.report_id = #{reportId}
+        where api_scenario_report_detail.report_id = #{id}
+        limit #{limit} offset #{offset}
     </select>
     <select id="getNoticeList" resultType="io.metersphere.system.dto.sdk.ApiReportMessageDTO">
         select id ,name from api_scenario_report
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/service/scenario/ApiScenarioReportService.java b/backend/services/api-test/src/main/java/io/metersphere/api/service/scenario/ApiScenarioReportService.java
index dfcf230644..2cd8bec6da 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/service/scenario/ApiScenarioReportService.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/service/scenario/ApiScenarioReportService.java
@@ -69,6 +69,8 @@ public class ApiScenarioReportService {
     @Resource
     private ApiScenarioReportNoticeService apiScenarioReportNoticeService;
     private static final String SPLITTER = "_";
+    private static final int MAX = 50000;
+    private static final int BATCH_SIZE = 1000;
 
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRES_NEW)
     public void insertApiScenarioReport(List<ApiScenarioReport> reports, List<ApiScenarioRecord> records) {
@@ -190,10 +192,71 @@ public class ApiScenarioReportService {
         //需要查询出所有的步骤
         List<ApiScenarioReportStepDTO> scenarioReportSteps = extApiScenarioReportMapper.selectStepByReportId(id);
         //查询所有步骤的detail
-        List<ApiScenarioReportStepDTO> deatilList = extApiScenarioReportMapper.selectStepDetailByReportId(id);
+        ApiScenarioReportDetailExample detailExample = new ApiScenarioReportDetailExample();
+        detailExample.createCriteria().andReportIdEqualTo(id);
+        long detailCount = apiScenarioReportDetailMapper.countByExample(detailExample);
+        // 分批查询 一次性查询1000个  超过50000个也只查询50000条
+        if (detailCount > MAX) {
+            detailCount = MAX;
+        }
+        int remainingCount = (int) detailCount;
+        List<ApiScenarioReportStepDTO> deatilList = new ArrayList<>();
+        for (int i = 0; i < detailCount; i += BATCH_SIZE) {
+            int currentBatchSize = Math.min(BATCH_SIZE, remainingCount);
+            deatilList.addAll(extApiScenarioReportMapper.selectStepDetailByReportId(id, currentBatchSize, i));
+            remainingCount -= currentBatchSize;
+        }
+
         //根据stepId进行分组
         Map<String, List<ApiScenarioReportStepDTO>> detailMap = deatilList.stream().collect(Collectors.groupingBy(ApiScenarioReportStepDTO::getStepId));
         //只处理请求的
+        detailRequest(scenarioReportSteps, detailMap);
+
+        //将scenarioReportSteps按照parentId进行分组 值为list 然后根据sort进行排序
+        Map<String, List<ApiScenarioReportStepDTO>> scenarioReportStepMap = scenarioReportSteps.stream().collect(Collectors.groupingBy(ApiScenarioReportStepDTO::getParentId));
+        // TODO 查询修改
+        List<ApiScenarioReportStepDTO> steps = Optional.ofNullable(scenarioReportStepMap.get("NONE")).orElse(new ArrayList<>(0));
+        steps.sort(Comparator.comparingLong(ApiScenarioReportStepDTO::getSort));
+
+        getStepTree(steps, scenarioReportStepMap);
+
+        scenarioReportDTO.setStepTotal(steps.size());
+        scenarioReportDTO.setRequestTotal(getRequestTotal(scenarioReportDTO));
+        scenarioReportDTO.setChildren(steps);
+
+        scenarioReportDTO.setStepErrorCount(steps.stream().filter(step -> StringUtils.equals(ApiReportStatus.ERROR.name(), step.getStatus())).count());
+        scenarioReportDTO.setStepSuccessCount(steps.stream().filter(step -> StringUtils.equals(ApiReportStatus.SUCCESS.name(), step.getStatus())).count());
+        scenarioReportDTO.setStepPendingCount(steps.stream().filter(step -> StringUtils.equals(ApiReportStatus.PENDING.name(), step.getStatus()) || StringUtils.isBlank(step.getStatus())).count());
+        scenarioReportDTO.setStepFakeErrorCount(steps.stream().filter(step -> StringUtils.equals(ApiReportStatus.FAKE_ERROR.name(), step.getStatus())).count());
+        //控制台信息 console
+        ApiScenarioReportLogExample example = new ApiScenarioReportLogExample();
+        example.createCriteria().andReportIdEqualTo(id);
+        List<ApiScenarioReportLog> apiScenarioReportLogs = apiScenarioReportLogMapper.selectByExampleWithBLOBs(example);
+        if (CollectionUtils.isNotEmpty(apiScenarioReportLogs)) {
+            //获取所有的console,生成集合
+            List<String> consoleList = apiScenarioReportLogs.stream().map(c -> new String(c.getConsole())).toList();
+            scenarioReportDTO.setConsole(String.join("\n", consoleList));
+        }
+        //查询资源池名称
+        scenarioReportDTO.setPoolName(testResourcePoolMapper.selectByPrimaryKey(scenarioReport.getPoolId()).getName());
+        //查询环境名称
+        String environmentName = null;
+        if (StringUtils.isNotBlank(scenarioReport.getEnvironmentId())) {
+            Environment environment = environmentMapper.selectByPrimaryKey(scenarioReport.getEnvironmentId());
+            if (environment != null) {
+                environmentName = environment.getName();
+            }
+            EnvironmentGroup environmentGroup = environmentGroupMapper.selectByPrimaryKey(scenarioReport.getEnvironmentId());
+            if (environmentGroup != null) {
+                environmentName = environmentGroup.getName();
+            }
+        }
+        scenarioReportDTO.setEnvironmentName(environmentName);
+        scenarioReportDTO.setCreatUserName(userMapper.selectByPrimaryKey(scenarioReport.getCreateUser()).getName());
+        return scenarioReportDTO;
+    }
+
+    private static void detailRequest(List<ApiScenarioReportStepDTO> scenarioReportSteps, Map<String, List<ApiScenarioReportStepDTO>> detailMap) {
         List<String> stepTypes = Arrays.asList(ApiScenarioStepType.API_CASE.name(),
                 ApiScenarioStepType.API.name(),
                 ApiScenarioStepType.CUSTOM_REQUEST.name(),
@@ -247,49 +310,6 @@ public class ApiScenarioReportService {
                 }
             }
         });
-
-        //将scenarioReportSteps按照parentId进行分组 值为list 然后根据sort进行排序
-        Map<String, List<ApiScenarioReportStepDTO>> scenarioReportStepMap = scenarioReportSteps.stream().collect(Collectors.groupingBy(ApiScenarioReportStepDTO::getParentId));
-        // TODO 查询修改
-        List<ApiScenarioReportStepDTO> steps = Optional.ofNullable(scenarioReportStepMap.get("NONE")).orElse(new ArrayList<>(0));
-        steps.sort(Comparator.comparingLong(ApiScenarioReportStepDTO::getSort));
-
-        getStepTree(steps, scenarioReportStepMap);
-
-        scenarioReportDTO.setStepTotal(steps.size());
-        scenarioReportDTO.setRequestTotal(getRequestTotal(scenarioReportDTO));
-        scenarioReportDTO.setChildren(steps);
-
-        scenarioReportDTO.setStepErrorCount(steps.stream().filter(step -> StringUtils.equals(ApiReportStatus.ERROR.name(), step.getStatus())).count());
-        scenarioReportDTO.setStepSuccessCount(steps.stream().filter(step -> StringUtils.equals(ApiReportStatus.SUCCESS.name(), step.getStatus())).count());
-        scenarioReportDTO.setStepPendingCount(steps.stream().filter(step -> StringUtils.equals(ApiReportStatus.PENDING.name(), step.getStatus()) || StringUtils.isBlank(step.getStatus())).count());
-        scenarioReportDTO.setStepFakeErrorCount(steps.stream().filter(step -> StringUtils.equals(ApiReportStatus.FAKE_ERROR.name(), step.getStatus())).count());
-        //控制台信息 console
-        ApiScenarioReportLogExample example = new ApiScenarioReportLogExample();
-        example.createCriteria().andReportIdEqualTo(id);
-        List<ApiScenarioReportLog> apiScenarioReportLogs = apiScenarioReportLogMapper.selectByExampleWithBLOBs(example);
-        if (CollectionUtils.isNotEmpty(apiScenarioReportLogs)) {
-            //获取所有的console,生成集合
-            List<String> consoleList = apiScenarioReportLogs.stream().map(c -> new String (c.getConsole())).toList();
-            scenarioReportDTO.setConsole(String.join("\n", consoleList));
-        }
-        //查询资源池名称
-        scenarioReportDTO.setPoolName(testResourcePoolMapper.selectByPrimaryKey(scenarioReport.getPoolId()).getName());
-        //查询环境名称
-        String environmentName = null;
-        if (StringUtils.isNotBlank(scenarioReport.getEnvironmentId())) {
-            Environment environment = environmentMapper.selectByPrimaryKey(scenarioReport.getEnvironmentId());
-            if (environment != null) {
-                environmentName = environment.getName();
-            }
-            EnvironmentGroup environmentGroup = environmentGroupMapper.selectByPrimaryKey(scenarioReport.getEnvironmentId());
-            if (environmentGroup != null) {
-                environmentName = environmentGroup.getName();
-            }
-        }
-        scenarioReportDTO.setEnvironmentName(environmentName);
-        scenarioReportDTO.setCreatUserName(userMapper.selectByPrimaryKey(scenarioReport.getCreateUser()).getName());
-        return scenarioReportDTO;
     }
 
     public long getRequestTotal(ApiScenarioReport report) {
diff --git a/frontend/src/views/api-test/management/components/management/mock/mockTable.vue b/frontend/src/views/api-test/management/components/management/mock/mockTable.vue
index e273d5e3a5..256f5a84c2 100644
--- a/frontend/src/views/api-test/management/components/management/mock/mockTable.vue
+++ b/frontend/src/views/api-test/management/components/management/mock/mockTable.vue
@@ -651,6 +651,7 @@
           id: res.id,
           type: 'mock',
           isNew: false,
+          isCopy: false,
           protocol: res.protocol,
           activeTab: RequestComposition.BODY,
           executeLoading: false,