test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(任务中心): 修复没有开启ui测试的时候任务中心点击全部停止会报错的问题 

--bug=1025606 --user=宋天阳 【测试跟踪】github#23758，UI测试不开启的时候，在测试计划页面点击全部停止报错
https://www.tapd.cn/55049933/s/1364280
This commit is contained in:
song-tianyang 2023-04-19 11:59:26 +08:00 committed by 建国
parent 53c8ee81f9
commit 30a537c376
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
framework/sdk-parent/sdk/src/main/java/io/metersphere/task/service/TaskService.java
View File

@ -19,12 +19,12 @@ import io.metersphere.task.dto.TaskCenterDTO;
import io.metersphere.task.dto.TaskCenterRequest; import io.metersphere.task.dto.TaskCenterRequest;
import io.metersphere.task.dto.TaskRequestDTO; import io.metersphere.task.dto.TaskRequestDTO;
import io.metersphere.task.dto.TaskStatisticsDTO; import io.metersphere.task.dto.TaskStatisticsDTO;
import jakarta.annotation.Resource;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import jakarta.annotation.Resource;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -130,17 +130,31 @@ public class TaskService {
} }
public void stop(List<TaskRequestDTO> reportIds) { public void stop(List<TaskRequestDTO> reportIds) {
if (CollectionUtils.isNotEmpty(reportIds)) { if (CollectionUtils.isNotEmpty(reportIds)) {
// 任务中心单条停止/全部停止 // 任务中心单条停止/全部停止
Map<String, TaskRequestDTO> taskRequestMap = reportIds.stream().collect(Collectors.toMap(TaskRequestDTO::getType, taskRequest -> taskRequest)); Map<String, TaskRequestDTO> taskRequestMap = reportIds.stream().collect(Collectors.toMap(TaskRequestDTO::getType, taskRequest -> taskRequest));
if (taskRequestMap.containsKey(API) || taskRequestMap.containsKey(SCENARIO)) { if (taskRequestMap.containsKey(API) || taskRequestMap.containsKey(SCENARIO)) {
microService.postForData(MicroServiceName.API_TEST, "/api/automation/stop/batch", reportIds); try {
microService.postForData(MicroServiceName.API_TEST, "/api/automation/stop/batch", reportIds);
} catch (Exception e) {
LogUtil.error("接口测试批量关闭失败!", e);
}
} }
if (taskRequestMap.containsKey(PERF)) { if (taskRequestMap.containsKey(PERF)) {
microService.postForData(MicroServiceName.PERFORMANCE_TEST, "/performance/stop/batch", taskRequestMap.get(PERF)); try {
microService.postForData(MicroServiceName.PERFORMANCE_TEST, "/performance/stop/batch", taskRequestMap.get(PERF));
} catch (Exception e) {
LogUtil.error("性能测试批量关闭失败!", e);
}
} }
if (taskRequestMap.containsKey(UI)) { if (taskRequestMap.containsKey(UI)) {
microService.postForData(MicroServiceName.UI_TEST, "/ui/automation/stop/batch", reportIds); try {
microService.postForData(MicroServiceName.UI_TEST, "/ui/automation/stop/batch", reportIds);
} catch (Exception e) {
LogUtil.error("ui测试批量关闭失败!", e);
}
} }
} }
} }