From c813241a18b1f0570deb645550e0979cb11a52bc Mon Sep 17 00:00:00 2001 From: "qiao.zeng" Date: Mon, 27 Nov 2023 21:06:12 +0800 Subject: [PATCH] =?UTF-8?q?[Optimize]GroupTopic=E4=BF=A1=E6=81=AF=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=AE=9E=E6=97=B6=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../know/streaming/km/biz/group/GroupManager.java | 2 +- .../streaming/km/biz/group/impl/GroupManagerImpl.java | 9 +++++++-- .../km/rest/api/v3/cluster/ClusterGroupsController.java | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/km-biz/src/main/java/com/xiaojukeji/know/streaming/km/biz/group/GroupManager.java b/km-biz/src/main/java/com/xiaojukeji/know/streaming/km/biz/group/GroupManager.java index ea6465a38..60c9b0667 100644 --- a/km-biz/src/main/java/com/xiaojukeji/know/streaming/km/biz/group/GroupManager.java +++ b/km-biz/src/main/java/com/xiaojukeji/know/streaming/km/biz/group/GroupManager.java @@ -26,7 +26,7 @@ PaginationResult pagingGroupMembers(Long clusterPhyId, String searchGroupKeyword, PaginationBaseDTO dto); - PaginationResult pagingGroupTopicMembers(Long clusterPhyId, String groupName, PaginationBaseDTO dto); + PaginationResult pagingGroupTopicMembers(Long clusterPhyId, String groupName, PaginationBaseDTO dto) throws Exception; PaginationResult pagingClusterGroupsOverview(Long clusterPhyId, ClusterGroupSummaryDTO dto); diff --git a/km-biz/src/main/java/com/xiaojukeji/know/streaming/km/biz/group/impl/GroupManagerImpl.java b/km-biz/src/main/java/com/xiaojukeji/know/streaming/km/biz/group/impl/GroupManagerImpl.java index 753768dfc..55d7219c4 100644 --- a/km-biz/src/main/java/com/xiaojukeji/know/streaming/km/biz/group/impl/GroupManagerImpl.java +++ b/km-biz/src/main/java/com/xiaojukeji/know/streaming/km/biz/group/impl/GroupManagerImpl.java @@ -118,10 +118,15 @@ public PaginationResult pagingGroupMembers(Long clusterPhy } @Override - public PaginationResult pagingGroupTopicMembers(Long clusterPhyId, String groupName, PaginationBaseDTO dto) { + public PaginationResult pagingGroupTopicMembers(Long clusterPhyId, String groupName, PaginationBaseDTO dto) throws Exception { long startTimeUnitMs = System.currentTimeMillis(); - Group group = groupService.getGroupFromDB(clusterPhyId, groupName); + ClusterPhy clusterPhy = clusterPhyService.getClusterByCluster(clusterPhyId); + if (clusterPhy == null) { + return PaginationResult.buildFailure(MsgConstant.getClusterPhyNotExist(clusterPhyId), dto); + } + + Group group = groupService.getGroupFromKafka(clusterPhy, groupName); //没有topicMember则直接返回 if (group == null || ValidateUtils.isEmptyList(group.getTopicMembers())) { diff --git a/km-rest/src/main/java/com/xiaojukeji/know/streaming/km/rest/api/v3/cluster/ClusterGroupsController.java b/km-rest/src/main/java/com/xiaojukeji/know/streaming/km/rest/api/v3/cluster/ClusterGroupsController.java index 7159dca9d..d43515b67 100644 --- a/km-rest/src/main/java/com/xiaojukeji/know/streaming/km/rest/api/v3/cluster/ClusterGroupsController.java +++ b/km-rest/src/main/java/com/xiaojukeji/know/streaming/km/rest/api/v3/cluster/ClusterGroupsController.java @@ -77,7 +77,7 @@ public Result> getClusterPhyGroupPartitions(@PathVariable @GetMapping(value = "clusters/{clusterPhyId}/groups/{groupName}/topics-overview") public PaginationResult getGroupTopicsOverview(@PathVariable Long clusterPhyId, @PathVariable String groupName, - PaginationBaseDTO dto) { + PaginationBaseDTO dto) throws Exception { return groupManager.pagingGroupTopicMembers(clusterPhyId, groupName, dto); }