[inlong] branch master updated: [INLONG-6610][Manager] Support query all MQ clusters by cluster tag (addendum) (#6722)

[healchow]

This is an automated email from the ASF dual-hosted git repository.

healchow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git


The following commit(s) were added to refs/heads/master by this push:
     new 75247dd58 [INLONG-6610][Manager] Support query all MQ clusters by 
cluster tag (addendum) (#6722)
75247dd58 is described below

commit 75247dd58557b6f105bbb886f5244462d4c7d497
Author: Goson Zhang <4675...@qq.com>
AuthorDate: Sat Dec 3 21:57:02 2022 +0800

    [INLONG-6610][Manager] Support query all MQ clusters by cluster tag 
(addendum) (#6722)
---
 .../inlong/manager/service/core/impl/AgentServiceImpl.java    | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/AgentServiceImpl.java
 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/AgentServiceImpl.java
index 0ca0fb083..e76c750e3 100644
--- 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/AgentServiceImpl.java
+++ 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/AgentServiceImpl.java
@@ -35,6 +35,7 @@ import org.apache.inlong.common.pojo.dataproxy.MQClusterInfo;
 import org.apache.inlong.manager.common.consts.InlongConstants;
 import org.apache.inlong.common.constant.MQType;
 import org.apache.inlong.manager.common.consts.SourceType;
+import org.apache.inlong.manager.common.enums.ClusterType;
 import org.apache.inlong.manager.common.enums.SourceStatus;
 import org.apache.inlong.manager.common.exceptions.BusinessException;
 import org.apache.inlong.manager.common.util.CommonBeanUtils;
@@ -49,6 +50,7 @@ import 
org.apache.inlong.manager.dao.mapper.InlongClusterEntityMapper;
 import org.apache.inlong.manager.dao.mapper.InlongGroupEntityMapper;
 import org.apache.inlong.manager.dao.mapper.InlongStreamEntityMapper;
 import org.apache.inlong.manager.dao.mapper.StreamSourceEntityMapper;
+import org.apache.inlong.manager.pojo.cluster.ClusterPageRequest;
 import org.apache.inlong.manager.pojo.cluster.pulsar.PulsarClusterDTO;
 import org.apache.inlong.manager.pojo.source.file.FileSourceDTO;
 import org.apache.inlong.manager.service.core.AgentService;
@@ -374,8 +376,13 @@ public class AgentServiceImpl implements AgentService {
         if (InlongConstants.REPORT_TO_MQ_RECEIVED == dataReportType) {
             // add mq cluster setting
             List<MQClusterInfo> mqSet = new ArrayList<>();
-            List<InlongClusterEntity> mqClusterList =
-                    
clusterMapper.selectByClusterTag(groupEntity.getInlongClusterTag());
+            List<String> clusterTagList = 
Arrays.asList(groupEntity.getInlongClusterTag());
+            List<String> typeList = Arrays.asList(ClusterType.TUBEMQ, 
ClusterType.PULSAR);
+            ClusterPageRequest pageRequest = ClusterPageRequest.builder()
+                    .typeList(typeList)
+                    .clusterTagList(clusterTagList)
+                    .build();
+            List<InlongClusterEntity> mqClusterList = 
clusterMapper.selectByCondition(pageRequest);
             for (InlongClusterEntity cluster : mqClusterList) {
                 MQClusterInfo clusterInfo = new MQClusterInfo();
                 clusterInfo.setUrl(cluster.getUrl());