diff --git a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/ao/topic/MineTopicSummary.java b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/ao/topic/MineTopicSummary.java index 45fffebd..7f02e51b 100644 --- a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/ao/topic/MineTopicSummary.java +++ b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/ao/topic/MineTopicSummary.java @@ -25,6 +25,8 @@ public class MineTopicSummary { private Integer access; + private String description; + public Long getLogicalClusterId() { return logicalClusterId; } @@ -105,6 +107,14 @@ public class MineTopicSummary { this.access = access; } + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + @Override public String toString() { return "MineTopicSummary{" + diff --git a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/vo/normal/topic/TopicMineVO.java b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/vo/normal/topic/TopicMineVO.java index 2cda46cb..2e4665a1 100644 --- a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/vo/normal/topic/TopicMineVO.java +++ b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/vo/normal/topic/TopicMineVO.java @@ -36,6 +36,9 @@ public class TopicMineVO { @ApiModelProperty(value = "状态, 0:无权限, 1:可消费 2:可发送 3:可消费发送 4:可管理") private Integer access; + @ApiModelProperty(value = "备注") + private String description; + public Long getClusterId() { return clusterId; } @@ -108,6 +111,14 @@ public class TopicMineVO { this.access = access; } + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + @Override public String toString() { return "TopicMineVO{" + diff --git a/kafka-manager-core/src/main/java/com/xiaojukeji/kafka/manager/service/service/impl/TopicManagerServiceImpl.java b/kafka-manager-core/src/main/java/com/xiaojukeji/kafka/manager/service/service/impl/TopicManagerServiceImpl.java index 4a8f501f..a25115ef 100644 --- a/kafka-manager-core/src/main/java/com/xiaojukeji/kafka/manager/service/service/impl/TopicManagerServiceImpl.java +++ b/kafka-manager-core/src/main/java/com/xiaojukeji/kafka/manager/service/service/impl/TopicManagerServiceImpl.java @@ -210,7 +210,7 @@ public class TopicManagerServiceImpl implements TopicManagerService { } } - // 增加流量信息 + // 增加流量和描述信息 Map> metricMap = KafkaMetricsCache.getAllTopicMetricsFromCache(); for (MineTopicSummary mineTopicSummary : summaryList) { TopicMetrics topicMetrics = getTopicMetricsFromCacheOrJmx( @@ -219,6 +219,10 @@ public class TopicManagerServiceImpl implements TopicManagerService { metricMap); mineTopicSummary.setBytesIn(topicMetrics.getSpecifiedMetrics("BytesInPerSecOneMinuteRate")); mineTopicSummary.setBytesOut(topicMetrics.getSpecifiedMetrics("BytesOutPerSecOneMinuteRate")); + + // 增加topic描述信息 + TopicDO topicDO = topicDao.getByTopicName(mineTopicSummary.getPhysicalClusterId(), mineTopicSummary.getTopicName()); + mineTopicSummary.setDescription(topicDO.getDescription()); } return summaryList; } diff --git a/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/converters/TopicMineConverter.java b/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/converters/TopicMineConverter.java index 97b8f04a..e21c41da 100644 --- a/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/converters/TopicMineConverter.java +++ b/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/converters/TopicMineConverter.java @@ -29,6 +29,7 @@ public class TopicMineConverter { vo.setClusterName(data.getLogicalClusterName()); vo.setBytesIn(data.getBytesIn()); vo.setBytesOut(data.getBytesOut()); + vo.setDescription(data.getDescription()); voList.add(vo); } return voList;