人员预警右侧列表小架子

人员类别配置添加
常用功能添加

epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/AddOftenUseFunctionFormDTO.java

@@ -16,11 +16,9 @@ public class AddOftenUseFunctionFormDTO implements Serializable {
 
     private static final long serialVersionUID = -8044386389656626183L;
 
-    public interface AddOftenUseFunctionForm{}
+    @NotBlank(message = "menuId不能为空",groups = PackageAddOftenUseFunctionFormDTO.PackageAddOftenUseFunctionForm.class)
-
-    @NotBlank(message = "menuId不能为空", groups = AddOftenUseFunctionForm.class)
     private String menuId;
 
-    @NotNull(message = "sort不能为空", groups = AddOftenUseFunctionForm.class)
+    @NotNull(message = "sort不能为空",groups = PackageAddOftenUseFunctionFormDTO.PackageAddOftenUseFunctionForm.class)
     private Integer sort;
 }

epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/PackageAddOftenUseFunctionFormDTO.java

@@ -0,0 +1,27 @@
+package com.epmet.dto.form;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/1/17 5:20 下午
+ * @DESC
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class PackageAddOftenUseFunctionFormDTO implements Serializable {
+
+    public interface PackageAddOftenUseFunctionForm{}
+
+    @Valid
+    public List<AddOftenUseFunctionFormDTO> list;
+
+}

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/IcOftenUseFunctionController.java

@@ -9,6 +9,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.IcOftenUseFunctionDTO;
 import com.epmet.dto.form.AddOftenUseFunctionFormDTO;
+import com.epmet.dto.form.PackageAddOftenUseFunctionFormDTO;
 import com.epmet.dto.result.OftenUseFunctionListResultDTO;
 import com.epmet.service.IcOftenUseFunctionService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,6 +50,8 @@ public class IcOftenUseFunctionController {
      */
     @PostMapping("addoftenusefunction")
     public Result addOftenUseFunction(@RequestBody List<AddOftenUseFunctionFormDTO> formDTOS, @LoginUser TokenDto tokenDto){
+        PackageAddOftenUseFunctionFormDTO fo = new PackageAddOftenUseFunctionFormDTO(formDTOS);
+        ValidatorUtils.validateEntity(fo, PackageAddOftenUseFunctionFormDTO.PackageAddOftenUseFunctionForm.class);
         icOftenUseFunctionService.addOftenUseFunction(formDTOS, tokenDto);
         return new Result();
     }

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/EditIndividualCategoryFormDTO.java

@@ -16,11 +16,9 @@ public class EditIndividualCategoryFormDTO implements Serializable {
 
     private static final long serialVersionUID = -3492393795553841513L;
 
-    public interface EditIndividualCategoryForm{}
+    @NotBlank(message = "columnId不能为空",groups = PackageEditIndividualCategoryFormDTO.PackageEditIndividualCategoryForm.class)
-
-    @NotBlank(message = "columnId不能为空",groups = EditIndividualCategoryForm.class)
     private String columnId;
 
-    @NotNull(message = "sort不能为空",groups = EditIndividualCategoryForm.class)
+    @NotNull(message = "sort不能为空",groups = PackageEditIndividualCategoryFormDTO.PackageEditIndividualCategoryForm.class)
     private Integer sort;
 }

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/PackageEditIndividualCategoryFormDTO.java

@@ -0,0 +1,27 @@
+package com.epmet.dto.form;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.Valid;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/1/17 5:49 下午
+ * @DESC
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class PackageEditIndividualCategoryFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -6112833952805305270L;
+
+    public interface PackageEditIndividualCategoryForm{}
+
+    @Valid
+    private List<EditIndividualCategoryFormDTO> list;
+}

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcIndividualCategoryManageController.java

@@ -9,6 +9,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.IcIndividualCategoryManageDTO;
 import com.epmet.dto.form.EditIndividualCategoryFormDTO;
+import com.epmet.dto.form.PackageEditIndividualCategoryFormDTO;
 import com.epmet.dto.result.IndividualCategoryListResultDTO;
 import com.epmet.service.IcIndividualCategoryManageService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,6 +50,8 @@ public class IcIndividualCategoryManageController {
      */
     @PostMapping("editindividualcategory")
     public Result editIndividualCategory(@RequestBody List<EditIndividualCategoryFormDTO> formDTOS,@LoginUser TokenDto tokenDto){
+        PackageEditIndividualCategoryFormDTO formDTO = new PackageEditIndividualCategoryFormDTO(formDTOS);
+        ValidatorUtils.validateEntity(formDTO,PackageEditIndividualCategoryFormDTO.PackageEditIndividualCategoryForm.class);
         icIndividualCategoryManageService.editIndividualCategory(formDTOS,tokenDto);
         return new Result();
     }

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PersonWarnRightListFormDTO.java

@@ -0,0 +1,25 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/1/17 4:13 下午
+ * @DESC
+ */
+@Data
+public class PersonWarnRightListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -3561699479212127370L;
+
+    public interface PersonWarnRightListForm{}
+
+    @NotNull(message = "pageNo不能为空",groups = PersonWarnRightListForm.class)
+    private Integer pageNo;
+
+    @NotNull(message = "pageSize不能为空",groups = PersonWarnRightListForm.class)
+    private Integer pageSize;
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PersonWarnRightListResultDTO.java

@@ -0,0 +1,68 @@
+package com.epmet.dto.result;
+
+import com.epmet.commons.tools.constant.NumConstant;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/1/17 4:16 下午
+ * @DESC
+ */
+@Data
+public class PersonWarnRightListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -9181230625228226662L;
+
+    private Integer total;
+
+    private List<PersonWarnRightList> list;
+
+    public PersonWarnRightListResultDTO() {
+        this.total = NumConstant.ZERO;
+        this.list = new ArrayList<>();
+    }
+
+    @Data
+    public static class PersonWarnRightList{
+
+        /**
+         * 类型
+         */
+        private List<String> type;
+
+        /**
+         * 所属网格
+         */
+        private String gridName;
+
+        /**
+         * 姓名
+         */
+        private String name;
+
+        /**
+         * 所属家庭
+         */
+        private String family;
+
+        /**
+         * 电话
+         */
+        private String mobile;
+
+        private String userId;
+
+        public PersonWarnRightList() {
+            this.type = new ArrayList<>();
+            this.gridName = "";
+            this.name = "";
+            this.family = "";
+            this.mobile = "";
+            this.userId = "";
+        }
+    }
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java

@@ -668,4 +668,17 @@ public class IcResiUserController {
         PageData<Map<String, Object>> r = icResiUserService.pageResiMap(input);
         return new Result<PageData<Map<String, Object>>>().ok(r);
     }
+
+    /**
+     * @Description 【社区查询】人员预警右侧列表
+     * @param formDTO
+     * @param tokenDto
+     * @author zxc
+     * @date 2022/1/17 4:25 下午
+     */
+    @PostMapping("personwarn/rightlist")
+    public Result<PersonWarnRightListResultDTO> personWarnRightList(@RequestBody PersonWarnRightListFormDTO formDTO,@LoginUser TokenDto tokenDto){
+        ValidatorUtils.validateEntity(formDTO, PersonWarnRightListFormDTO.PersonWarnRightListForm.class);
+        return new Result<PersonWarnRightListResultDTO>().ok(icResiUserService.personWarnRightList(formDTO,tokenDto));
+    }
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java

@@ -199,4 +199,14 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
      * @return
      */
     IcResiUserDTO get(String icResiUserId);
+
+    /**
+     * @Description 【社区查询】人员预警右侧列表
+     * @param formDTO
+     * @param tokenDto
+     * @author zxc
+     * @date 2022/1/17 4:25 下午
+     */
+    PersonWarnRightListResultDTO personWarnRightList(PersonWarnRightListFormDTO formDTO, TokenDto tokenDto);
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@@ -1006,6 +1006,18 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         return ConvertUtils.sourceToTarget(icResiUserEntity,IcResiUserDTO.class);
     }
 
+    /**
+     * @Description 【社区查询】人员预警右侧列表
+     * @param formDTO
+     * @param tokenDto
+     * @author zxc
+     * @date 2022/1/17 4:25 下午
+     */
+    @Override
+    public PersonWarnRightListResultDTO personWarnRightList(PersonWarnRightListFormDTO formDTO, TokenDto tokenDto) {
+        return null;
+    }
+
     /**
      * 查询志愿者类别options
      * @param customerId