diff --git a/epmet-module/resi-guide/resi-guide-client/src/main/java/com/epmet/dto/form/PublicCustomerGridListFormDTO.java b/epmet-module/resi-guide/resi-guide-client/src/main/java/com/epmet/dto/form/PublicCustomerGridListFormDTO.java index 6e26721f28..6bdf608ae0 100644 --- a/epmet-module/resi-guide/resi-guide-client/src/main/java/com/epmet/dto/form/PublicCustomerGridListFormDTO.java +++ b/epmet-module/resi-guide/resi-guide-client/src/main/java/com/epmet/dto/form/PublicCustomerGridListFormDTO.java @@ -15,11 +15,18 @@ import java.io.Serializable; public class PublicCustomerGridListFormDTO implements Serializable { private static final long serialVersionUID = 1L; - public interface AddUserInternalGroup { - } - - public interface AddUserShowGroup extends CustomerClientShowGroup { - } + /** + * 地区码 + * */ + @NotBlank(message = "自动定位地区码不能为空", groups = {AreaCode.class}) + private String areaCode; + /** + * 选定地区编码 + * */ + @NotBlank(message = "手动定位地区码不能为空", groups = {SelectedAreaCode.class}) + private String selectedAreaCode; + public interface AddUserInternalGroup {} + public interface AddUserShowGroup extends CustomerClientShowGroup {} /** * 小程序appId @@ -37,15 +44,9 @@ public class PublicCustomerGridListFormDTO implements Serializable { * */ private Integer pageSize = 20; - /** - * 地区码 - * */ - private String areaCode; + public interface AreaCode extends CustomerClientShowGroup {} - /** - * 选定地区编码 - * */ - private String selectedAreaCode; + public interface SelectedAreaCode extends CustomerClientShowGroup {} /** * 是否首次位置授权(0:是 1:否) diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerResiGuideController.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerResiGuideController.java index dac2615943..f190314b1c 100644 --- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerResiGuideController.java +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerResiGuideController.java @@ -117,7 +117,7 @@ public class StrangerResiGuideController { **/ @PostMapping("publiclocationgridlist") Result> publicLocationGridList(@RequestBody PublicCustomerGridListFormDTO formDTO){ - ValidatorUtils.validateEntity(formDTO); + ValidatorUtils.validateEntity(formDTO, PublicCustomerGridListFormDTO.AddUserShowGroup.class, PublicCustomerGridListFormDTO.AreaCode.class); return strangerAccessRecordService.thirdCustomerGridList(formDTO); } @@ -128,7 +128,7 @@ public class StrangerResiGuideController { **/ @PostMapping("publiclelectcdgridlist") Result> publicLelectcdGridList(@RequestBody PublicCustomerGridListFormDTO formDTO){ - ValidatorUtils.validateEntity(formDTO); + ValidatorUtils.validateEntity(formDTO, PublicCustomerGridListFormDTO.AddUserShowGroup.class, PublicCustomerGridListFormDTO.SelectedAreaCode.class); return strangerAccessRecordService.thirdCustomerGridList(formDTO); }