broker管理页搜索速度优化

jd-opensource · Oct 9, 2020 · f763c1e · f763c1e
1 parent abe2de6
commit f763c1e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/...a/joyqueue-data-service/src/main/java/org/joyqueue/service/BrokerGroupRelatedService.java b/...a/joyqueue-data-service/src/main/java/org/joyqueue/service/BrokerGroupRelatedService.java
@@ -16,6 +16,7 @@
 package org.joyqueue.service;
 
 import org.joyqueue.model.domain.BrokerGroupRelated;
+import org.joyqueue.model.domain.Identity;
 import org.joyqueue.model.query.QBrokerGroupRelated;
 
 import java.util.List;
@@ -28,5 +29,5 @@
 public interface BrokerGroupRelatedService extends PageService<BrokerGroupRelated, QBrokerGroupRelated> {
     int updateGroupByGroupId(BrokerGroupRelated brokerGroupRelated);
     int deleteByGroupId(long groupId);
-    Map<Long, String> findByBrokerIds(List<Long> brokerIds);
+    Map<Long, Identity> findGroupByBrokerIds(List<Long> brokerIds);
 }
diff --git a/...e-data-service/src/main/java/org/joyqueue/service/impl/BrokerGroupRelatedServiceImpl.java b/...e-data-service/src/main/java/org/joyqueue/service/impl/BrokerGroupRelatedServiceImpl.java
@@ -17,6 +17,7 @@
 
 import org.apache.commons.collections.CollectionUtils;
 import org.joyqueue.model.domain.BrokerGroupRelated;
+import org.joyqueue.model.domain.Identity;
 import org.joyqueue.model.query.QBrokerGroupRelated;
 import org.joyqueue.repository.BrokerGroupRelatedRepository;
 import org.joyqueue.service.BrokerGroupRelatedService;
@@ -45,13 +46,13 @@ public int deleteByGroupId(long groupId) {
     }
 
     @Override
-    public Map<Long, String> findByBrokerIds(List<Long> brokerIds) {
+    public Map<Long, Identity> findGroupByBrokerIds(List<Long> brokerIds) {
         List<BrokerGroupRelated> brokerGroupRelateds = repository.findByBrokerIds(brokerIds);
         if (CollectionUtils.isNotEmpty(brokerGroupRelateds)) {
             return brokerGroupRelateds.stream()
                     .filter(brokerGroupRelated -> brokerGroupRelated.getGroup() != null)
                     .collect(Collectors.toMap(BrokerGroupRelated::getId,
-                            brokerGroupRelated -> brokerGroupRelated.getGroup().getCode()));
+                            BrokerGroupRelated::getGroup));
         }
         return Collections.emptyMap();
     }

diff --git a/...data/joyqueue-data-service/src/main/java/org/joyqueue/service/impl/BrokerServiceImpl.java b/...data/joyqueue-data-service/src/main/java/org/joyqueue/service/impl/BrokerServiceImpl.java
@@ -31,7 +31,6 @@
 import org.joyqueue.service.BrokerGroupRelatedService;
 import org.joyqueue.service.BrokerService;
 import org.joyqueue.service.PartitionGroupReplicaService;
-import org.joyqueue.toolkit.time.SystemClock;
 import org.joyqueue.util.NullUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -237,11 +236,11 @@ private PageResult<Broker> searchMultiKeyword(QPageQuery<QBroker> qPageQuery) th
         PageResult<Broker> pageResult = brokerNameServerService.search(qPageQuery);
         if (pageResult != null && pageResult.getResult() != null && pageResult.getResult().size() > 0) {
             List<Broker> brokerList = pageResult.getResult();
-            Map<Long, String> brokerGroupMap = brokerGroupRelatedService.findByBrokerIds(brokerList.stream().map(Broker::getId).collect(Collectors.toList()));
+            Map<Long, Identity> brokerGroupMap = brokerGroupRelatedService.findGroupByBrokerIds(brokerList.stream().map(Broker::getId).collect(Collectors.toList()));
             for (Broker broker : brokerList) {
-                String group = brokerGroupMap.get(broker.getId());
-                if (StringUtils.isNotBlank(group)) {
-                    broker.setGroup(new Identity(group));
+                Identity group = brokerGroupMap.get(broker.getId());
+                if (group != null) {
+                    broker.setGroup(group);
                     broker.setStatus(0);
                 }
             }