From c2fd0a8410a0adfa5dd9430c5b656b3ba070d4d9 Mon Sep 17 00:00:00 2001 From: zengqiao Date: Tue, 29 Nov 2022 20:54:41 +0800 Subject: [PATCH] =?UTF-8?q?[Optimize]=E4=BC=98=E5=8C=96Sonar=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E5=87=BA=E7=9A=84=E4=B8=8D=E8=A7=84=E8=8C=83=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cluster/impl/MultiClusterPhyManagerImpl.java | 7 +------ .../metric/kafka/GroupMetricCollector.java | 2 +- .../bean/entity/param/cluster/ClusterPhyParam.java | 1 - .../service/broker/impl/BrokerSpecServiceImpl.java | 6 +++--- .../km/core/service/cluster/ClusterPhyService.java | 1 - .../core/service/topic/impl/TopicServiceImpl.java | 13 +++++++------ 6 files changed, 12 insertions(+), 18 deletions(-) diff --git a/km-biz/src/main/java/com/xiaojukeji/know/streaming/km/biz/cluster/impl/MultiClusterPhyManagerImpl.java b/km-biz/src/main/java/com/xiaojukeji/know/streaming/km/biz/cluster/impl/MultiClusterPhyManagerImpl.java index 3c8458e9..e5fa31e1 100644 --- a/km-biz/src/main/java/com/xiaojukeji/know/streaming/km/biz/cluster/impl/MultiClusterPhyManagerImpl.java +++ b/km-biz/src/main/java/com/xiaojukeji/know/streaming/km/biz/cluster/impl/MultiClusterPhyManagerImpl.java @@ -29,10 +29,7 @@ import com.xiaojukeji.know.streaming.km.core.service.version.metrics.kafka.Clust import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; @Service @@ -57,7 +54,6 @@ public class MultiClusterPhyManagerImpl implements MultiClusterPhyManager { false ); - // TODO 后续产品上，看是否需要增加一个未知的状态，否则新接入的集群，因为新接入的集群，数据存在延迟 ClusterPhysState physState = new ClusterPhysState(0, 0, clusterPhyList.size()); for (ClusterPhy clusterPhy: clusterPhyList) { KafkaController kafkaController = controllerMap.get(clusterPhy.getId()); @@ -111,7 +107,6 @@ public class MultiClusterPhyManagerImpl implements MultiClusterPhyManager { // 转为vo格式，方便后续进行分页筛选等 List voList = ConvertUtil.list2List(clusterPhyList, ClusterPhyDashboardVO.class); - // TODO 后续产品上，看是否需要增加一个未知的状态，否则新接入的集群，因为新接入的集群，数据存在延迟 // 获取集群controller信息并补充到vo中, Map controllerMap = kafkaControllerService.getKafkaControllersFromDB(clusterPhyList.stream().map(elem -> elem.getId()).collect(Collectors.toList()), false); for (ClusterPhyDashboardVO vo: voList) { diff --git a/km-collector/src/main/java/com/xiaojukeji/know/streaming/km/collector/metric/kafka/GroupMetricCollector.java b/km-collector/src/main/java/com/xiaojukeji/know/streaming/km/collector/metric/kafka/GroupMetricCollector.java index e41af566..44828dae 100644 --- a/km-collector/src/main/java/com/xiaojukeji/know/streaming/km/collector/metric/kafka/GroupMetricCollector.java +++ b/km-collector/src/main/java/com/xiaojukeji/know/streaming/km/collector/metric/kafka/GroupMetricCollector.java @@ -61,7 +61,7 @@ public class GroupMetricCollector extends AbstractMetricCollector items = versionControlService.listVersionControlItem(clusterPhyId, collectorType().getCode()); - FutureWaitUtil future = getFutureUtilByClusterPhyId(clusterPhyId); + FutureWaitUtil future = this.getFutureUtilByClusterPhyId(clusterPhyId); Map> metricsMap = new ConcurrentHashMap<>(); for(String groupName : groups) { diff --git a/km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/bean/entity/param/cluster/ClusterPhyParam.java b/km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/bean/entity/param/cluster/ClusterPhyParam.java index 9b01fa84..203efcdb 100644 --- a/km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/bean/entity/param/cluster/ClusterPhyParam.java +++ b/km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/bean/entity/param/cluster/ClusterPhyParam.java @@ -1,6 +1,5 @@ package com.xiaojukeji.know.streaming.km.common.bean.entity.param.cluster; -import com.xiaojukeji.know.streaming.km.common.bean.entity.param.VersionItemParam; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/broker/impl/BrokerSpecServiceImpl.java b/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/broker/impl/BrokerSpecServiceImpl.java index b2c7ef7f..5cbe3ce8 100644 --- a/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/broker/impl/BrokerSpecServiceImpl.java +++ b/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/broker/impl/BrokerSpecServiceImpl.java @@ -1,5 +1,7 @@ package com.xiaojukeji.know.streaming.km.core.service.broker.impl; +import com.didiglobal.logi.log.ILog; +import com.didiglobal.logi.log.LogFactory; import com.xiaojukeji.know.streaming.km.common.bean.entity.broker.BrokerSpec; import com.xiaojukeji.know.streaming.km.common.bean.po.config.PlatformClusterConfigPO; import com.xiaojukeji.know.streaming.km.common.enums.config.ConfigGroupEnum; @@ -15,11 +17,11 @@ import java.util.Map; @Service public class BrokerSpecServiceImpl implements BrokerSpecService { + private static final ILog LOGGER = LogFactory.getLog(BrokerSpecServiceImpl.class); @Autowired private PlatformClusterConfigService platformClusterConfigService; - @Override public Map getBrokerSpecMap(Long clusterPhyId) { //获取规格信息 @@ -37,6 +39,4 @@ public class BrokerSpecServiceImpl implements BrokerSpecService { } return brokerSpecMap; } - - } diff --git a/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/cluster/ClusterPhyService.java b/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/cluster/ClusterPhyService.java index 56b6640b..4027267a 100644 --- a/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/cluster/ClusterPhyService.java +++ b/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/cluster/ClusterPhyService.java @@ -9,7 +9,6 @@ import com.xiaojukeji.know.streaming.km.common.exception.NotExistException; import com.xiaojukeji.know.streaming.km.common.exception.ParamErrorException; import java.util.List; -import java.util.Set; /** * @author didi diff --git a/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/topic/impl/TopicServiceImpl.java b/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/topic/impl/TopicServiceImpl.java index e2870d9d..2c0309f0 100644 --- a/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/topic/impl/TopicServiceImpl.java +++ b/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/topic/impl/TopicServiceImpl.java @@ -116,15 +116,16 @@ public class TopicServiceImpl implements TopicService { @Override public List listRecentUpdateTopicNamesFromDB(Long clusterPhyId, Integer time) { - Date updateTime = DateUtils.getBeforeSeconds(new Date(), time); LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(TopicPO::getClusterPhyId, clusterPhyId); - lambdaQueryWrapper.ge(TopicPO::getUpdateTime, updateTime); - List topicPOS = topicDAO.selectList(lambdaQueryWrapper); - if (topicPOS.isEmpty()){ + lambdaQueryWrapper.ge(TopicPO::getClusterPhyId, clusterPhyId); + lambdaQueryWrapper.ge(TopicPO::getUpdateTime, DateUtils.getBeforeSeconds(new Date(), time)); + + List poList = topicDAO.selectList(lambdaQueryWrapper); + if (poList.isEmpty()){ return new ArrayList<>(); } - return topicPOS.stream().map(TopicPO::getTopicName).collect(Collectors.toList()); + + return poList.stream().map(elem -> elem.getTopicName()).collect(Collectors.toList()); } @Override