From 4fd265573fbdb010eaf55c11b43f2155f36ecb51 Mon Sep 17 00:00:00 2001
From: AgAngle <1323481023@qq.com>
Date: Mon, 8 Jul 2024 18:17:24 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E9=80=9A=E7=94=A8=E5=8A=9F=E8=83=BD):=20?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=B8=AD=E5=BF=83=E5=81=9C=E6=AD=A2=E5=85=A8?=
 =?UTF-8?q?=E9=83=A8=EF=BC=8C=E6=B2=A1=E6=9C=89=E6=A0=B9=E6=8D=AE=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E6=9D=A1=E4=BB=B6=E5=81=9C=E6=AD=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1043678 --user=陈建星 【任务中心】github#31896，测试计划是admin执行，使用其他用户lijx，点击全部停止，admin的任务也停止了。应只停止当前用户的测试任务。 https://www.tapd.cn/55049933/s/1545276
---
 .../ext/ExtApiDefinitionExecResultMapper.xml  |  9 ++++++
 .../mapper/ext/ExtApiScenarioReportMapper.xml |  9 ++++++
 .../service/ext/ExtApiTaskService.java        |  6 +++-
 .../src/components/task/TaskCenter.vue        | 29 ++++++++++++-------
 .../base/mapper/ext/BaseTaskMapper.xml        | 18 ++++++++++++
 .../metersphere/task/dto/TaskRequestDTO.java  |  2 ++
 .../mapper/ext/ExtLoadTestReportMapper.java   |  4 +--
 .../mapper/ext/ExtLoadTestReportMapper.xml    | 14 +++++++--
 .../service/PerformanceTestService.java       |  2 +-
 9 files changed, 76 insertions(+), 17 deletions(-)

diff --git a/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionExecResultMapper.xml b/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionExecResultMapper.xml
index 6f43f9848e..15b3e1a430 100644
--- a/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionExecResultMapper.xml
+++ b/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionExecResultMapper.xml
@@ -281,6 +281,15 @@
         <foreach collection="request.projects" item="id" separator="," open="(" close=")">
             #{id}
         </foreach>
+        <if test="request.userId != null and request.userId != ''">
+            and user_id = #{request.userId}
+        </if>
+        <if test="request.triggerMode != null and request.triggerMode != ''">
+            and trigger_mode = #{request.triggerMode}
+        </if>
+        <if test="request.executionStatus != null and request.executionStatus != ''">
+            and status = #{request.executionStatus}
+        </if>
     </select>
     <select id="selectResourceId" resultType="java.lang.String">
         SELECT resource_id
diff --git a/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioReportMapper.xml b/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioReportMapper.xml
index d3a79730e0..f3b4e45e6c 100644
--- a/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioReportMapper.xml
+++ b/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioReportMapper.xml
@@ -476,6 +476,15 @@
         <foreach collection="request.projects" item="id" separator="," open="(" close=")">
             #{id}
         </foreach>
+        <if test="request.userId != null and request.userId != ''">
+            and user_id = #{request.userId}
+        </if>
+        <if test="request.triggerMode != null and request.triggerMode != ''">
+            and trigger_mode = #{request.triggerMode}
+        </if>
+        <if test="request.executionStatus != null and request.executionStatus != ''">
+            and status = #{request.executionStatus}
+        </if>
     </select>
     <select id="selectByProjectIdAndLessThanTime" resultType="java.lang.String">
         select id
diff --git a/api-test/backend/src/main/java/io/metersphere/service/ext/ExtApiTaskService.java b/api-test/backend/src/main/java/io/metersphere/service/ext/ExtApiTaskService.java
index ded208f9d0..d6b4f7bd9b 100644
--- a/api-test/backend/src/main/java/io/metersphere/service/ext/ExtApiTaskService.java
+++ b/api-test/backend/src/main/java/io/metersphere/service/ext/ExtApiTaskService.java
@@ -139,8 +139,12 @@ public class ExtApiTaskService extends TaskService {
         Map<String, TaskRequestDTO> taskRequestMap = taskRequests.stream().collect(Collectors.toMap(TaskRequestDTO::getType, taskRequest -> taskRequest));
         // 获取工作空间项目
         LoggerUtil.info("获取工作空间对应的项目");
+        TaskRequestDTO taskRequest = taskRequestMap.get(ElementConstants.SCENARIO_UPPER);
         TaskCenterRequest taskCenterRequest = new TaskCenterRequest();
-        taskCenterRequest.setProjects(this.getOwnerProjectIds(taskRequestMap.get(ElementConstants.SCENARIO_UPPER).getUserId()));
+        taskCenterRequest.setProjects(this.getOwnerProjectIds(taskRequest.getUserId()));
+        taskCenterRequest.setUserId(taskRequest.getUserId());
+        taskCenterRequest.setTriggerMode(taskRequest.getTriggerMode());
+        taskCenterRequest.setExecutionStatus(taskRequest.getExecutionStatus());
 
         // 结束掉未分发完成的任务
         LoggerUtil.info("结束正在进行中的计划任务队列");
diff --git a/framework/sdk-parent/frontend/src/components/task/TaskCenter.vue b/framework/sdk-parent/frontend/src/components/task/TaskCenter.vue
index b27f1240a7..7590e6bed0 100644
--- a/framework/sdk-parent/frontend/src/components/task/TaskCenter.vue
+++ b/framework/sdk-parent/frontend/src/components/task/TaskCenter.vue
@@ -341,22 +341,26 @@ export default {
         array.push({
           type: "API",
           projectId: getCurrentProjectID(),
-          userId: getCurrentUser().id,
+          userId: this.condition.executor,
         });
         array.push({
           type: "SCENARIO",
           projectId: getCurrentProjectID(),
-          userId: getCurrentUser().id,
+          userId: this.condition.executor,
         });
         array.push({
           type: "PERFORMANCE",
           projectId: getCurrentProjectID(),
-          userId: getCurrentUser().id,
+          userId: this.condition.executor,
         });
         array.push({
           type: "UI_SCENARIO",
           projectId: getCurrentProjectID(),
-          userId: getCurrentUser().id,
+          userId: this.condition.executor,
+        });
+        array.forEach(item => {
+          item.triggerMode = this.condition.triggerMode;
+          item.executionStatus = this.condition.executionStatus;
         });
         stopBatchTask(array).then((response) => {
           this.$success(this.$t("report.test_stop_success"));
@@ -365,9 +369,12 @@ export default {
       }
     },
     getMaintainerOptions() {
-      getProjectUsers().then((response) => {
-        this.maintainerOptions = response.data;
-        this.condition.executor = getCurrentUser().id;
+      return new Promise(resolve => {
+        getProjectUsers().then((response) => {
+          this.maintainerOptions = response.data;
+          this.condition.executor = getCurrentUser().id;
+          resolve();
+        });
       });
     },
     initWebSocket() {
@@ -398,7 +405,6 @@ export default {
     },
     showTaskCenter() {
       this.getTaskRunning();
-      this.getMaintainerOptions();
       window.addEventListener("resize", this.listenScreenChange, false);
       this.taskVisible = true;
     },
@@ -411,10 +417,11 @@ export default {
         this.websocket.close();
       }
     },
-    open(activeName) {
+    async open(activeName) {
       if (activeName) {
         this.activeName = activeName;
       }
+      await this.getMaintainerOptions();
       this.init(true);
       this.taskVisible = true;
       setTimeout(this.showTaskCenter, 2000);
@@ -529,7 +536,9 @@ export default {
       return mode;
     },
     getTaskRunning() {
-      this.initWebSocket();
+      if (this.condition.executor) {
+        this.initWebSocket();
+      }
     },
     nextPage(currentPage, pageSize) {
       this.currentPage = currentPage;
diff --git a/framework/sdk-parent/sdk/src/main/java/io/metersphere/base/mapper/ext/BaseTaskMapper.xml b/framework/sdk-parent/sdk/src/main/java/io/metersphere/base/mapper/ext/BaseTaskMapper.xml
index 5f0d2071a2..3776a4cdfa 100644
--- a/framework/sdk-parent/sdk/src/main/java/io/metersphere/base/mapper/ext/BaseTaskMapper.xml
+++ b/framework/sdk-parent/sdk/src/main/java/io/metersphere/base/mapper/ext/BaseTaskMapper.xml
@@ -301,6 +301,15 @@
         <foreach collection="request.projects" item="id" separator="," open="(" close=")">
             #{id}
         </foreach>
+        <if test="request.userId != null and request.userId != ''">
+            and user_id = #{request.userId}
+        </if>
+        <if test="request.triggerMode != null and request.triggerMode != ''">
+            and trigger_mode = #{request.triggerMode}
+        </if>
+        <if test="request.executionStatus != null and request.executionStatus != ''">
+            and status = #{request.executionStatus}
+        </if>
     </update>
 
 
@@ -310,5 +319,14 @@
         <foreach collection="request.projects" item="id" separator="," open="(" close=")">
             #{id}
         </foreach>
+        <if test="request.userId != null and request.userId != ''">
+            and user_id = #{request.userId}
+        </if>
+        <if test="request.triggerMode != null and request.triggerMode != ''">
+            and trigger_mode = #{request.triggerMode}
+        </if>
+        <if test="request.executionStatus != null and request.executionStatus != ''">
+            and status = #{request.executionStatus}
+        </if>
     </update>
 </mapper>
\ No newline at end of file
diff --git a/framework/sdk-parent/sdk/src/main/java/io/metersphere/task/dto/TaskRequestDTO.java b/framework/sdk-parent/sdk/src/main/java/io/metersphere/task/dto/TaskRequestDTO.java
index 4167848371..a3cf3ec6f4 100644
--- a/framework/sdk-parent/sdk/src/main/java/io/metersphere/task/dto/TaskRequestDTO.java
+++ b/framework/sdk-parent/sdk/src/main/java/io/metersphere/task/dto/TaskRequestDTO.java
@@ -8,5 +8,7 @@ public class TaskRequestDTO {
     private String reportId;
     private String projectId;
     private String userId;
+    private String triggerMode;
+    private String executionStatus;
 
 }
diff --git a/performance-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestReportMapper.java b/performance-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestReportMapper.java
index ea117c151d..b0864384ad 100644
--- a/performance-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestReportMapper.java
+++ b/performance-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestReportMapper.java
@@ -4,9 +4,9 @@ import io.metersphere.base.domain.FileMetadata;
 import io.metersphere.base.domain.LoadTestReport;
 import io.metersphere.base.domain.LoadTestReportWithBLOBs;
 import io.metersphere.dto.DashboardTestDTO;
-import io.metersphere.dto.PlanReportCaseDTO;
 import io.metersphere.dto.ReportDTO;
 import io.metersphere.request.ReportRequest;
+import io.metersphere.task.dto.TaskRequestDTO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -23,7 +23,7 @@ public interface ExtLoadTestReportMapper {
 
     void updateJmxContentIfAbsent(LoadTestReportWithBLOBs record);
 
-    List<LoadTestReport> selectReportByProjectId(String projectId);
+    List<LoadTestReport> selectReportByProjectId(@Param("request") TaskRequestDTO request);
 
     int updateReportVumStatus(String reportId, String reportKey, String nextStatus, String preStatus);
 
diff --git a/performance-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestReportMapper.xml b/performance-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestReportMapper.xml
index e8a124248f..236c2f93d4 100644
--- a/performance-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestReportMapper.xml
+++ b/performance-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestReportMapper.xml
@@ -227,9 +227,17 @@
                  left join `user` t1 ON t.user_id = t1.id
                  left join test_resource_pool t2 on t.test_resource_pool_id = t2.id
         where to_days(FROM_UNIXTIME(t.create_time / 1000)) = to_days(now())
-          and t.project_id = #{projectId}
-          and t.status = 'running'
-
+          and t.project_id = #{request.projectId}
+          and t.status in ("Running","Starting","Pending")
+        <if test="request.userId != null and request.userId != ''">
+            and t.user_id = #{request.userId}
+        </if>
+        <if test="request.triggerMode != null and request.triggerMode != ''">
+            and t.trigger_mode = #{request.triggerMode}
+        </if>
+        <if test="request.executionStatus != null and request.executionStatus != ''">
+            and t.status = #{request.executionStatus}
+        </if>
     </select>
 
     <update id="updateJmxContentIfAbsent">
diff --git a/performance-test/backend/src/main/java/io/metersphere/service/PerformanceTestService.java b/performance-test/backend/src/main/java/io/metersphere/service/PerformanceTestService.java
index 515e730f63..d5f508946f 100644
--- a/performance-test/backend/src/main/java/io/metersphere/service/PerformanceTestService.java
+++ b/performance-test/backend/src/main/java/io/metersphere/service/PerformanceTestService.java
@@ -973,7 +973,7 @@ public class PerformanceTestService {
         if (StringUtils.isNotEmpty(taskRequestDTO.getReportId())) {
             this.stopTest(taskRequestDTO.getReportId(), false);
         } else {
-            List<LoadTestReport> loadTestReports = extLoadTestReportMapper.selectReportByProjectId(taskRequestDTO.getProjectId());
+            List<LoadTestReport> loadTestReports = extLoadTestReportMapper.selectReportByProjectId(taskRequestDTO);
             loadTestReports.forEach(loadTestReport -> {
                 this.stopTest(loadTestReport.getId(), false);
             });