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

Hide __transaction_state in topic list && fix logic error

Browse Source
This commit is contained in:
17hao
2021-02-04 12:14:44 +08:00
parent dfb625377b
commit e8de403286
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
kafka-manager-core/src/main/java/com/xiaojukeji/kafka/manager/service/service/impl/TopicManagerServiceImpl.java
View File

@@ -2,6 +2,7 @@ package com.xiaojukeji.kafka.manager.service.service.impl;
import com.xiaojukeji.kafka.manager.common.bizenum.KafkaClientEnum; import com.xiaojukeji.kafka.manager.common.bizenum.KafkaClientEnum;
import com.xiaojukeji.kafka.manager.common.bizenum.TopicAuthorityEnum; import com.xiaojukeji.kafka.manager.common.bizenum.TopicAuthorityEnum;
import com.xiaojukeji.kafka.manager.common.constant.KafkaConstant;
import com.xiaojukeji.kafka.manager.common.constant.KafkaMetricsCollections; import com.xiaojukeji.kafka.manager.common.constant.KafkaMetricsCollections;
import com.xiaojukeji.kafka.manager.common.constant.TopicCreationConstant; import com.xiaojukeji.kafka.manager.common.constant.TopicCreationConstant;
import com.xiaojukeji.kafka.manager.common.entity.Result; import com.xiaojukeji.kafka.manager.common.entity.Result;
@@ -275,11 +276,13 @@ public class TopicManagerServiceImpl implements TopicManagerService {
} }
Map<Long, Map<String, TopicDO>> topicMap = new HashMap<>(appList.size()); Map<Long, Map<String, TopicDO>> topicMap = new HashMap<>(appList.size());
for (TopicDO topicDO: topicList) { for (TopicDO topicDO: topicList) {
if (topicDO.getTopicName().equals(KafkaConstant.COORDINATOR_TOPIC_NAME)) { String topicName = topicDO.getTopicName();
if (topicName.equals(KafkaConstant.COORDINATOR_TOPIC_NAME) ||
topicName.equals(KafkaConstant.TRANSACTION_TOPIC_NAME)) {
continue; continue;
} }
Map<String, TopicDO> subTopicMap = topicMap.getOrDefault(topicDO.getClusterId(), new HashMap<>()); Map<String, TopicDO> subTopicMap = topicMap.getOrDefault(topicDO.getClusterId(), new HashMap<>());
subTopicMap.put(topicDO.getTopicName(), topicDO); subTopicMap.put(topicName, topicDO);
topicMap.put(topicDO.getClusterId(), subTopicMap); topicMap.put(topicDO.getClusterId(), subTopicMap);
} }
@@ -304,6 +307,11 @@ public class TopicManagerServiceImpl implements TopicManagerService {
continue; continue;
} }
TopicDO topicDO = topicMap.get(topicName);
if (ValidateUtils.isNull(topicDO)) {
continue;
}
TopicDTO dto = new TopicDTO(); TopicDTO dto = new TopicDTO();
dtoList.add(dto); dtoList.add(dto);
@@ -311,11 +319,6 @@ public class TopicManagerServiceImpl implements TopicManagerService {
dto.setLogicalClusterName(logicalClusterDO.getName()); dto.setLogicalClusterName(logicalClusterDO.getName());
dto.setTopicName(topicName); dto.setTopicName(topicName);
dto.setNeedAuth(Boolean.TRUE); dto.setNeedAuth(Boolean.TRUE);
TopicDO topicDO = topicMap.get(topicName);
if (ValidateUtils.isNull(topicDO)) {
continue;
}
dto.setDescription(topicDO.getDescription()); dto.setDescription(topicDO.getDescription());
dto.setAppId(topicDO.getAppId()); dto.setAppId(topicDO.getAppId());