From 2ce0076d6487fcc040292bc482175a8b94ff7fc5 Mon Sep 17 00:00:00 2001 From: wxg0103 <727495428@qq.com> Date: Wed, 29 May 2024 12:30:25 +0800 Subject: [PATCH] =?UTF-8?q?refactor(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):?= =?UTF-8?q?=20=E4=BC=98=E5=8C=96=E5=81=9C=E6=AD=A2=E5=AE=9E=E6=97=B6?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ApiDefinitionScheduleController.java | 4 -- .../api/service/ApiTaskCenterService.java | 38 +++++++++++++------ 2 files changed, 27 insertions(+), 15 deletions(-) diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/controller/definition/ApiDefinitionScheduleController.java b/backend/services/api-test/src/main/java/io/metersphere/api/controller/definition/ApiDefinitionScheduleController.java index 5470a9a664..63dd09cf88 100644 --- a/backend/services/api-test/src/main/java/io/metersphere/api/controller/definition/ApiDefinitionScheduleController.java +++ b/backend/services/api-test/src/main/java/io/metersphere/api/controller/definition/ApiDefinitionScheduleController.java @@ -2,11 +2,8 @@ package io.metersphere.api.controller.definition; import io.metersphere.api.dto.definition.ApiScheduleDTO; import io.metersphere.api.dto.definition.request.ApiScheduleRequest; -import io.metersphere.api.service.definition.ApiDefinitionLogService; import io.metersphere.api.service.definition.ApiDefinitionScheduleService; import io.metersphere.sdk.constants.PermissionConstants; -import io.metersphere.system.log.annotation.Log; -import io.metersphere.system.log.constants.OperationLogType; import io.metersphere.system.security.CheckOwner; import io.metersphere.system.utils.SessionUtils; import io.metersphere.validation.groups.Created; @@ -29,7 +26,6 @@ public class ApiDefinitionScheduleController { @PostMapping(value = "/add") @Operation(summary = "接口测试-接口管理-定时同步-创建") @RequiresPermissions(PermissionConstants.PROJECT_API_DEFINITION_IMPORT) - @Log(type = OperationLogType.ADD, expression = "#msClass.scheduleLog(#request)", msClass = ApiDefinitionLogService.class) public String createSchedule(@RequestBody @Validated({Created.class}) ApiScheduleRequest request) { return apiDefinitionScheduleService.createSchedule(request, SessionUtils.getUserId()); } diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/service/ApiTaskCenterService.java b/backend/services/api-test/src/main/java/io/metersphere/api/service/ApiTaskCenterService.java index b1057111fa..8abeefb6e5 100644 --- a/backend/services/api-test/src/main/java/io/metersphere/api/service/ApiTaskCenterService.java +++ b/backend/services/api-test/src/main/java/io/metersphere/api/service/ApiTaskCenterService.java @@ -8,13 +8,15 @@ import io.metersphere.api.mapper.ExtApiReportMapper; import io.metersphere.api.mapper.ExtApiScenarioReportMapper; import io.metersphere.project.domain.Project; import io.metersphere.project.mapper.ProjectMapper; +import io.metersphere.sdk.constants.ApiReportStatus; import io.metersphere.sdk.constants.HttpMethodConstants; +import io.metersphere.sdk.constants.KafkaTopicConstants; import io.metersphere.sdk.constants.TaskCenterResourceType; +import io.metersphere.sdk.dto.api.result.ProcessResultDTO; +import io.metersphere.sdk.dto.api.result.TaskResultDTO; +import io.metersphere.sdk.dto.api.task.TaskRequestDTO; import io.metersphere.sdk.exception.MSException; -import io.metersphere.sdk.util.DateUtils; -import io.metersphere.sdk.util.LogUtils; -import io.metersphere.sdk.util.SubListUtils; -import io.metersphere.sdk.util.Translator; +import io.metersphere.sdk.util.*; import io.metersphere.system.domain.Organization; import io.metersphere.system.dto.builder.LogDTOBuilder; import io.metersphere.system.dto.pool.TestResourceNodeDTO; @@ -39,6 +41,7 @@ import jakarta.annotation.Resource; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.MapUtils; import org.apache.commons.lang3.StringUtils; +import org.springframework.kafka.core.KafkaTemplate; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -81,6 +84,8 @@ public class ApiTaskCenterService { TestResourcePoolService testResourcePoolService; @Resource OperationLogService operationLogService; + @Resource + private KafkaTemplate kafkaTemplate; private static final String DEFAULT_SORT = "start_time desc"; private final static String PROJECT_STOP = "/task/center/api/project/stop"; private final static String ORG_STOP = "/task/center/api/org/stop"; @@ -136,7 +141,7 @@ public class ApiTaskCenterService { list = extApiReportMapper.taskCenterlist(request, projectIds, DateUtils.getDailyStartTime(), DateUtils.getDailyEndTime()); //执行历史列表 List reportIds = list.stream().map(TaskCenterDTO::getId).toList(); - if (CollectionUtils.isNotEmpty(reportIds)){ + if (CollectionUtils.isNotEmpty(reportIds)) { List historyDeletedList = extApiReportMapper.getHistoryDeleted(reportIds); historyDeletedMap = historyDeletedList.stream().collect(Collectors.toMap(ExecuteReportDTO::getId, Function.identity())); } @@ -270,22 +275,33 @@ public class ApiTaskCenterService { if (CollectionUtils.isNotEmpty(request.getExcludeIds())) { reportList.removeAll(request.getExcludeIds()); } - SubListUtils.dealForSubList(reportList, 500, (subList) -> { + SubListUtils.dealForSubList(reportList, 100, (subList) -> { try { LogUtils.info(String.format("开始发送停止请求到 %s 节点执行", endpoint), subList.toString()); TaskRunnerClient.stopApi(endpoint, subList); } catch (Exception e) { LogUtils.error(e); } finally { + TaskRequestDTO taskRequestDTO = new TaskRequestDTO(); + TaskResultDTO result = new TaskResultDTO(); + result.setRequestResults(List.of()); + result.setHasEnded(true); + ProcessResultDTO processResultDTO = new ProcessResultDTO(); + processResultDTO.setStatus(ApiReportStatus.STOPPED.name()); + result.setProcessResultDTO(processResultDTO); + result.setConsole("任务已终止"); + subList.forEach(reportId -> { + taskRequestDTO.setReportId(reportId); + taskRequestDTO.setResourceType(request.getModuleType()); + result.setRequest(taskRequestDTO); + kafkaTemplate.send(KafkaTopicConstants.API_REPORT_TOPIC, JSON.toJSONString(result)); + }); + if (request.getModuleType().equals(TaskCenterResourceType.API_CASE.toString())) { - extApiReportMapper.updateReportStatus(subList, System.currentTimeMillis(), userId); - extApiReportMapper.updateApiCaseStatus(subList); //记录日志 saveLog(subList, userId, path, method, StringUtils.join(module, "_REAL_TIME_API_CASE"), TaskCenterResourceType.API_CASE.toString()); } else if (request.getModuleType().equals(TaskCenterResourceType.API_SCENARIO.toString())) { - extApiScenarioReportMapper.updateReportStatus(subList, System.currentTimeMillis(), userId); - extApiScenarioReportMapper.updateApiScenario(subList); - saveLog(subList, userId, path, method, StringUtils.join(module,"_REAL_TIME_API_SCENARIO"), TaskCenterResourceType.API_SCENARIO.toString()); + saveLog(subList, userId, path, method, StringUtils.join(module, "_REAL_TIME_API_SCENARIO"), TaskCenterResourceType.API_SCENARIO.toString()); } } });