From 5190c35b26fda0c0e33c995ef51be7f64c545ae8 Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Thu, 3 Mar 2022 16:36:28 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B5=8B=E8=AF=95=E6=8A=A5=E5=91=8A=E7=9A=84?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=95=88=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

优化测试报告的查询效率
---
 .../APIScenarioReportController.java          |  1 +
 .../api/dto/QueryAPIReportRequest.java        |  2 ++
 .../mapper/ext/ExtApiScenarioReportMapper.xml | 22 +++++++++++++++++++
 .../db/migration/V109__v1.18.1_release.sql    |  3 +++
 4 files changed, 28 insertions(+)
 create mode 100644 backend/src/main/resources/db/migration/V109__v1.18.1_release.sql

diff --git a/backend/src/main/java/io/metersphere/api/controller/APIScenarioReportController.java b/backend/src/main/java/io/metersphere/api/controller/APIScenarioReportController.java
index bcba94f1f5..c86d7b48ed 100644
--- a/backend/src/main/java/io/metersphere/api/controller/APIScenarioReportController.java
+++ b/backend/src/main/java/io/metersphere/api/controller/APIScenarioReportController.java
@@ -36,6 +36,7 @@ public class APIScenarioReportController {
     @PostMapping("/list/{goPage}/{pageSize}")
     public Pager<List<APIScenarioReportResult>> list(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody QueryAPIReportRequest request) {
         Page<Object> page = PageHelper.startPage(goPage, pageSize, true);
+        request.setLimit("LIMIT " + (goPage - 1) * pageSize + "," + pageSize * 50);
         return PageUtils.setPageInfo(page, apiReportService.list(request));
     }
 
diff --git a/backend/src/main/java/io/metersphere/api/dto/QueryAPIReportRequest.java b/backend/src/main/java/io/metersphere/api/dto/QueryAPIReportRequest.java
index 231f061f53..39c9e80f35 100644
--- a/backend/src/main/java/io/metersphere/api/dto/QueryAPIReportRequest.java
+++ b/backend/src/main/java/io/metersphere/api/dto/QueryAPIReportRequest.java
@@ -20,4 +20,6 @@ public class QueryAPIReportRequest {
     private List<OrderRequest> orders;
     private Map<String, List<String>> filters;
     private Map<String, Object> combine;
+
+    private String limit;
 }
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioReportMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioReportMapper.xml
index 039694287b..b8a0834ce2 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioReportMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioReportMapper.xml
@@ -138,6 +138,7 @@
     </sql>
 
     <select id="list" resultMap="BaseResultMap">
+        select * from (
         select * from (
         SELECT s_r.name AS test_name,
         s_r.end_time,
@@ -196,8 +197,19 @@
                 </foreach>
             </if>
             AND s_r.execute_type = 'Saved'
+            <if test="request.orders != null and request.orders.size() > 0">
+                order by
+                <foreach collection="request.orders" separator="," item="order">
+                    ${order.name} ${order.type}
+                </foreach>
+            </if>
+            <if test="request.limit != null">
+                ${request.limit}
+            </if>
         </where>
+        ) apiScenarioReport
         union
+        select * from (
         select a_r.name as test_name,
         a_r.end_time,
         a_r.user_id,
@@ -254,6 +266,16 @@
                 </if>
             </foreach>
         </if>
+        <if test="request.orders != null and request.orders.size() > 0">
+            order by
+            <foreach collection="request.orders" separator="," item="order">
+                ${order.name} ${order.type}
+            </foreach>
+        </if>
+        <if test="request.limit != null">
+            ${request.limit}
+        </if>
+        ) apiDefinitionReport
         ) r
         <if test="request.orders != null and request.orders.size() > 0">
             order by
diff --git a/backend/src/main/resources/db/migration/V109__v1.18.1_release.sql b/backend/src/main/resources/db/migration/V109__v1.18.1_release.sql
new file mode 100644
index 0000000000..3d6d88f653
--- /dev/null
+++ b/backend/src/main/resources/db/migration/V109__v1.18.1_release.sql
@@ -0,0 +1,3 @@
+ALTER TABLE `api_definition_exec_result` ADD INDEX projectIdIndex ( `project_id` );
+ALTER TABLE `api_scenario_report` ADD INDEX projectIdIndex ( `project_id` );
+ALTER TABLE `api_scenario_report` ADD INDEX projectIdexectypeIndex ( `project_id`,`execute_type` );
\ No newline at end of file