diff --git a/api-test/backend/src/main/java/io/metersphere/service/ApiExecutionQueueService.java b/api-test/backend/src/main/java/io/metersphere/service/ApiExecutionQueueService.java
index 46ee181c8b..f849b495e5 100644
--- a/api-test/backend/src/main/java/io/metersphere/service/ApiExecutionQueueService.java
+++ b/api-test/backend/src/main/java/io/metersphere/service/ApiExecutionQueueService.java
@@ -420,7 +420,7 @@ public class ApiExecutionQueueService {
             } else {
                 // 用例/接口超时结果处理
                 ApiDefinitionExecResultWithBLOBs result = apiDefinitionExecResultMapper.selectByPrimaryKey(item.getReportId());
-                if (result != null && StringUtils.equalsAnyIgnoreCase(result.getStatus(), ApiReportStatus.RUNNING.name())  && result.getStartTime() < timeout) {
+                if (result != null && StringUtils.equalsAnyIgnoreCase(result.getStatus(), ApiReportStatus.RUNNING.name()) && result.getStartTime() < timeout) {
                     result.setStatus(ApiReportStatus.ERROR.name());
                     apiDefinitionExecResultMapper.updateByPrimaryKeySelective(result);
 
@@ -507,6 +507,23 @@ public class ApiExecutionQueueService {
         }
     }
 
+    public void clearSetReportQueue(String reportId) {
+        ApiExecutionQueueExample example = new ApiExecutionQueueExample();
+        example.createCriteria()
+                .andReportIdEqualTo(reportId)
+                .andReportTypeEqualTo(RunModeConstants.SET_REPORT.toString());
+
+        List<ApiExecutionQueue> queues = apiExecutionQueueMapper.selectByExample(example);
+        queues.forEach(queue -> {
+            apiExecutionQueueMapper.deleteByPrimaryKey(queue.getId());
+
+            ApiExecutionQueueDetailExample queueDetailExample = new ApiExecutionQueueDetailExample();
+            queueDetailExample.createCriteria().andQueueIdEqualTo(queue.getId());
+            executionQueueDetailMapper.deleteByExample(queueDetailExample);
+        });
+    }
+
+
     public void stop(String reportId) {
         ApiExecutionQueueDetailExample example = new ApiExecutionQueueDetailExample();
         example.createCriteria().andReportIdEqualTo(reportId);
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 d6b4f7bd9b..352e7c8a02 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
@@ -34,6 +34,8 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.stream.Collectors;
 
 @Service
@@ -95,48 +97,74 @@ public class ExtApiTaskService extends TaskService {
 
     public void apiStop(List<TaskRequestDTO> taskRequests) {
         if (CollectionUtils.isNotEmpty(taskRequests)) {
-            List<TaskRequestDTO> stopTasks = taskRequests.stream().filter(s -> StringUtils.isNotEmpty(s.getReportId())).collect(Collectors.toList());
+            List<TaskRequestDTO> stopTasks = taskRequests.stream()
+                    .filter(s -> StringUtils.isNotEmpty(s.getReportId()))
+                    .toList();
+
             // 聚类，同一批资源池的一批发送
             Map<String, List<String>> poolMap = new HashMap<>();
+
             // 单条停止
-            if (CollectionUtils.isNotEmpty(stopTasks) && stopTasks.size() == 1) {
-                // 从队列移除
-                TaskRequestDTO request = stopTasks.get(0);
-                apiExecutionQueueService.stop(request.getReportId());
-                if (StringUtils.equals(request.getType(), "API")) {
-                    ApiDefinitionExecResultWithBLOBs result = apiDefinitionExecResultMapper.selectByPrimaryKey(request.getReportId());
-                    if (result != null) {
-                        result.setStatus(ApiReportStatus.STOPPED.name());
-                        apiDefinitionExecResultMapper.updateByPrimaryKeySelective(result);
-                        extracted(poolMap, request.getReportId(), result.getActuator());
-                    }
-                }
-                if (StringUtils.equals(request.getType(), ElementConstants.SCENARIO_UPPER)) {
-                    ApiScenarioReportWithBLOBs report = apiScenarioReportMapper.selectByPrimaryKey(request.getReportId());
-                    if (report != null) {
-                        report.setStatus(ApiReportStatus.STOPPED.name());
-                        apiScenarioReportMapper.updateByPrimaryKeySelective(report);
-                        extracted(poolMap, request.getReportId(), report.getActuator());
-                    }
-                }
-                // 开始结束资源池中执行的任务
-                if (MapUtils.isNotEmpty(poolMap)) {
-                    this.send(poolMap);
-                }
+            if (stopTasks.size() == 1) {
+                stopSingleTask(stopTasks.get(0), poolMap);
             } else {
-                Thread thread = new Thread(() -> {
-                    this.batchStop(taskRequests);
-                });
-                thread.start();
+                // 使用线程池管理线程
+                ExecutorService executorService = Executors.newSingleThreadExecutor();
+                executorService.submit(() -> batchStop(taskRequests));
+                executorService.shutdown();
             }
+
+            // 开始结束资源池中执行的任务
+            if (MapUtils.isNotEmpty(poolMap)) {
+                this.send(poolMap);
+            }
+        }
+    }
+
+    private void stopSingleTask(TaskRequestDTO request, Map<String, List<String>> poolMap) {
+        // 集合报告停止则清理队列
+        apiExecutionQueueService.clearSetReportQueue(request.getReportId());
+
+        if (StringUtils.equals(request.getType(), "API")) {
+            stopApiTask(request, poolMap);
+        } else if (StringUtils.equals(request.getType(), ElementConstants.SCENARIO_UPPER)) {
+            stopScenarioTask(request, poolMap);
+        }
+    }
+
+    private void stopApiTask(TaskRequestDTO request, Map<String, List<String>> poolMap) {
+        ApiDefinitionExecResultWithBLOBs result = apiDefinitionExecResultMapper.selectByPrimaryKey(request.getReportId());
+        if (result != null) {
+            result.setStatus(ApiReportStatus.STOPPED.name());
+            apiDefinitionExecResultMapper.updateByPrimaryKeySelective(result);
+            extracted(poolMap, request.getReportId(), result.getActuator());
+        }
+    }
+
+    private void stopScenarioTask(TaskRequestDTO request, Map<String, List<String>> poolMap) {
+        ApiScenarioReportWithBLOBs report = apiScenarioReportMapper.selectByPrimaryKey(request.getReportId());
+        if (report != null) {
+            report.setStatus(ApiReportStatus.STOPPED.name());
+            apiScenarioReportMapper.updateByPrimaryKeySelective(report);
+            extracted(poolMap, request.getReportId(), report.getActuator());
+        }
+    }
+
+
+    private void extracted(Map<String, List<String>> poolMap, String reportId, String actuator) {
+        if (StringUtils.isNotEmpty(reportId) && StringUtils.isNotEmpty(actuator) && !StringUtils.equals(actuator, StorageEnums.LOCAL.name())) {
+            poolMap.computeIfAbsent(actuator, k -> new ArrayList<>()).add(reportId);
         }
     }
 
     private void batchStop(List<TaskRequestDTO> taskRequests) {
         LoggerUtil.info("进入批量停止方法");
+
         Map<String, List<String>> poolMap = new HashMap<>();
         // 全部停止
-        Map<String, TaskRequestDTO> taskRequestMap = taskRequests.stream().collect(Collectors.toMap(TaskRequestDTO::getType, taskRequest -> taskRequest));
+        Map<String, TaskRequestDTO> taskRequestMap = taskRequests.stream()
+                .collect(Collectors.toMap(TaskRequestDTO::getType, taskRequest -> taskRequest));
+
         // 获取工作空间项目
         LoggerUtil.info("获取工作空间对应的项目");
         TaskRequestDTO taskRequest = taskRequestMap.get(ElementConstants.SCENARIO_UPPER);
@@ -148,60 +176,48 @@ public class ExtApiTaskService extends TaskService {
 
         // 结束掉未分发完成的任务
         LoggerUtil.info("结束正在进行中的计划任务队列");
+
         if (taskRequestMap.containsKey("API")) {
             List<TaskResultVO> results = extApiDefinitionExecResultMapper.findByProjectIds(taskCenterRequest);
             LoggerUtil.info("查询API进行中的报告：" + results.size());
+
             if (CollectionUtils.isNotEmpty(results)) {
-                for (TaskResultVO item : results) {
-                    extracted(poolMap, item.getId(), item.getActuator());
-                }
+                results.forEach(item -> extracted(poolMap, item.getId(), item.getActuator()));
                 LoggerUtil.info("结束API进行中的报告");
+
                 baseTaskMapper.stopApi(taskCenterRequest);
+
                 // 清理队列并停止测试计划报告
                 LoggerUtil.info("清理API执行链");
                 List<String> ids = results.stream().map(TaskResultVO::getId).collect(Collectors.toList());
                 apiExecutionQueueService.stop(ids);
             }
         }
+
         if (taskRequestMap.containsKey(ElementConstants.SCENARIO_UPPER)) {
             List<TaskResultVO> reports = extApiScenarioReportMapper.findByProjectIds(taskCenterRequest);
             LoggerUtil.info("查询到执行中的场景报告：" + reports.size());
-            if (CollectionUtils.isNotEmpty(reports)) {
-                for (TaskResultVO report : reports) {
 
-                    extracted(poolMap, report.getId(), report.getActuator());
-                }
+            if (CollectionUtils.isNotEmpty(reports)) {
+                reports.forEach(report -> extracted(poolMap, report.getId(), report.getActuator()));
 
                 // 清理队列并停止测试计划报告
                 LoggerUtil.info("结束所有进行中的场景报告 ");
                 List<String> ids = reports.stream().map(TaskResultVO::getId).collect(Collectors.toList());
                 baseTaskMapper.stopScenario(taskCenterRequest);
+
                 // 清理队列并停止测试计划报告
                 LoggerUtil.info("清理队列并停止测试计划报告 ");
                 apiExecutionQueueService.stop(ids);
             }
         }
+
         // 开始结束资源池中执行的任务
         if (MapUtils.isNotEmpty(poolMap)) {
             this.send(poolMap);
         }
     }
 
-    private void extracted(Map<String, List<String>> poolMap, String reportId, String actuator) {
-        if (StringUtils.isEmpty(reportId)) {
-            return;
-        }
-        if (StringUtils.isNotEmpty(actuator) && !StringUtils.equals(actuator, StorageEnums.LOCAL.name())) {
-            if (poolMap.containsKey(actuator)) {
-                poolMap.get(actuator).add(reportId);
-            } else {
-                poolMap.put(actuator, new ArrayList<String>() {{
-                    this.add(reportId);
-                }});
-            }
-        }
-    }
-
     private List<TestResource> selectPoolResource(String poolId) {
         TestResourcePoolExample example = new TestResourcePoolExample();
         example.createCriteria().andStatusEqualTo("VALID").andTypeEqualTo("NODE").andIdEqualTo(poolId);