From 37585f760d8caf8c93721de27230c98c3377039b Mon Sep 17 00:00:00 2001 From: zengqiao Date: Tue, 11 Jan 2022 16:57:24 +0800 Subject: [PATCH] optimize reeassign task-name --- .../web/converters/ReassignModelConverter.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/converters/ReassignModelConverter.java b/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/converters/ReassignModelConverter.java index 747fbb8b..06de3ad9 100644 --- a/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/converters/ReassignModelConverter.java +++ b/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/converters/ReassignModelConverter.java @@ -95,12 +95,21 @@ public class ReassignModelConverter { vo.setBeginTime(0L); vo.setEndTime(0L); + StringBuilder clusterAndTopicName = new StringBuilder(); + Integer completedTopicNum = 0; Set statusSet = new HashSet<>(); for (ReassignTaskDO elem: doList) { vo.setGmtCreate(elem.getGmtCreate().getTime()); vo.setOperator(elem.getOperator()); vo.setDescription(elem.getDescription()); + + if (clusterAndTopicName.length() == 0) { + clusterAndTopicName.append("-").append(elem.getClusterId()).append("-").append(elem.getTopicName()); + } else { + clusterAndTopicName.append("等"); + } + if (TaskStatusReassignEnum.isFinished(elem.getStatus())) { completedTopicNum += 1; statusSet.add(elem.getStatus()); @@ -114,6 +123,9 @@ public class ReassignModelConverter { vo.setBeginTime(elem.getBeginTime().getTime()); } + // 任务名称上，增加展示集群ID和Topic名称，多个时，仅展示第一个. PR from Hongten + vo.setTaskName(String.format("%s 数据迁移任务%s", DateUtils.getFormattedDate(taskId), clusterAndTopicName.toString())); + // 任务整体状态 if (statusSet.contains(TaskStatusReassignEnum.RUNNING.getCode())) { vo.setStatus(TaskStatusReassignEnum.RUNNING.getCode());