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) {