diff --git a/km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/bean/dto/metrices/MetricDetailDTO.java b/km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/bean/dto/metrices/MetricDetailDTO.java index 0d51d2c6..04f18a03 100644 --- a/km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/bean/dto/metrices/MetricDetailDTO.java +++ b/km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/bean/dto/metrices/MetricDetailDTO.java @@ -7,6 +7,9 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import javax.validation.constraints.NotNull; + + /** * @author didi */ @@ -22,6 +25,7 @@ public class MetricDetailDTO extends BaseDTO { @ApiModelProperty("指标是否显示") private Boolean set; + @NotNull(message = "MetricDetailDTO的rank字段应不为空") @ApiModelProperty("指标优先级") private Integer rank; diff --git a/km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/bean/dto/metrices/UserMetricConfigDTO.java b/km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/bean/dto/metrices/UserMetricConfigDTO.java index bf71b663..b743ec73 100644 --- a/km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/bean/dto/metrices/UserMetricConfigDTO.java +++ b/km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/bean/dto/metrices/UserMetricConfigDTO.java @@ -7,6 +7,7 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import javax.validation.Valid; import java.util.List; import java.util.Map; @@ -19,6 +20,7 @@ public class UserMetricConfigDTO extends BaseDTO { @ApiModelProperty("指标展示设置项,key:指标名;value:是否展现(true展现/false不展现)") private Map metricsSet; + @Valid @ApiModelProperty("指标自定义属性列表") private List metricDetailDTOList; } diff --git a/km-rest/src/main/java/com/xiaojukeji/know/streaming/km/rest/api/v3/version/VersionController.java b/km-rest/src/main/java/com/xiaojukeji/know/streaming/km/rest/api/v3/version/VersionController.java index 093d597a..52cc4807 100644 --- a/km-rest/src/main/java/com/xiaojukeji/know/streaming/km/rest/api/v3/version/VersionController.java +++ b/km-rest/src/main/java/com/xiaojukeji/know/streaming/km/rest/api/v3/version/VersionController.java @@ -11,9 +11,11 @@ import com.xiaojukeji.know.streaming.km.common.constant.Constant; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; +import javax.validation.Valid; import java.util.List; import java.util.Map; import java.util.SortedMap; @@ -67,7 +69,7 @@ public class VersionController { @PostMapping(value = "clusters/{clusterId}/types/{type}/user-metric-config") @ResponseBody public Result updateUserMetricItem(@PathVariable Long clusterId, @PathVariable Integer type, - @RequestBody UserMetricConfigDTO userMetricConfigDTO, HttpServletRequest request){ + @Validated @RequestBody UserMetricConfigDTO userMetricConfigDTO, HttpServletRequest request) { return versionControlManager.updateUserMetricItem(clusterId, type, userMetricConfigDTO, HttpRequestUtil.getOperator(request)); } }