8x48/KnowStreaming
1
0
Fork 0
mirror of https://github.com/didi/KnowStreaming.git synced 2025-12-24 11:52:08 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

修复Topic详情中服务地址不展示问题

Browse Source
This commit is contained in:
zengqiao
2020-11-08 20:07:45 +08:00
parent 0f5819f5c2
commit 48aba34370
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/api/versionone/normal/NormalTopicController.java
View File

@@ -18,7 +18,6 @@ import com.xiaojukeji.kafka.manager.service.cache.LogicalClusterMetadataManager;
import com.xiaojukeji.kafka.manager.service.cache.PhysicalClusterMetadataManager;
import com.xiaojukeji.kafka.manager.service.service.*;
import com.xiaojukeji.kafka.manager.service.service.gateway.TopicConnectionService;
import com.xiaojukeji.kafka.manager.service.utils.ConfigUtils;
import com.xiaojukeji.kafka.manager.common.constant.ApiPrefix;
import com.xiaojukeji.kafka.manager.web.converters.CommonModelConverter;
import com.xiaojukeji.kafka.manager.web.converters.TopicModelConverter;
@@ -52,9 +51,6 @@ public class NormalTopicController {
@Autowired
private LogicalClusterMetadataManager logicalClusterMetadataManager;
@Autowired
private ConfigUtils configUtils;
@Autowired
private KafkaBillService kafkaBillService;
@@ -71,7 +67,7 @@ public class NormalTopicController {
}
return new Result<>(TopicModelConverter.convert2TopicBasicVO(
topicService.getTopicBasicDTO(physicalClusterId, topicName),
""
clusterService.getById(physicalClusterId)
));
}

8
kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/converters/TopicModelConverter.java
View File

@@ -3,6 +3,7 @@ package com.xiaojukeji.kafka.manager.web.converters;
import com.xiaojukeji.kafka.manager.common.entity.ao.topic.*;
import com.xiaojukeji.kafka.manager.common.entity.metrics.BaseMetrics;
import com.xiaojukeji.kafka.manager.common.entity.metrics.TopicMetrics;
import com.xiaojukeji.kafka.manager.common.entity.pojo.ClusterDO;
import com.xiaojukeji.kafka.manager.common.entity.vo.normal.TopicBusinessInfoVO;
import com.xiaojukeji.kafka.manager.common.entity.vo.normal.topic.*;
import com.xiaojukeji.kafka.manager.common.entity.vo.rd.TopicBrokerVO;
@@ -21,7 +22,7 @@ import java.util.List;
* @date 2017/6/1.
*/
public class TopicModelConverter {
public static TopicBasicVO convert2TopicBasicVO(TopicBasicDTO dto, String serviceDiscoveryAddress) {
public static TopicBasicVO convert2TopicBasicVO(TopicBasicDTO dto, ClusterDO clusterDO) {
TopicBasicVO vo = new TopicBasicVO();
vo.setClusterId(dto.getClusterId());
vo.setAppId(dto.getAppId());
@@ -35,7 +36,10 @@ public class TopicModelConverter {
vo.setScore(dto.getScore());
vo.setTopicCodeC(dto.getTopicCodeC());
vo.setDescription(dto.getDescription());
vo.setBootstrapServers(serviceDiscoveryAddress);
vo.setBootstrapServers("");
if (!ValidateUtils.isNull(clusterDO)) {
vo.setBootstrapServers(clusterDO.getBootstrapServers());
}
return vo;
}