8x48/KnowStreaming
1
0
Fork 0
mirror of https://github.com/didi/KnowStreaming.git synced 2026-01-09 08:27:47 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

bugfix: LogicalClusterDTO和RegionDTO校验参数冗余 & RdLogicalClusterController解释修正

Browse Source
This commit is contained in:
xuguang
2022-02-21 10:41:50 +08:00
parent 4d5e4d0f00
commit 05ceeea4b0
3 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/dto/rd/LogicalClusterDTO.java
View File

@@ -118,10 +118,7 @@ public class LogicalClusterDTO {
} }
public boolean legal() { public boolean legal() {
if (ValidateUtils.isNull(clusterId) if (ValidateUtils.isNull(clusterId) || ValidateUtils.isEmptyList(regionIdList) || ValidateUtils.isNull(mode)) {
|| ValidateUtils.isNull(clusterId)
|| ValidateUtils.isEmptyList(regionIdList)
|| ValidateUtils.isNull(mode)) {
return false; return false;
} }
if (!ClusterModeEnum.SHARED_MODE.getCode().equals(mode) && ValidateUtils.isNull(appId)) { if (!ClusterModeEnum.SHARED_MODE.getCode().equals(mode) && ValidateUtils.isNull(appId)) {

5
kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/dto/rd/RegionDTO.java
View File

@@ -94,10 +94,7 @@ public class RegionDTO {
} }
public boolean legal() { public boolean legal() {
if (ValidateUtils.isNull(clusterId) if (ValidateUtils.isNull(clusterId) || ValidateUtils.isEmptyList(brokerIdList) || ValidateUtils.isNull(status)) {
|| ValidateUtils.isNull(clusterId)
|| ValidateUtils.isEmptyList(brokerIdList)
|| ValidateUtils.isNull(status)) {
return false; return false;
} }
description = ValidateUtils.isNull(description)? "": description; description = ValidateUtils.isNull(description)? "": description;

2
kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/api/versionone/rd/RdLogicalClusterController.java
View File

@@ -57,7 +57,7 @@ public class RdLogicalClusterController {
); );
} }
@ApiOperation(value = "查询逻辑集群列表", notes = "") @ApiOperation(value = "根据逻辑集群Id获取逻辑集群", notes = "")
@RequestMapping(value = "logical-clusters", method = RequestMethod.GET) @RequestMapping(value = "logical-clusters", method = RequestMethod.GET)
@ResponseBody @ResponseBody
public Result<LogicalClusterVO> getByLogicalClusterId(@RequestParam("id") Long physicalClusterId) { public Result<LogicalClusterVO> getByLogicalClusterId(@RequestParam("id") Long physicalClusterId) {