diff --git a/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/connect/connector/impl/ConnectorMetricServiceImpl.java b/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/connect/connector/impl/ConnectorMetricServiceImpl.java index 10325e02..c40d1ee1 100644 --- a/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/connect/connector/impl/ConnectorMetricServiceImpl.java +++ b/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/connect/connector/impl/ConnectorMetricServiceImpl.java @@ -392,13 +392,13 @@ public class ConnectorMetricServiceImpl extends BaseConnectorMetricService imple } private List> listTopNConnectorList(Long clusterPhyId, Integer topN) { - List connectorPOS = connectorService.listByKafkaClusterIdFromDB(clusterPhyId); + List poList = connectorService.listByKafkaClusterIdFromDB(clusterPhyId); - if (CollectionUtils.isEmpty(connectorPOS)) { + if (CollectionUtils.isEmpty(poList)) { return new ArrayList<>(); } - return connectorPOS.subList(0, Math.min(topN, connectorPOS.size())) + return poList.subList(0, Math.min(topN, poList.size())) .stream() .map( c -> new Tuple<>(c.getId(), c.getConnectorName()) ) .collect(Collectors.toList()); diff --git a/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/topic/impl/TopicMetricServiceImpl.java b/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/topic/impl/TopicMetricServiceImpl.java index 731bc548..d4a12b41 100644 --- a/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/topic/impl/TopicMetricServiceImpl.java +++ b/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/topic/impl/TopicMetricServiceImpl.java @@ -185,7 +185,7 @@ public class TopicMetricServiceImpl extends BaseMetricService implements TopicMe Table> retTable; if(CollectionUtils.isEmpty(topics)) { //如果 es 中获取不到topN的topic就使用从数据库中获取的topics - List defaultTopics = listTopNTopics(clusterId, topN); + List defaultTopics = this.listTopNTopics(clusterId, topN); retTable = topicMetricESDAO.listTopicMetricsByTopN(clusterId, defaultTopics, metrics, aggType, topN, startTime, endTime ); }else { retTable = topicMetricESDAO.listTopicMetricsByTopics(clusterId, metrics, aggType, topics, startTime, endTime); diff --git a/km-rest/src/main/java/com/xiaojukeji/know/streaming/km/rest/api/v3/cluster/ClusterConnectsController.java b/km-rest/src/main/java/com/xiaojukeji/know/streaming/km/rest/api/v3/cluster/ClusterConnectsController.java index e7d93af8..9f679d31 100644 --- a/km-rest/src/main/java/com/xiaojukeji/know/streaming/km/rest/api/v3/cluster/ClusterConnectsController.java +++ b/km-rest/src/main/java/com/xiaojukeji/know/streaming/km/rest/api/v3/cluster/ClusterConnectsController.java @@ -119,7 +119,7 @@ public class ClusterConnectsController { @PostMapping(value = "clusters/{clusterPhyId}/connectors-metrics") @ResponseBody public Result> getClusterPhyMetrics(@PathVariable Long clusterPhyId, - @Validated @RequestBody MetricsConnectorsDTO dto) { + @Validated @RequestBody MetricsConnectorsDTO dto) { return connectorMetricService.listConnectClusterMetricsFromES(clusterPhyId, dto); }