diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/FirstCategoryFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/FirstCategoryFormDTO.java index cb50e8dbe2..065b0bd359 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/FirstCategoryFormDTO.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/FirstCategoryFormDTO.java @@ -1,10 +1,10 @@ package com.epmet.dto.form; import lombok.Data; +import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotBlank; import java.io.Serializable; -import java.util.List; /** * @Description 一级分类 新增/修改 @@ -14,13 +14,11 @@ import java.util.List; @Data public class FirstCategoryFormDTO implements Serializable { private static final long serialVersionUID = 3188828578545996470L; - public interface AddCategoryInternalGroup { - } /** * 客户Id **/ - @NotBlank(message = "customerId不能为空", groups = AddCategoryInternalGroup.class) + @NotBlank(message = "customerId不能为空") private String customerId; /** @@ -32,6 +30,8 @@ public class FirstCategoryFormDTO implements Serializable { /** * 分类名称 **/ + @Length(max=20,message = "分类名称不能超过20个字") + @Length(min=2,message = "分类名称不能少于2个字") private String categoryName; /** @@ -42,6 +42,6 @@ public class FirstCategoryFormDTO implements Serializable { /** * 操作类型(add:新增 edit:编辑) **/ - @NotBlank(message = "操作类型不能为空", groups = AddCategoryInternalGroup.class) + @NotBlank(message = "操作类型不能为空") private String type; } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectCategoryDictController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectCategoryDictController.java index df85854df5..c4080d0f10 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectCategoryDictController.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectCategoryDictController.java @@ -208,9 +208,7 @@ public class IssueProjectCategoryDictController { **/ @PostMapping("savefirstcategory") public Result saveFirstCategory(@RequestBody SecondCategoryFormDTO formDTO) { - if (StringUtils.isBlank(formDTO.getCustomerId())) { - throw new RenException("客户id 不能为空"); - } + ValidatorUtils.validateEntity(formDTO); if (CommonOperateTypeEnum.ADD.getCode().equals(formDTO.getType())) { return issueProjectCategoryDictService.saveFirstCategory(formDTO); } else if (CommonOperateTypeEnum.EDIT.getCode().equals(formDTO.getType())){ @@ -229,9 +227,7 @@ public class IssueProjectCategoryDictController { **/ @PostMapping("savesecondcategory") public Result saveSecondCategory(@RequestBody SecondCategoryFormDTO formDTO) { - if (StringUtils.isBlank(formDTO.getCustomerId())) { - throw new RenException("客户id 不能为空"); - } + ValidatorUtils.validateEntity(formDTO); if (StringUtils.isBlank(formDTO.getParentCategoryId())) { throw new RenException("一级分类Id 不能为空"); }