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

fix(接口测试): 修复串行集合报告无法停止的缺陷

This commit is contained in:
wxg0103 2024-04-24 11:44:43 +08:00 committed by 刘瑞斌
parent d58266e56f
commit 8a44389761
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
backend/services/api-test/src/main/java/io/metersphere/api/listener/MessageListener.java
View File

@ -1,6 +1,8 @@
package io.metersphere.api.listener; package io.metersphere.api.listener;
import io.metersphere.api.event.ApiEventSource; import io.metersphere.api.event.ApiEventSource;
import io.metersphere.api.mapper.ApiReportMapper;
import io.metersphere.api.mapper.ApiScenarioReportMapper;
import io.metersphere.api.service.ApiReportSendNoticeService; import io.metersphere.api.service.ApiReportSendNoticeService;
import io.metersphere.api.service.definition.ApiReportService; import io.metersphere.api.service.definition.ApiReportService;
import io.metersphere.api.service.definition.ApiTestCaseBatchRunService; import io.metersphere.api.service.definition.ApiTestCaseBatchRunService;
@ -41,9 +43,9 @@ public class MessageListener {
@Resource @Resource
private ApiScenarioBatchRunService apiScenarioBatchRunService; private ApiScenarioBatchRunService apiScenarioBatchRunService;
@Resource @Resource
private ApiReportService apiReportService; private ApiReportMapper apiReportMapper;
@Resource @Resource
private ApiScenarioReportService apiScenarioReportService; private ApiScenarioReportMapper apiScenarioReportMapper;
@KafkaListener(id = MESSAGE_CONSUME_ID, topics = KafkaTopicConstants.API_REPORT_TASK_TOPIC, groupId = MESSAGE_CONSUME_ID) @KafkaListener(id = MESSAGE_CONSUME_ID, topics = KafkaTopicConstants.API_REPORT_TASK_TOPIC, groupId = MESSAGE_CONSUME_ID)
public void messageConsume(ConsumerRecord<?, String> record) { public void messageConsume(ConsumerRecord<?, String> record) {
@ -58,6 +60,19 @@ public class MessageListener {
// TODO 通知测试计划处理后续 // TODO 通知测试计划处理后续
LogUtils.info("发送通知给测试计划：{}", record.key()); LogUtils.info("发送通知给测试计划：{}", record.key());
apiEventSource.fireEvent(ApplicationScope.API_TEST, record.value()); apiEventSource.fireEvent(ApplicationScope.API_TEST, record.value());
}else {
ApiExecuteResourceType resourceType = EnumValidator.validateEnum(ApiExecuteResourceType.class, dto.getResourceType());
boolean isStop = switch (resourceType) {
case API_CASE -> StringUtils.equals(apiReportMapper.selectByPrimaryKey(dto.getReportId()).getStatus(), ApiReportStatus.STOPPED.name())
&& deleteQueue(dto.getQueueId());
case API_SCENARIO -> StringUtils.equals(apiScenarioReportMapper.selectByPrimaryKey(dto.getReportId()).getStatus(), ApiReportStatus.STOPPED.name())
&& deleteQueue(dto.getQueueId());
default -> false;
};
if (isStop) {
return;
}
} }
executeNextTask(dto); executeNextTask(dto);
@ -67,6 +82,10 @@ public class MessageListener {
} }
} }
private boolean deleteQueue(String queueId) {
apiExecutionQueueService.deleteQueue(queueId);
return true;
}
/** /**
* 执行批量的下一个任务 * 执行批量的下一个任务
* *