From 05ceeea4b0260aca75fc98c8c7c8941d5e807375 Mon Sep 17 00:00:00 2001 From: xuguang Date: Mon, 21 Feb 2022 10:41:50 +0800 Subject: [PATCH] =?UTF-8?q?bugfix:=20LogicalClusterDTO=E5=92=8CRegionDTO?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=8F=82=E6=95=B0=E5=86=97=E4=BD=99=20&=20Rd?= =?UTF-8?q?LogicalClusterController=E8=A7=A3=E9=87=8A=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manager/common/entity/dto/rd/LogicalClusterDTO.java | 5 +---- .../kafka/manager/common/entity/dto/rd/RegionDTO.java | 5 +---- .../web/api/versionone/rd/RdLogicalClusterController.java | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/dto/rd/LogicalClusterDTO.java b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/dto/rd/LogicalClusterDTO.java index def22479..c3420f68 100644 --- a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/dto/rd/LogicalClusterDTO.java +++ b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/dto/rd/LogicalClusterDTO.java @@ -118,10 +118,7 @@ public class LogicalClusterDTO { } public boolean legal() { - if (ValidateUtils.isNull(clusterId) - || ValidateUtils.isNull(clusterId) - || ValidateUtils.isEmptyList(regionIdList) - || ValidateUtils.isNull(mode)) { + if (ValidateUtils.isNull(clusterId) || ValidateUtils.isEmptyList(regionIdList) || ValidateUtils.isNull(mode)) { return false; } if (!ClusterModeEnum.SHARED_MODE.getCode().equals(mode) && ValidateUtils.isNull(appId)) { diff --git a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/dto/rd/RegionDTO.java b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/dto/rd/RegionDTO.java index 708aa3ce..7c30d681 100644 --- a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/dto/rd/RegionDTO.java +++ b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/dto/rd/RegionDTO.java @@ -94,10 +94,7 @@ public class RegionDTO { } public boolean legal() { - if (ValidateUtils.isNull(clusterId) - || ValidateUtils.isNull(clusterId) - || ValidateUtils.isEmptyList(brokerIdList) - || ValidateUtils.isNull(status)) { + if (ValidateUtils.isNull(clusterId) || ValidateUtils.isEmptyList(brokerIdList) || ValidateUtils.isNull(status)) { return false; } description = ValidateUtils.isNull(description)? "": description; diff --git a/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/api/versionone/rd/RdLogicalClusterController.java b/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/api/versionone/rd/RdLogicalClusterController.java index 27ce469b..1dbeac5b 100644 --- a/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/api/versionone/rd/RdLogicalClusterController.java +++ b/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/api/versionone/rd/RdLogicalClusterController.java @@ -57,7 +57,7 @@ public class RdLogicalClusterController { ); } - @ApiOperation(value = "查询逻辑集群列表", notes = "") + @ApiOperation(value = "根据逻辑集群Id获取逻辑集群", notes = "") @RequestMapping(value = "logical-clusters", method = RequestMethod.GET) @ResponseBody public Result getByLogicalClusterId(@RequestParam("id") Long physicalClusterId) {