From 9d2a050983e68d8ee42379af096160bf4af33046 Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Wed, 17 Apr 2024 10:59:05 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):?=
 =?UTF-8?q?=20=E4=BC=98=E5=8C=96=E4=BB=BB=E5=8A=A1sql=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/metersphere/api/mapper/ExtApiReportMapper.xml |  2 +-
 .../api/mapper/ExtApiScenarioReportMapper.xml        |  2 +-
 .../api/service/ApiTaskCenterService.java            | 12 ++++++++----
 .../api/service/definition/ApiTestCaseService.java   | 11 +++++++----
 .../api/service/scenario/ApiScenarioService.java     | 10 +++++++---
 .../case/tabContent/tabCaseExecuteHistory.vue        |  4 ++--
 .../api-test/scenario/components/executeHistory.vue  |  4 ++--
 .../project-management/taskCenter/locale/en-US.ts    |  2 +-
 .../project-management/taskCenter/locale/zh-CN.ts    |  2 +-
 9 files changed, 30 insertions(+), 19 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 890464b4aa..0ba44eddbd 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
@@ -266,7 +266,7 @@
         </if>
     </select>
     <select id="getHistoryDeleted" resultType="io.metersphere.api.dto.definition.ExecuteReportDTO">
-        select ar.* from api_report ar INNER JOIN api_report_step ars on ar.id = ars.report_id
+        select distinct ar.* from api_report ar INNER JOIN api_report_step ars on ar.id = ars.report_id
         <if test="ids != null and ids.size() > 0">
             where ar.id in
             <foreach collection="ids" item="id" open="(" separator="," close=")">
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 e89d986825..20d56cebcb 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
@@ -245,7 +245,7 @@
         </if>
     </select>
     <select id="getHistoryDeleted" resultType="io.metersphere.api.dto.definition.ExecuteReportDTO">
-        select asr.* from
+        select distinct asr.* from
                      api_scenario_report asr inner join api_scenario_report_step ars on asr.id = ars.report_id
         <if test="ids != null and ids.size() > 0">
             where asr.id in
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 8fd8f37e6c..a6b4cfa736 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
@@ -136,13 +136,17 @@ public class ApiTaskCenterService {
                 list = extApiReportMapper.taskCenterlist(request, projectIds, DateUtils.getDailyStartTime(), DateUtils.getDailyEndTime());
                 //执行历史列表
                 List<String> reportIds = list.stream().map(TaskCenterDTO::getId).toList();
-                List<ExecuteReportDTO> historyDeletedList = extApiReportMapper.getHistoryDeleted(reportIds);
-                historyDeletedMap = historyDeletedList.stream().collect(Collectors.toMap(ExecuteReportDTO::getId, Function.identity()));
+                if (CollectionUtils.isNotEmpty(reportIds)){
+                    List<ExecuteReportDTO> historyDeletedList = extApiReportMapper.getHistoryDeleted(reportIds);
+                    historyDeletedMap = historyDeletedList.stream().collect(Collectors.toMap(ExecuteReportDTO::getId, Function.identity()));
+                }
             } else if (request.getModuleType().equals(TaskCenterResourceType.API_SCENARIO.toString())) {
                 list = extApiScenarioReportMapper.taskCenterlist(request, projectIds, DateUtils.getDailyStartTime(), DateUtils.getDailyEndTime());
                 List<String> reportIds = list.stream().map(TaskCenterDTO::getId).toList();
-                List<ExecuteReportDTO> historyDeletedList = extApiScenarioReportMapper.getHistoryDeleted(reportIds);
-                historyDeletedMap = historyDeletedList.stream().collect(Collectors.toMap(ExecuteReportDTO::getId, Function.identity()));
+                if (CollectionUtils.isNotEmpty(reportIds)) {
+                    List<ExecuteReportDTO> historyDeletedList = extApiScenarioReportMapper.getHistoryDeleted(reportIds);
+                    historyDeletedMap = historyDeletedList.stream().collect(Collectors.toMap(ExecuteReportDTO::getId, Function.identity()));
+                }
             }
             processTaskCenter(list, projectList, projectIds, historyDeletedMap);
         }
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/service/definition/ApiTestCaseService.java b/backend/services/api-test/src/main/java/io/metersphere/api/service/definition/ApiTestCaseService.java
index 3226a120e0..2092f33e3e 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/service/definition/ApiTestCaseService.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/service/definition/ApiTestCaseService.java
@@ -561,14 +561,17 @@ public class ApiTestCaseService extends MoveNodeService {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
         //执行历史列表
         List<String> reportIds = executeList.stream().map(ExecuteReportDTO::getId).toList();
-        List<ExecuteReportDTO> historyDeletedList = extApiReportMapper.getHistoryDeleted(reportIds);
-        Map<String, ExecuteReportDTO> historyDeletedMap = historyDeletedList.stream().collect(Collectors.toMap(ExecuteReportDTO::getId, Function.identity()));
-
+        Map<String, ExecuteReportDTO> historyDeletedMap = new HashMap<>();
+        if (CollectionUtils.isNotEmpty(reportIds)) {
+            List<ExecuteReportDTO> historyDeletedList = extApiReportMapper.getHistoryDeleted(reportIds);
+            historyDeletedMap = historyDeletedList.stream().collect(Collectors.toMap(ExecuteReportDTO::getId, Function.identity()));
+        }
+        Map<String, ExecuteReportDTO> finalHistoryDeletedMap = historyDeletedMap;
         executeList.forEach(apiReport -> {
             apiReport.setOperationUser(userMap.get(apiReport.getCreateUser()));
             Date date = new Date(apiReport.getStartTime());
             apiReport.setNum(sdf.format(date));
-            apiReport.setHistoryDeleted(MapUtils.isNotEmpty(historyDeletedMap) && !historyDeletedMap.containsKey(apiReport.getId()));
+            apiReport.setHistoryDeleted(MapUtils.isNotEmpty(finalHistoryDeletedMap) && !finalHistoryDeletedMap.containsKey(apiReport.getId()));
         });
         return executeList;
     }
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 f09a6d6bcc..28dd8f387b 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
@@ -2827,16 +2827,20 @@ public class ApiScenarioService extends MoveNodeService {
                 .collect(Collectors.toSet());
         //执行历史列表
         List<String> reportIds = executeList.stream().map(ExecuteReportDTO::getId).toList();
-        List<ExecuteReportDTO> historyDeletedList = extApiScenarioReportMapper.getHistoryDeleted(reportIds);
-        Map<String, ExecuteReportDTO> historyDeletedMap = historyDeletedList.stream().collect(Collectors.toMap(ExecuteReportDTO::getId, Function.identity()));
+        Map<String, ExecuteReportDTO> historyDeletedMap = new HashMap<>();
+        if (CollectionUtils.isNotEmpty(reportIds)) {
+            List<ExecuteReportDTO> historyDeletedList = extApiScenarioReportMapper.getHistoryDeleted(reportIds);
+            historyDeletedMap = historyDeletedList.stream().collect(Collectors.toMap(ExecuteReportDTO::getId, Function.identity()));
 
+        }
         Map<String, String> userMap = userLoginService.getUserNameMap(new ArrayList<>(userSet));
         SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
+        Map<String, ExecuteReportDTO> finalHistoryDeletedMap = historyDeletedMap;
         executeList.forEach(apiReport -> {
             apiReport.setOperationUser(userMap.get(apiReport.getCreateUser()));
             Date date = new Date(apiReport.getStartTime());
             apiReport.setNum(sdf.format(date));
-            apiReport.setHistoryDeleted(MapUtils.isNotEmpty(historyDeletedMap) && !historyDeletedMap.containsKey(apiReport.getId()));
+            apiReport.setHistoryDeleted(MapUtils.isNotEmpty(finalHistoryDeletedMap) && !finalHistoryDeletedMap.containsKey(apiReport.getId()));
         });
         return executeList;
     }
diff --git a/frontend/src/views/api-test/management/components/management/case/tabContent/tabCaseExecuteHistory.vue b/frontend/src/views/api-test/management/components/management/case/tabContent/tabCaseExecuteHistory.vue
index 8411920038..7430e36fac 100644
--- a/frontend/src/views/api-test/management/components/management/case/tabContent/tabCaseExecuteHistory.vue
+++ b/frontend/src/views/api-test/management/components/management/case/tabContent/tabCaseExecuteHistory.vue
@@ -88,7 +88,7 @@
             <MsButton
               :disabled="
                 record.historyDeleted ||
-                hasAnyPermission(['PROJECT_API_DEFINITION_CASE:READ+EXECUTE', 'PROJECT_API_REPORT:READ'])
+                !hasAnyPermission(['PROJECT_API_DEFINITION_CASE:READ+EXECUTE', 'PROJECT_API_REPORT:READ'])
               "
               class="!mr-0"
               @click="showResult(record, rowIndex)"
@@ -100,7 +100,7 @@
           <MsButton
             :disabled="
               record.historyDeleted ||
-              hasAnyPermission(['PROJECT_API_DEFINITION_CASE:READ+EXECUTE', 'PROJECT_API_REPORT:READ'])
+              !hasAnyPermission(['PROJECT_API_DEFINITION_CASE:READ+EXECUTE', 'PROJECT_API_REPORT:READ'])
             "
             class="!mr-0"
             @click="showResult(record, rowIndex)"
diff --git a/frontend/src/views/api-test/scenario/components/executeHistory.vue b/frontend/src/views/api-test/scenario/components/executeHistory.vue
index 4da211f393..3f76cf55ad 100644
--- a/frontend/src/views/api-test/scenario/components/executeHistory.vue
+++ b/frontend/src/views/api-test/scenario/components/executeHistory.vue
@@ -80,7 +80,7 @@
             <MsButton
               :disabled="
                 record.historyDeleted ||
-                hasAnyPermission(['PROJECT_API_SCENARIO:READ+EXECUTE', 'PROJECT_API_REPORT:READ'])
+                !hasAnyPermission(['PROJECT_API_SCENARIO:READ+EXECUTE', 'PROJECT_API_REPORT:READ'])
               "
               class="!mr-0"
               @click="showResult(record)"
@@ -92,7 +92,7 @@
           <MsButton
             :disabled="
               record.historyDeleted ||
-              hasAnyPermission(['PROJECT_API_SCENARIO:READ+EXECUTE', 'PROJECT_API_REPORT:READ'])
+              !hasAnyPermission(['PROJECT_API_SCENARIO:READ+EXECUTE', 'PROJECT_API_REPORT:READ'])
             "
             class="!mr-0"
             @click="showResult(record)"
diff --git a/frontend/src/views/project-management/taskCenter/locale/en-US.ts b/frontend/src/views/project-management/taskCenter/locale/en-US.ts
index fd321a50c5..193dd1d046 100644
--- a/frontend/src/views/project-management/taskCenter/locale/en-US.ts
+++ b/frontend/src/views/project-management/taskCenter/locale/en-US.ts
@@ -61,5 +61,5 @@ export default {
   'project.taskCenter.disableSuccess': 'Disable successfully',
   'project.taskCenter.filterPlaceholderText': 'Please select a project',
   'project.taskCenter.filterOrgPlaceholderText': 'Please select an organization',
-  'project.executionHistory.cleared': 'Execution history has been cleared',
+  'project.executionHistory.cleared': 'Execution result has been cleared',
 };
diff --git a/frontend/src/views/project-management/taskCenter/locale/zh-CN.ts b/frontend/src/views/project-management/taskCenter/locale/zh-CN.ts
index 062df20eb7..00814d4f0d 100644
--- a/frontend/src/views/project-management/taskCenter/locale/zh-CN.ts
+++ b/frontend/src/views/project-management/taskCenter/locale/zh-CN.ts
@@ -59,5 +59,5 @@ export default {
   'project.taskCenter.disableSuccess': '关闭成功',
   'project.taskCenter.filterProPlaceholderText': '请选择所属项目',
   'project.taskCenter.filterOrgPlaceholderText': '请选择所属组织',
-  'project.executionHistory.cleared': '执行历史被清理',
+  'project.executionHistory.cleared': '执行结果被清理',
 };