参数校验提示给用户

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcBulidingFormDTO.java

@@ -17,9 +17,7 @@
 
 package com.epmet.dto.form;
 
-import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
@@ -36,70 +34,75 @@ public class IcBulidingFormDTO implements Serializable {
     public interface DeleteGroup extends CustomerClientShowGroup {
     }
 
-    @NotBlank(message = "楼栋ID不能为空", groups = { UpdateGroup.class,DeleteGroup.class})
+    public interface AddShowGroup extends CustomerClientShowGroup {
+    }
+
+    public interface UpdateShowGroup extends CustomerClientShowGroup {
+    }
+    @NotBlank(message = "楼栋ID不能为空", groups = { UpdateShowGroup.class,DeleteGroup.class})
     private String buildingId;
 
     /**
      * 组织id
      */
-    @NotBlank(message = "组织id不能为空", groups = {AddGroup.class, UpdateGroup.class})
+    @NotBlank(message = "组织id不能为空", groups = {AddShowGroup.class, UpdateShowGroup.class})
     private String agencyId;
 
 
     /**
      * 网格id
      */
-    @NotBlank(message = "网格不能为空", groups = {AddGroup.class, UpdateGroup.class})
+    @NotBlank(message = "网格不能为空", groups = {AddShowGroup.class, UpdateShowGroup.class})
     private String gridId;
 
 
     /**
      * 小区id
      */
-    @NotBlank(message = "小区id不能为空", groups = {AddGroup.class, UpdateGroup.class})
+    @NotBlank(message = "小区id不能为空", groups = {AddShowGroup.class, UpdateShowGroup.class})
     private String neighborHoodId;
 
     /**
      * 楼栋名称
      */
-    @NotBlank(message = "楼栋名称不能为空", groups = {AddGroup.class, UpdateGroup.class})
+    @NotBlank(message = "楼栋名称不能为空", groups = {AddShowGroup.class, UpdateShowGroup.class})
-    @Length(max=10,message = "楼栋名称不能超过10个字", groups = {AddGroup.class, UpdateGroup.class})
+    @Length(max=10,message = "楼栋名称不能超过10个字", groups = {AddShowGroup.class, UpdateShowGroup.class})
 	private String buildingName;
 
     /**
      * 楼栋类型
      */
-    @NotBlank(message = "楼栋类型不能为空", groups = {AddGroup.class, UpdateGroup.class})
+    @NotBlank(message = "楼栋类型不能为空", groups = {AddShowGroup.class, UpdateShowGroup.class})
     private String type="";
 
     /**
      * 客户id
      */
-   /* @NotBlank(message = "客户id不能为空", groups = {AddGroup.class, UpdateGroup.class})
+   /* @NotBlank(message = "客户id不能为空", groups = {AddShowGroup.class, UpdateShowGroup.class})
     private String customerId;*/
 
     /**
      * 排序
      */
-    @NotNull(message = "排序不能为空", groups = {AddGroup.class, UpdateGroup.class})
+    @NotNull(message = "排序不能为空", groups = {AddShowGroup.class, UpdateShowGroup.class})
     private Integer sort = 0;
 
     /**
      * 总单元数
      */
-    @NotNull(message = "总单元数不能为空", groups = {AddGroup.class, UpdateGroup.class})
+    @NotNull(message = "总单元数不能为空", groups = {AddShowGroup.class, UpdateShowGroup.class})
     private Integer totalUnitNum=1;
 
     /**
      * 总楼层总数
      */
-    @NotNull(message = "总楼层总数不能为空", groups = {AddGroup.class, UpdateGroup.class})
+    @NotNull(message = "总楼层总数不能为空", groups = {AddShowGroup.class, UpdateShowGroup.class})
     private Integer totalFloorNum;
 
     /**
      * 总户数
      */
-    @NotNull(message = "总户数不能为空", groups = {AddGroup.class, UpdateGroup.class})
+    @NotNull(message = "总户数不能为空", groups = {AddShowGroup.class, UpdateShowGroup.class})
     private Integer totalHouseNum;
     /**
      * 坐标位置

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseFormDTO.java

@@ -17,9 +17,7 @@
 
 package com.epmet.dto.form;
 
-import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -35,23 +33,29 @@ public class IcHouseFormDTO implements Serializable {
     public interface DeleteGroup extends CustomerClientShowGroup {
     }
 
-    @NotBlank(message = "房屋ID不能为空", groups = { UpdateGroup.class,DeleteGroup.class})
+    public interface AddShowGroup extends CustomerClientShowGroup {
+    }
+
+    public interface UpdateShowGroup extends CustomerClientShowGroup {
+    }
+
+    @NotBlank(message = "房屋ID不能为空", groups = { UpdateShowGroup.class,DeleteGroup.class})
     private String houseId;
 
 
     /**
      * 小区id
      */
-    @NotBlank(message = "小区id不能为空", groups = {AddGroup.class, UpdateGroup.class})
+    @NotBlank(message = "小区id不能为空", groups = {AddShowGroup.class, UpdateShowGroup.class})
     private String neighborHoodId;
 
-    @NotBlank(message = "所属楼栋ID不能为空", groups = {AddGroup.class, UpdateGroup.class})
+    @NotBlank(message = "所属楼栋ID不能为空", groups = {AddShowGroup.class, UpdateShowGroup.class})
     private String buildingId;
 
     /**
      * 所属单元id
      */
-    @NotBlank(message = "所属单元id不能为空", groups = {AddGroup.class, UpdateGroup.class})
+    @NotBlank(message = "所属单元id不能为空", groups = {AddShowGroup.class, UpdateShowGroup.class})
     private String buildingUnitId;
 
 
@@ -59,43 +63,43 @@ public class IcHouseFormDTO implements Serializable {
     /**
      * 门牌号
      */
-    @NotBlank(message = "门牌号不能为空", groups = {AddGroup.class, UpdateGroup.class})
+    @NotBlank(message = "门牌号不能为空", groups = {AddShowGroup.class, UpdateShowGroup.class})
     private String doorName;
 
     /**
      * 房屋类型，这里存储字典value就可以
      */
-    @NotBlank(message = "房屋类型不能为空", groups = {AddGroup.class, UpdateGroup.class})
+    @NotBlank(message = "房屋类型不能为空", groups = {AddShowGroup.class, UpdateShowGroup.class})
     private String houseType;
 
     /**
      * 存储字典value
      */
-    @NotBlank(message = "房屋用途不能为空", groups = {AddGroup.class, UpdateGroup.class})
+    @NotBlank(message = "房屋用途不能为空", groups = {AddShowGroup.class, UpdateShowGroup.class})
     private String purpose;
 
     /**
      * 1出租；0未出租
      */
-    @NotNull(message = "是否出租不能为空", groups = {AddGroup.class, UpdateGroup.class})
+    @NotNull(message = "是否出租不能为空", groups = {AddShowGroup.class, UpdateShowGroup.class})
     private Integer rentFlag;
 
     /**
      * 房主姓名
      */
-    @NotBlank(message = "房主姓名不能为空", groups = {AddGroup.class, UpdateGroup.class})
+    @NotBlank(message = "房主姓名不能为空", groups = {AddShowGroup.class, UpdateShowGroup.class})
     private String ownerName;
 
     /**
      * 房主电话
      */
-    @NotBlank(message = "房主电话不能为空", groups = {AddGroup.class, UpdateGroup.class})
+    @NotBlank(message = "房主电话不能为空", groups = {AddShowGroup.class, UpdateShowGroup.class})
     private String ownerPhone;
 
     /**
      * 房主身份证号
      */
-    @NotBlank(message = "房主身份证号不能为空", groups = {AddGroup.class, UpdateGroup.class})
+    @NotBlank(message = "房主身份证号不能为空", groups = {AddShowGroup.class, UpdateShowGroup.class})
     private String ownerIdCard;
 
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java

@@ -25,7 +25,6 @@ import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dao.IcBuildingUnitDao;
 import com.epmet.dto.BuildingTreeLevelDTO;
@@ -90,7 +89,7 @@ public class BuildingController {
     @PostMapping("buildingadd")
     public Result buildingAdd(@LoginUser TokenDto tokenDTO, @RequestBody IcBulidingFormDTO formDTO){
         //效验数据
-        ValidatorUtils.validateEntity(formDTO, AddGroup.class);
+        ValidatorUtils.validateEntity(formDTO, IcBulidingFormDTO.AddShowGroup.class);
         String customerId = tokenDTO.getCustomerId();
 //        String customerId = "123123";
 
@@ -101,7 +100,7 @@ public class BuildingController {
     @PostMapping("buildingupdate")
     public Result buildingUpdate(@LoginUser TokenDto tokenDTO, @RequestBody IcBulidingFormDTO formDTO){
         //效验数据
-        ValidatorUtils.validateEntity(formDTO, UpdateGroup.class);
+        ValidatorUtils.validateEntity(formDTO, IcBulidingFormDTO.UpdateShowGroup.class);
         String customerId = tokenDTO.getCustomerId();
 //        String customerId = "123123";
         buildingService.UpdateBuilding(customerId,formDTO);

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java

@@ -23,8 +23,6 @@ import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.form.IcHouseFormDTO;
 import com.epmet.dto.form.IcNeighborHoodFormDTO;
 import com.epmet.dto.form.ListIcNeighborHoodFormDTO;
@@ -76,7 +74,7 @@ public class HouseController {
     @PostMapping("houseadd")
     public Result houseAdd(@LoginUser TokenDto tokenDTO, @RequestBody IcHouseFormDTO formDTO){
         //效验数据
-        ValidatorUtils.validateEntity(formDTO, AddGroup.class);
+        ValidatorUtils.validateEntity(formDTO, IcHouseFormDTO.AddShowGroup.class);
         String customerId = tokenDTO.getCustomerId();
 //        String customerId = "123123";
 
@@ -87,7 +85,7 @@ public class HouseController {
     @PostMapping("houseupdate")
     public Result houseUpdate(@LoginUser TokenDto tokenDTO, @RequestBody IcHouseFormDTO formDTO){
         //效验数据
-        ValidatorUtils.validateEntity(formDTO, UpdateGroup.class);
+        ValidatorUtils.validateEntity(formDTO, IcHouseFormDTO.UpdateShowGroup.class);
         String customerId = tokenDTO.getCustomerId();
 //        String customerId = "123123";
         houseService.updateHouse(customerId,formDTO);