diff --git a/src/main/java/com/xuxd/kafka/console/beans/BrokerNode.java b/src/main/java/com/xuxd/kafka/console/beans/BrokerNode.java index 02a6d6c..bc053b6 100644 --- a/src/main/java/com/xuxd/kafka/console/beans/BrokerNode.java +++ b/src/main/java/com/xuxd/kafka/console/beans/BrokerNode.java @@ -8,7 +8,7 @@ import org.apache.kafka.common.Node; * @author xuxd * @date 2021-10-08 14:03:21 **/ -public class BrokerNode { +public class BrokerNode implements Comparable{ private int id; @@ -80,4 +80,8 @@ public class BrokerNode { public void setController(boolean controller) { isController = controller; } + + @Override public int compareTo(Object o) { + return this.id - ((BrokerNode)o).id; + } } diff --git a/src/main/java/com/xuxd/kafka/console/service/impl/ClusterServiceImpl.java b/src/main/java/com/xuxd/kafka/console/service/impl/ClusterServiceImpl.java index 96d97a3..9907c50 100644 --- a/src/main/java/com/xuxd/kafka/console/service/impl/ClusterServiceImpl.java +++ b/src/main/java/com/xuxd/kafka/console/service/impl/ClusterServiceImpl.java @@ -1,6 +1,7 @@ package com.xuxd.kafka.console.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.xuxd.kafka.console.beans.ClusterInfo; import com.xuxd.kafka.console.beans.ResponseData; import com.xuxd.kafka.console.beans.dos.ClusterInfoDO; import com.xuxd.kafka.console.beans.vo.BrokerApiVersionVO; @@ -13,6 +14,7 @@ import java.util.Collections; import java.util.Comparator; import java.util.HashMap; import java.util.List; +import java.util.TreeSet; import java.util.stream.Collectors; import kafka.console.ClusterConsole; import org.apache.commons.collections.CollectionUtils; @@ -42,7 +44,9 @@ public class ClusterServiceImpl implements ClusterService { } @Override public ResponseData getClusterInfo() { - return ResponseData.create().data(clusterConsole.clusterInfo()).success(); + ClusterInfo clusterInfo = clusterConsole.clusterInfo(); + clusterInfo.setNodes(new TreeSet<>(clusterInfo.getNodes())); + return ResponseData.create().data(clusterInfo).success(); } @Override public ResponseData getClusterInfoList() {