diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ApplyCreateGroupFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ApplyCreateGroupFormDTO.java index 85c76cc827..fd2b239ea8 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ApplyCreateGroupFormDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ApplyCreateGroupFormDTO.java @@ -1,5 +1,6 @@ package com.epmet.resi.group.dto.group.form; +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; import lombok.Data; import javax.validation.constraints.NotBlank; @@ -12,48 +13,56 @@ import java.io.Serializable; */ @Data public class ApplyCreateGroupFormDTO implements Serializable { - private static final long serialVersionUID = 1570620480398949075L; - - /** - * 当前登录用户id由TokenDto赋值 - */ - @NotBlank(message="当前用户id不能为空") - private String userId; - - /** - * 头像地址 - */ - @NotBlank(message = "头像地址不能为空") - private String groupHeadPhoto; - - /** - * 小组名称 - */ - @NotBlank(message = "小组名称不能为空") - private String groupName; - - /** - * 群介绍 - */ - @NotBlank(message = "群介绍不能为空") - private String groupIntroduction; - - /** - * 当前网格所属客户id - */ - @NotBlank(message = "当前网格所属客户id不能为空") - private String customerId; - - /** - * 当前网格id - */ - @NotBlank(message = "当前网格id不能为空") - private String gridId; - - /** - * 当前登录用户来源从token中获取 - */ - @NotBlank(message="app不能为空") - private String app; + private static final long serialVersionUID = 1570620480398949075L; + + /** + * 添加用户操作的用户可见异常分组 + * 该分组用于校验需要返回给前端错误信息提示的列,需要继承CustomerClientShowGroup + * 返回错误码为8999,提示信息为DTO中具体的列的校验注解message的内容 + */ + public interface AddUserShowGroup extends CustomerClientShowGroup { + } + + /** + * 当前登录用户id由TokenDto赋值 + */ + @NotBlank(message = "当前用户id不能为空") + private String userId; + + /** + * 头像地址 + */ + @NotBlank(message = "头像地址不能为空", groups = {AddUserShowGroup.class}) + private String groupHeadPhoto; + + /** + * 小组名称 + */ + @NotBlank(message = "小组名称不能为空", groups = {AddUserShowGroup.class}) + private String groupName; + + /** + * 群介绍 + */ + @NotBlank(message = "群介绍不能为空", groups = {AddUserShowGroup.class}) + private String groupIntroduction; + + /** + * 当前网格所属客户id + */ + @NotBlank(message = "当前网格所属客户id不能为空") + private String customerId; + + /** + * 当前网格id + */ + @NotBlank(message = "当前网格id不能为空") + private String gridId; + + /** + * 当前登录用户来源从token中获取 + */ + @NotBlank(message = "app不能为空") + private String app; } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/ApplyJoinGroupFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/ApplyJoinGroupFormDTO.java index 03860e1bf4..a5e795f26f 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/ApplyJoinGroupFormDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/ApplyJoinGroupFormDTO.java @@ -1,5 +1,7 @@ package com.epmet.resi.group.dto.member.form; +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import com.epmet.resi.group.dto.group.form.ApplyCreateGroupFormDTO; import lombok.Data; import javax.validation.constraints.NotBlank; @@ -13,7 +15,13 @@ import java.io.Serializable; @Data public class ApplyJoinGroupFormDTO implements Serializable { private static final long serialVersionUID = -1611110663584570521L; - + /** + * 添加用户操作的用户可见异常分组 + * 该分组用于校验需要返回给前端错误信息提示的列,需要继承CustomerClientShowGroup + * 返回错误码为8999,提示信息为DTO中具体的列的校验注解message的内容 + */ + public interface AddUserShowGroup extends CustomerClientShowGroup { + } /** * 当前登录用户id由TokenDto赋值 */ @@ -29,7 +37,7 @@ public class ApplyJoinGroupFormDTO implements Serializable { /** * 入群理由 */ - @NotBlank(message="入组理由不能为空") + @NotBlank(message="入组理由不能为空", groups = {ApplyJoinGroupFormDTO.AddUserShowGroup.class}) private String operateDes; private String app; diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/DisagreeApplyFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/DisagreeApplyFormDTO.java index 610397be20..4adcb3082d 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/DisagreeApplyFormDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/DisagreeApplyFormDTO.java @@ -1,5 +1,7 @@ package com.epmet.resi.group.dto.member.form; +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import com.epmet.resi.group.dto.group.form.ApplyCreateGroupFormDTO; import lombok.Data; import javax.validation.constraints.NegativeOrZero; @@ -14,7 +16,13 @@ import java.io.Serializable; @Data public class DisagreeApplyFormDTO implements Serializable { private static final long serialVersionUID = 7490311907300741995L; - + /** + * 添加用户操作的用户可见异常分组 + * 该分组用于校验需要返回给前端错误信息提示的列,需要继承CustomerClientShowGroup + * 返回错误码为8999,提示信息为DTO中具体的列的校验注解message的内容 + */ + public interface AddUserShowGroup extends CustomerClientShowGroup { + } /** * 申请单id */ @@ -30,6 +38,6 @@ public class DisagreeApplyFormDTO implements Serializable { /** * 拒绝理由 */ - @NotBlank(message = "拒绝理由必填") + @NotBlank(message = "拒绝理由必填", groups = {DisagreeApplyFormDTO.AddUserShowGroup.class}) private String operateDesc; }