From 64d64fe6fedd83bed64b223eac79dce21958f035 Mon Sep 17 00:00:00 2001
From: zengqiao <zengqiao@didiglobal.com>
Date: Fri, 5 Jun 2020 15:23:56 +0800
Subject: [PATCH] bugfix, fix underReplicatedPartitionCount

---
 .../web/converters/BrokerModelConverter.java      |  1 +
 .../manager/web/vo/broker/BrokerOverallVO.java    | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/web/src/main/java/com/xiaojukeji/kafka/manager/web/converters/BrokerModelConverter.java b/web/src/main/java/com/xiaojukeji/kafka/manager/web/converters/BrokerModelConverter.java
index 90ac4c97..53527189 100644
--- a/web/src/main/java/com/xiaojukeji/kafka/manager/web/converters/BrokerModelConverter.java
+++ b/web/src/main/java/com/xiaojukeji/kafka/manager/web/converters/BrokerModelConverter.java
@@ -78,6 +78,7 @@ public class BrokerModelConverter {
                 Double bytesInPerSec = brokerOverallDTO.getBytesInPerSec() / 1024.0 / 1024.0;
                 brokerOverviewVO.setBytesInPerSec(Math.round(bytesInPerSec * 100) / 100.0);
             }
+            brokerOverviewVO.setUnderReplicatedPartitionCount(brokerOverallDTO.getUnderReplicatedPartitions());
             brokerOverviewVO.setLeaderCount(brokerOverallDTO.getLeaderCount());
             if (brokerOverallDTO.getPartitionCount() != null && brokerOverallDTO.getUnderReplicatedPartitions() != null) {
                 brokerOverviewVO.setNotUnderReplicatedPartitionCount(brokerOverallDTO.getPartitionCount() - brokerOverallDTO.getUnderReplicatedPartitions());
diff --git a/web/src/main/java/com/xiaojukeji/kafka/manager/web/vo/broker/BrokerOverallVO.java b/web/src/main/java/com/xiaojukeji/kafka/manager/web/vo/broker/BrokerOverallVO.java
index 6471bdfd..4a0031bf 100644
--- a/web/src/main/java/com/xiaojukeji/kafka/manager/web/vo/broker/BrokerOverallVO.java
+++ b/web/src/main/java/com/xiaojukeji/kafka/manager/web/vo/broker/BrokerOverallVO.java
@@ -30,9 +30,13 @@ public class BrokerOverallVO {
     @ApiModelProperty(value = "分区数")
     private Integer partitionCount;
 
-    @ApiModelProperty(value = "未同步分区数")
+    @Deprecated
+    @ApiModelProperty(value = "同步分区数")
     private Integer notUnderReplicatedPartitionCount;
 
+    @ApiModelProperty(value = "未同步分区数")
+    private Integer underReplicatedPartitionCount;
+
     @ApiModelProperty(value = "leader数")
     private Integer leaderCount;
 
@@ -103,6 +107,14 @@ public class BrokerOverallVO {
         this.notUnderReplicatedPartitionCount = notUnderReplicatedPartitionCount;
     }
 
+    public Integer getUnderReplicatedPartitionCount() {
+        return underReplicatedPartitionCount;
+    }
+
+    public void setUnderReplicatedPartitionCount(Integer underReplicatedPartitionCount) {
+        this.underReplicatedPartitionCount = underReplicatedPartitionCount;
+    }
+
     public Integer getLeaderCount() {
         return leaderCount;
     }
@@ -130,6 +142,7 @@ public class BrokerOverallVO {
                 ", bytesInPerSec=" + bytesInPerSec +
                 ", partitionCount=" + partitionCount +
                 ", notUnderReplicatedPartitionCount=" + notUnderReplicatedPartitionCount +
+                ", underReplicatedPartitionCount=" + underReplicatedPartitionCount +
                 ", leaderCount=" + leaderCount +
                 ", regionName='" + regionName + '\'' +
                 '}';