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

refactor(接口测试): 优化停止逻辑

This commit is contained in:
fit2-zhao 2024-08-19 13:30:55 +08:00 committed by Craftsman
parent 21ca4c8b3e
commit 7d505ff384
1 changed files with 41 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
backend/services/api-test/src/main/java/io/metersphere/api/service/ApiTaskCenterService.java
View File

@ -41,7 +41,6 @@ import io.metersphere.system.utils.SessionUtils;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.MapUtils; import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.kafka.core.KafkaTemplate; import org.springframework.kafka.core.KafkaTemplate;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -250,6 +249,7 @@ public class ApiTaskCenterService {
/** /**
* 校验权限 * 校验权限
*
* @param checkPermissionFunc * @param checkPermissionFunc
* @param reports * @param reports
*/ */
@ -296,28 +296,33 @@ public class ApiTaskCenterService {
List<String> reportList, List<String> reportList,
List<TestResourceNodeDTO> nodesList, List<TestResourceNodeDTO> nodesList,
List<ReportDTO> reports) { List<ReportDTO> reports) {
// 根据报告id分组 key是报告id value是 是否集成 // 根据报告id分组
Map<String, Boolean> integrationMap = reports.stream() Map<String, Boolean> integrationMap = reports.stream()
.collect(Collectors.toMap(ReportDTO::getId, ReportDTO::getIntegrated)); .collect(Collectors.toMap(ReportDTO::getId, ReportDTO::getIntegrated));
Map<String, String> resourceIdMap = reports.stream() Map<String, String> resourceIdMap = reports.stream()
.collect(Collectors.toMap(ReportDTO::getId, ReportDTO::getResourceId)); .collect(Collectors.toMap(ReportDTO::getId, ReportDTO::getResourceId));
Map<String, String> testPlanIdMap = reports.stream() Map<String, String> testPlanIdMap = reports.stream()
.collect(Collectors.toMap(ReportDTO::getId, ReportDTO::getTestPlanId)); .collect(Collectors.toMap(ReportDTO::getId, ReportDTO::getTestPlanId));
nodesList.parallelStream().forEach(node -> {
String endpoint = MsHttpClient.getEndpoint(node.getIp(), node.getPort()); // 如果需要排除的报告ID不为空，则从reportList中移除
//需要去除取消勾选的report if (request.getExcludeIds() != null && !request.getExcludeIds().isEmpty()) {
if (CollectionUtils.isNotEmpty(request.getExcludeIds())) {
reportList.removeAll(request.getExcludeIds()); reportList.removeAll(request.getExcludeIds());
} }
nodesList.parallelStream().forEach(node -> {
String endpoint = MsHttpClient.getEndpoint(node.getIp(), node.getPort());
// 初始化 TaskRequestDTO 和 TaskResultDTO
TaskRequestDTO taskRequestDTO = new TaskRequestDTO(); TaskRequestDTO taskRequestDTO = new TaskRequestDTO();
TaskResultDTO result = new TaskResultDTO(); TaskResultDTO result = new TaskResultDTO();
result.setRequestResults(List.of()); result.setRequestResults(Collections.emptyList());
result.setHasEnded(true); result.setHasEnded(true);
ProcessResultDTO processResultDTO = new ProcessResultDTO(); ProcessResultDTO processResultDTO = new ProcessResultDTO();
processResultDTO.setStatus(ExecStatus.STOPPED.name()); processResultDTO.setStatus(ExecStatus.STOPPED.name());
result.setProcessResultDTO(processResultDTO); result.setProcessResultDTO(processResultDTO);
result.setConsole("任务已终止"); result.setConsole("任务已终止");
SubListUtils.dealForSubList(reportList, 100, (subList) -> {
SubListUtils.dealForSubList(reportList, 100, subList -> {
try { try {
LogUtils.info(String.format("开始发送停止请求到 %s 节点执行", endpoint), subList.toString()); LogUtils.info(String.format("开始发送停止请求到 %s 节点执行", endpoint), subList.toString());
MsHttpClient.stopApi(endpoint, subList); MsHttpClient.stopApi(endpoint, subList);
@ -325,35 +330,41 @@ public class ApiTaskCenterService {
LogUtils.error(e); LogUtils.error(e);
} finally { } finally {
subList.forEach(reportId -> { subList.forEach(reportId -> {
if (BooleanUtils.isTrue(integrationMap.get(reportId))) {
TaskInfo taskInfo = taskRequestDTO.getTaskInfo(); TaskInfo taskInfo = taskRequestDTO.getTaskInfo();
taskInfo.setResourceType(request.getModuleType());
TaskItem taskItem = new TaskItem(); TaskItem taskItem = new TaskItem();
taskItem.setReportId(reportId); taskItem.setReportId(reportId);
taskInfo.setResourceType(request.getModuleType()); taskItem.setResourceId(resourceIdMap.get(reportId));
taskItem.setResourceId(resourceIdMap.getOrDefault(reportId, null)); // 设置任务信息的资源类型
// 这里需要兼容测试计划批量执行的类型 String testPlanId = testPlanIdMap.get(reportId);
if (StringUtils.isNotEmpty(testPlanIdMap.get(reportId)) if (testPlanId != null && !"NONE".equals(testPlanId)) {
&& !StringUtils.equals(testPlanIdMap.get(reportId), "NONE")) { String moduleType = request.getModuleType();
if (StringUtils.equals(request.getModuleType(), TaskCenterResourceType.API_CASE.toString())) { taskInfo.setResourceType(
taskInfo.setResourceType(ApiExecuteResourceType.TEST_PLAN_API_CASE.name()); TaskCenterResourceType.API_CASE.toString().equals(moduleType)
} else if (StringUtils.equals(request.getModuleType(), TaskCenterResourceType.API_SCENARIO.toString())) { ? ApiExecuteResourceType.TEST_PLAN_API_CASE.name()
taskInfo.setResourceType(ApiExecuteResourceType.TEST_PLAN_API_SCENARIO.name()); : TaskCenterResourceType.API_SCENARIO.toString().equals(moduleType)
} ? ApiExecuteResourceType.TEST_PLAN_API_SCENARIO.name()
: taskInfo.getResourceType()
);
} }
// 设置集成报告
taskInfo.getRunModeConfig().setIntegratedReport(integrationMap.get(reportId)); taskInfo.getRunModeConfig().setIntegratedReport(integrationMap.get(reportId));
if (BooleanUtils.isTrue(integrationMap.get(reportId))) { if (Boolean.TRUE.equals(integrationMap.get(reportId))) {
taskInfo.getRunModeConfig().getCollectionReport().setReportId(reportId); taskInfo.getRunModeConfig().getCollectionReport().setReportId(reportId);
} }
taskRequestDTO.setTaskItem(taskItem); taskRequestDTO.setTaskItem(taskItem);
result.setRequest(taskRequestDTO); result.setRequest(taskRequestDTO);
kafkaTemplate.send(KafkaTopicConstants.API_REPORT_TOPIC, JSON.toJSONString(result)); kafkaTemplate.send(KafkaTopicConstants.API_REPORT_TOPIC, JSON.toJSONString(result));
}
}); });
} }
}); });
}); });
} }
private void saveLog(List<String> ids, String userId, String module, String type) { private void saveLog(List<String> ids, String userId, String module, String type) {
List<ReportDTO> reports = new ArrayList<>(); List<ReportDTO> reports = new ArrayList<>();
if (StringUtils.equals(type, TaskCenterResourceType.API_CASE.toString())) { if (StringUtils.equals(type, TaskCenterResourceType.API_CASE.toString())) {