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:
wxg0103 2024-06-13 19:01:34 +08:00 committed by 刘瑞斌
parent dc9edd9fdc
commit 397708f55d
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -299,27 +299,29 @@ public class ApiTaskCenterService {
LogUtils.error(e); LogUtils.error(e);
} finally { } finally {
subList.forEach(reportId -> { subList.forEach(reportId -> {
TaskInfo taskInfo = taskRequestDTO.getTaskInfo();
TaskItem taskItem = new TaskItem();
taskItem.setReportId(reportId);
taskInfo.setResourceType(request.getModuleType());
taskItem.setResourceId(resourceIdMap.getOrDefault(reportId, null));
// 这里需要兼容测试计划批量执行的类型
if (StringUtils.isNotEmpty(testPlanIdMap.get(reportId))
&& !StringUtils.equals(testPlanIdMap.get(reportId), "NONE")) {
if (StringUtils.equals(request.getModuleType(), TaskCenterResourceType.API_CASE.toString())) {
taskInfo.setResourceType(ApiExecuteResourceType.TEST_PLAN_API_CASE.name());
} else if (StringUtils.equals(request.getModuleType(), TaskCenterResourceType.API_SCENARIO.toString())) {
taskInfo.setResourceType(ApiExecuteResourceType.TEST_PLAN_API_SCENARIO.name());
}
}
taskInfo.getRunModeConfig().setIntegratedReport(integrationMap.get(reportId));
if (BooleanUtils.isTrue(integrationMap.get(reportId))) { if (BooleanUtils.isTrue(integrationMap.get(reportId))) {
taskInfo.getRunModeConfig().getCollectionReport().setReportId(reportId); TaskInfo taskInfo = taskRequestDTO.getTaskInfo();
TaskItem taskItem = new TaskItem();
taskItem.setReportId(reportId);
taskInfo.setResourceType(request.getModuleType());
taskItem.setResourceId(resourceIdMap.getOrDefault(reportId, null));
// 这里需要兼容测试计划批量执行的类型
if (StringUtils.isNotEmpty(testPlanIdMap.get(reportId))
&& !StringUtils.equals(testPlanIdMap.get(reportId), "NONE")) {
if (StringUtils.equals(request.getModuleType(), TaskCenterResourceType.API_CASE.toString())) {
taskInfo.setResourceType(ApiExecuteResourceType.TEST_PLAN_API_CASE.name());
} else if (StringUtils.equals(request.getModuleType(), TaskCenterResourceType.API_SCENARIO.toString())) {
taskInfo.setResourceType(ApiExecuteResourceType.TEST_PLAN_API_SCENARIO.name());
}
}
taskInfo.getRunModeConfig().setIntegratedReport(integrationMap.get(reportId));
if (BooleanUtils.isTrue(integrationMap.get(reportId))) {
taskInfo.getRunModeConfig().getCollectionReport().setReportId(reportId);
}
taskRequestDTO.setTaskItem(taskItem);
result.setRequest(taskRequestDTO);
kafkaTemplate.send(KafkaTopicConstants.API_REPORT_TOPIC, JSON.toJSONString(result));
} }
taskRequestDTO.setTaskItem(taskItem);
result.setRequest(taskRequestDTO);
kafkaTemplate.send(KafkaTopicConstants.API_REPORT_TOPIC, JSON.toJSONString(result));
}); });
if (request.getModuleType().equals(TaskCenterResourceType.API_CASE.toString())) { if (request.getModuleType().equals(TaskCenterResourceType.API_CASE.toString())) {