From 597989781b159fca075a7eb8f6cdfe8bef7bac84 Mon Sep 17 00:00:00 2001 From: fit2-zhao Date: Tue, 22 Oct 2024 09:58:47 +0800 Subject: [PATCH] =?UTF-8?q?refactor(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):?= =?UTF-8?q?=20=E6=9B=B4=E6=96=B0k8s=E4=BB=BB=E5=8A=A1=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/dto/pool/TestResourceDTO.java | 40 ++++++++++--------- .../system/service/BaseTaskHubService.java | 21 +++++----- 2 files changed, 31 insertions(+), 30 deletions(-) diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/dto/pool/TestResourceDTO.java b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/pool/TestResourceDTO.java index 4e4584ef4f..732fc6e214 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/dto/pool/TestResourceDTO.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/pool/TestResourceDTO.java @@ -7,59 +7,63 @@ import lombok.Setter; import java.util.List; /** - *用来解析TestResourceBlob的结构 + * 用来解析TestResourceBlob的结构 */ @Getter @Setter public class TestResourceDTO { + /** + * 资源id + */ + private String id; /** - * type为 node时, 接口测试 性能测试 node 节点配置 + * type为 node时, 接口测试 node 节点配置 */ - @Schema(description = "type为node时, 接口测试,性能测试node节点配置") + @Schema(description = "type为node时, 接口测试") private List nodesList; /** - * type为 k8s 时，接口测试，性能测试的ip + * type为 k8s 时，接口测试 */ - @Schema(description = "type为k8s时，接口测试，性能测试的ip") + @Schema(description = "type为k8s时，接口测试") private String ip; /** - * type为 k8s 时，接口测试，性能测试的token + * type为 k8s 时，接口测试 */ - @Schema(description = "type为k8s时，接口测试，性能测试的token") + @Schema(description = "type为k8s时，接口测试") private String token; /** - * type为 k8s 时，接口测试，性能测试的命名空间 + * type为 k8s 时，接口测试命名空间 */ - @Schema(description = "type为k8s时，接口测试，性能测试的命名空间") + @Schema(description = "type为k8s时，接口测试") private String namespace; /** - * type为 k8s 时，接口测试，性能测试，UI测试的最大并发数 + * type为 k8s 时，接口测试 */ - @Schema(description = "type为k8s时，接口测试，性能测试，UI测试的最大并发数") + @Schema(description = "type为k8s时，接口测试") private Integer concurrentNumber; /** - * type为 k8s 时，接口测试，性能测试的单pod 最大线程数 + * type为k8s时，最大任务并发数 */ - @Schema(description = "type为k8s时，接口测试，性能测试的单pod最大线程数") + @Schema(description = "type为k8s时，最大任务并发数") private Integer podThreads; /** - * type为 k8s 时，接口测试deployName + * type为 k8s 时，接口测试deployName */ - @Schema(description = "type为k8s时，接口测试deployName") + @Schema(description = "type为k8s时，接口测试deployName") private String deployName; - @Schema(description = "grid最大线程数") + @Schema(description = "grid最大线程数") private Integer girdConcurrentNumber; /** * 关联的组织id集合 */ - @Schema(description = "关联的组织id集合") - private ListorgIds; + @Schema(description = "关联的组织id集合") + private List orgIds; } diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseTaskHubService.java b/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseTaskHubService.java index e153657561..f73fcde49b 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseTaskHubService.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseTaskHubService.java @@ -171,28 +171,26 @@ public class BaseTaskHubService { UserExample userExample = new UserExample(); userExample.createCriteria().andIdIn(userIds); List userList = userMapper.selectByExample(userExample); - Map userMaps = userList.stream().collect(Collectors.toMap(User::getId, User::getName)); - return userMaps; + return userList.stream().collect(Collectors.toMap(User::getId, User::getName)); } private Map getOrganizationMaps(List organizationIds) { OrganizationExample organizationExample = new OrganizationExample(); organizationExample.createCriteria().andIdIn(organizationIds); List organizationList = organizationMapper.selectByExample(organizationExample); - Map organizationMaps = organizationList.stream().collect(Collectors.toMap(Organization::getId, Organization::getName)); - return organizationMaps; + return organizationList.stream().collect(Collectors.toMap(Organization::getId, Organization::getName)); } private Map getProjectMaps(List projectIds) { ProjectExample projectExample = new ProjectExample(); projectExample.createCriteria().andIdIn(projectIds); List projectList = projectMapper.selectByExample(projectExample); - Map projectMaps = projectList.stream().collect(Collectors.toMap(Project::getId, Project::getName)); - return projectMaps; + return projectList.stream().collect(Collectors.toMap(Project::getId, Project::getName)); } /** * 获取任务的报告集合 + * * @param taskIds 任务ID集合 * @return 报告集合 */ @@ -238,8 +236,8 @@ public class BaseTaskHubService { Map userMap = userLoginService.getUserNameMap(new ArrayList<>(userSet)); List resourceIds = list.stream() - .filter(item -> StringUtils.isNotBlank(item.getResourceId())) .map(TaskHubScheduleDTO::getResourceId) + .filter(StringUtils::isNotBlank) .toList(); Map trigerTimeMap = Map.of(); @@ -378,8 +376,7 @@ public class BaseTaskHubService { TestResourcePoolExample poolExample = new TestResourcePoolExample(); poolExample.createCriteria().andIdIn(resourcePoolIds); List poolList = testResourcePoolMapper.selectByExample(poolExample); - Map poolMaps = poolList.stream().collect(Collectors.toMap(TestResourcePool::getId, TestResourcePool::getName)); - return poolMaps; + return poolList.stream().collect(Collectors.toMap(TestResourcePool::getId, TestResourcePool::getName)); } /** @@ -439,8 +436,7 @@ public class BaseTaskHubService { TestResourcePoolBlobExample blobExample = new TestResourcePoolBlobExample(); blobExample.createCriteria().andIdIn(ids); List testResourcePoolBlobs = testResourcePoolBlobMapper.selectByExampleWithBLOBs(blobExample); - Map> poolMap = testResourcePoolBlobs.stream().collect(Collectors.groupingBy(TestResourcePoolBlob::getId)); - return poolMap; + return testResourcePoolBlobs.stream().collect(Collectors.groupingBy(TestResourcePoolBlob::getId)); } private List handleOptions(List allResourcePools, Map> poolMap) { @@ -525,7 +521,7 @@ public class BaseTaskHubService { node.setPort(split[1]); status = nodeResourcePoolService.validateNode(node); } catch (Exception e) { - status = false; + LogUtils.error(e); } boolean finalStatus = status; v.forEach(item -> { @@ -888,6 +884,7 @@ public class BaseTaskHubService { /** * 查询批量执行任务报告列表 + * * @param request 请求参数 * @return 执行任务报告集合 */