Merge branch 'dev_staff_info' into develop

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

@@ -45,7 +45,7 @@ public class AddAgencyFormDTO implements Serializable {
      * 机构组织名称
      */
     @NotBlank(message = "组织名称不能为空")
-    @Length(max=50,message = "机构名称不能超过50个字")
+    @Length(max=20,message = "机构名称不能超过20个字")
     private String agencyName;
 
     /**

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

@@ -16,6 +16,7 @@ package com.epmet.dto.form;
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
@@ -31,20 +32,21 @@ import java.io.Serializable;
 public class AddDepartmentFormDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
-
     /**
      * 所属组织机构ID（customer_agency.id）
      */
-    @NotBlank(message = "组织机构Id不能为空")
+    @NotBlank(message = "组织机构Id不能为空",groups = AddDepartmentFormDTO.AddDept.class)
     private String agencyId;
-
     /**
      * 部门名称
      */
-    @NotBlank(message = "部门名称不能为空")
+    @NotBlank(message = "部门名称不能为空",groups = AddDepartmentFormDTO.AddDept.class)
-    @Length(max=120,message = "部门名称不能超过120个字")
+    @Length(max=20,message = "部门名称不能超过20个字",groups = AddDepartmentFormDTO.AddDept.class)
     private String departmentName;
 
+    public interface AddDept extends CustomerClientShowGroup {
+    }
+
     /**
      * 部门职责
      */

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

@@ -1,7 +1,10 @@
 package com.epmet.dto.form;
 
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
+import org.hibernate.validator.constraints.Length;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
@@ -12,16 +15,20 @@ import java.io.Serializable;
 public class AddGridFormDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
+    /**
+     * 新建网格名称
+     */
+    @NotBlank(message = "网格名称不能为空")
+    @Length(max=20,message = "网格名称不能超过20个字",groups = AddGridFormDTO.AddGrid.class)
+    private String gridName;
 
     /**
      * 机构id
      */
     private String agencyId;
 
-    /**
+    public interface AddGrid extends CustomerClientShowGroup {
-     * 新建网格名称
+    }
-     */
-    private String gridName;
 
     /**
      * 管辖区域

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

@@ -50,7 +50,7 @@ public class EditAgencyFormDTO implements Serializable {
      * 机关组织名称
      */
     @NotBlank(message = "机关组织名称不能为空")
-    @Length(max=50,message = "机构名称不能超过50个字",groups = DefaultUserShowGroup.class)
+    @Length(max=20,message = "机构名称不能超过20个字",groups = DefaultUserShowGroup.class)
     private String agencyName;
 
     /**

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

@@ -17,6 +17,7 @@
 
 package com.epmet.dto.form;
 
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
@@ -33,20 +34,21 @@ import java.io.Serializable;
 public class EditDepartmentFormDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
-
     /**
      * 部门Id
      */
-    @NotBlank(message = "部门ID不能为空")
+    @NotBlank(message = "部门ID不能为空",groups = EditDepartmentFormDTO.EditDept.class)
     private String departmentId;
-
     /**
      * 部门名称
      */
-    @NotBlank(message = "部门名称不能为空")
+    @NotBlank(message = "部门名称不能为空",groups = EditDepartmentFormDTO.EditDept.class)
-    @Length(max=120,message = "部门名称不能超过120个字")
+    @Length(max=20,message = "部门名称不能超过20个字",groups = EditDepartmentFormDTO.EditDept.class)
     private String departmentName;
 
+    public interface EditDept extends CustomerClientShowGroup {
+    }
+
     /**
      * 部门职责
      */

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

@@ -1,7 +1,10 @@
 package com.epmet.dto.form;
 
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
+import org.hibernate.validator.constraints.Length;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
@@ -12,6 +15,12 @@ import java.io.Serializable;
 public class EditGridFormDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
+    /**
+     * 网格名称
+     */
+    @NotBlank(message = "网格名称不能为空")
+    @Length(max=20,message = "网格名称不能超过20个字",groups = EditGridFormDTO.EditGrid.class)
+    private String gridName;
 
     /**
      * gridId 网格id
@@ -23,10 +32,8 @@ public class EditGridFormDTO implements Serializable {
      */
     private String agencyId;
 
-    /**
+    public interface EditGrid extends CustomerClientShowGroup {
-     * 网格名称
+    }
-     */
-    private String gridName;
 
     /**
      * 管理区域

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

@@ -52,7 +52,7 @@ public class DepartmentController {
     @PostMapping("adddepartment")
     @RequirePermission(requirePermission = RequirePermissionEnum.ORG_DEPARTMENT_CREATE)
     public Result<AddDepartmentResultDTO> addDepartment(@LoginUser TokenDto tokenDTO, @RequestBody AddDepartmentFormDTO formDTO) {
-        ValidatorUtils.validateEntity(formDTO);
+        ValidatorUtils.validateEntity(formDTO, AddDepartmentFormDTO.AddDept.class);
         return departmentService.addDepartment(formDTO);
     }
 
@@ -65,7 +65,7 @@ public class DepartmentController {
     @PostMapping("editdepartment")
     @RequirePermission(requirePermission = RequirePermissionEnum.ORG_DEPARTMENT_UPDATE)
     public Result editDepartment(@LoginUser TokenDto tokenDTO, @RequestBody EditDepartmentFormDTO formDTO) {
-        ValidatorUtils.validateEntity(formDTO);
+        ValidatorUtils.validateEntity(formDTO, EditDepartmentFormDTO.EditDept.class);
         return departmentService.editDepartment(formDTO);
     }
 

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

@@ -46,6 +46,7 @@ public class GridController {
     @PostMapping("addgrid")
     @RequirePermission(requirePermission = RequirePermissionEnum.ORG_GRID_CREATE)
     public Result<AddGridResultDTO> addGrid(@LoginUser TokenDto tokenDto, @RequestBody AddGridFormDTO addGridFormDTO){
+        ValidatorUtils.validateEntity(addGridFormDTO, AddGridFormDTO.AddGrid.class);
         return customerGridService.addGrid(tokenDto,addGridFormDTO);
 
     }
@@ -56,6 +57,7 @@ public class GridController {
     @PostMapping("editgrid")
     @RequirePermission(requirePermission = RequirePermissionEnum.ORG_GRID_UPDATE)
     public Result editGrid(@LoginUser TokenDto tokenDto, @RequestBody EditGridFormDTO editGridFormDTO){
+        ValidatorUtils.validateEntity(editGridFormDTO, EditGridFormDTO.EditGrid.class);
         return customerGridService.editGrid(tokenDto,editGridFormDTO);
 
     }