通讯录消息相关接口

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/RoleUsersFormDTO.java

@@ -0,0 +1,19 @@
+package com.epmet.dataaggre.dto.epmetuser.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Data 2021/8/19 14:06
+ */
+@Data
+public class RoleUsersFormDTO implements Serializable {
+    private static final long serialVersionUID = -7732382052293191415L;
+    @NotBlank(message = "角色ID不能为空")
+    private String roleId;
+    private String customerId;
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/RoleListResultDTO.java

@@ -0,0 +1,23 @@
+package com.epmet.dataaggre.dto.epmetuser.result;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2021/8/19 14:16
+ */
+@NoArgsConstructor
+@Data
+public class RoleListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -9030492894290373999L;
+    private String roleId;
+    private String description;
+    private String roleName;
+    private String roleKey;
+    private Integer staffNum;
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/RoleUsersResultDTO.java

@@ -0,0 +1,25 @@
+package com.epmet.dataaggre.dto.epmetuser.result;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2021/8/19 14:06
+ */
+@NoArgsConstructor
+@Data
+public class RoleUsersResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 7109847663910323991L;
+    private String staffId;
+    private String name;
+    private String headPhoto;
+    private String orgName;
+    private String gender;
+    private List<String> roles;
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/OrgDTO.java

@@ -0,0 +1,19 @@
+package com.epmet.dataaggre.dto.govorg;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2021/8/19 14:21
+ */
+@Data
+public class OrgDTO implements Serializable {
+    private static final long serialVersionUID = -3659371769044867016L;
+    private String orgId;
+    private String orgName;
+    private String orgType;
+    private Integer staffNum;
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/ReceiverDTO.java

@@ -0,0 +1,39 @@
+package com.epmet.dataaggre.dto.govorg;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2021/8/19 14:50
+ */
+@Data
+public class ReceiverDTO implements Serializable {
+    private static final long serialVersionUID = 7756394210796777416L;
+    /**
+     * ID
+     */
+    private String staffId;
+    /**
+     * 姓名
+     */
+    private String staffName;
+    /**
+     * 头像
+     */
+    private String headPhoto;
+    /**
+     * 所属组织目前显示两级
+     */
+    private String orgName;
+    /**
+     * 1：已读；0：未读
+     */
+    private String readFlag;
+    /**
+     * 1男2女0未知
+     */
+    private String gender;
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/ReceiversFormDTO.java

@@ -0,0 +1,22 @@
+package com.epmet.dataaggre.dto.govorg.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @author Administrator
+ */
+@Data
+public class ReceiversFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -1588067365064394258L;
+    @NotBlank(message = "消息ID不能为空")
+    private String infoId;
+    private Integer pageNo = 1;
+    private Integer pageSize = 10;
+    private String readFlag;
+
+
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/SubOrgFormDTO.java

@@ -0,0 +1,18 @@
+package com.epmet.dataaggre.dto.govorg.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2021/8/19 14:18
+ */
+@Data
+public class SubOrgFormDTO implements Serializable {
+    private static final long serialVersionUID = -3651225675593357002L;
+    @NotBlank(message = "组织ID不能为空")
+    private String agencyId;
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/ReceiversResultDTO.java

@@ -0,0 +1,19 @@
+package com.epmet.dataaggre.dto.govorg.result;
+
+import com.epmet.dataaggre.dto.govorg.ReceiverDTO;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author Administrator
+ */
+@NoArgsConstructor
+@Data
+public class ReceiversResultDTO implements Serializable {
+    private static final long serialVersionUID = 255217078396991037L;
+    private Integer total;
+    private List<ReceiverDTO> dataList;
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/SubOrgResultDTO.java

@@ -0,0 +1,20 @@
+package com.epmet.dataaggre.dto.govorg.result;
+
+import com.epmet.dataaggre.dto.govorg.OrgDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2021/8/19 14:20
+ */
+@Data
+public class SubOrgResultDTO implements Serializable {
+    private static final long serialVersionUID = 3080780461845963616L;
+    private List<OrgDTO> subAgencyList;
+    private List<OrgDTO> departmentList;
+    private List<OrgDTO> gridList;
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java

@@ -218,4 +218,33 @@ public class EpmetUserController {
         return new Result<List<ListStaffResultDTO>>().ok(epmetUserService.listStaff(formDTO));
     }
 
+    /**
+     * @Description 根据角色查询人员列表
+     * @Param formDTO
+     * @Return {@link Result<List<RoleUsersResultDTO>>}
+     * @Author zhaoqifeng
+     * @Date 2021/8/19 15:05
+     */
+    @PostMapping("roleusers")
+    public Result<List<RoleUsersResultDTO>> roleUsers(@LoginUser TokenDto tokenDto, @RequestBody RoleUsersFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        return new Result<List<RoleUsersResultDTO>>().ok(epmetUserService.getRoleUsers(formDTO));
+
+    }
+
+    /**
+     * @Description 角色列表(带人数)
+     * @Param tokenDto
+     * @Return {@link Result<List<RoleListResultDTO>>}
+     * @Author zhaoqifeng
+     * @Date 2021/8/19 15:10
+     */
+    @PostMapping("rolelist")
+    public Result<List<RoleListResultDTO>> roleList(@LoginUser TokenDto tokenDto) {
+        return new Result<List<RoleListResultDTO>>().ok(epmetUserService.getRoleList(tokenDto.getCustomerId()));
+
+    }
+
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java

@@ -9,10 +9,7 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.dataaggre.dto.govorg.form.GridMemberDataAnalysisFromDTO;
+import com.epmet.dataaggre.dto.govorg.form.*;
-import com.epmet.dataaggre.dto.govorg.form.NextAreaCodeFormDTO;
-import com.epmet.dataaggre.dto.govorg.form.OrgStaffListFormDTO;
-import com.epmet.dataaggre.dto.govorg.form.StaffDetailV2FormDTO;
 import com.epmet.dataaggre.dto.govorg.result.*;
 import com.epmet.dataaggre.enums.GridMemberDataAnalysisEnums;
 import com.epmet.dataaggre.service.AggreGridService;
@@ -147,4 +144,17 @@ public class GovOrgController {
         return new Result<StaffDetailV2FormDTO>().ok(govOrgService.staffDetailV2(formDTO));
     }
 
+    /**
+     * @Description 下级组织/部门/网格列表
+     * @Param formDTO
+     * @Return {@link Result<SubOrgResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/8/19 15:13
+     */
+    @PostMapping("suborg")
+    public Result<SubOrgResultDTO> subOrg(@RequestBody SubOrgFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        return new Result<SubOrgResultDTO>().ok(govOrgService.getSubOrg(formDTO));
+    }
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/InfoController.java

@@ -0,0 +1,40 @@
+package com.epmet.dataaggre.controller;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dataaggre.dto.govorg.form.ReceiversFormDTO;
+import com.epmet.dataaggre.dto.govorg.result.ReceiversResultDTO;
+import com.epmet.dataaggre.service.govorg.GovOrgService;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2021/8/19 14:45
+ */
+@RestController
+@RequestMapping("info")
+public class InfoController {
+    @Resource
+    private GovOrgService govOrgService;
+
+    /**
+     * @Description 已读未读列表
+     * @Param formDTO
+     * @Return {@link Result<ReceiversResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/8/19 14:49
+     */
+    @PostMapping("receivers")
+    public Result<ReceiversResultDTO> receivers(@RequestBody ReceiversFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        ReceiversResultDTO result  = govOrgService.getReceiverList(formDTO);
+        return new Result<ReceiversResultDTO>().ok(result);
+
+    }
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java

@@ -100,4 +100,22 @@ public interface EpmetUserService {
      * @author sun
      */
     List<ListStaffResultDTO> listStaff(ListStaffFormDTO formDTO);
+
+    /**
+     * 根据角色查询人员列表
+     * @Param formDTO
+     * @Return {@link List<RoleUsersResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/8/19 15:03
+     */
+    List<RoleUsersResultDTO> getRoleUsers(RoleUsersFormDTO formDTO);
+
+    /**
+     * @Description 获取角色列表
+     * @Param customerId
+     * @Return {@link List<RoleListResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/8/19 15:09
+     */
+    List<RoleListResultDTO> getRoleList(String customerId);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java

@@ -432,5 +432,32 @@ public class EpmetUserServiceImpl implements EpmetUserService {
         return null;
     }
 
+    /**
+     * 根据角色查询人员列表
+     *
+     * @param formDTO
+     * @Param formDTO
+     * @Return {@link List<RoleUsersResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/8/19 15:03
+     */
+    @Override
+    public List<RoleUsersResultDTO> getRoleUsers(RoleUsersFormDTO formDTO) {
+        return null;
+    }
+
+    /**
+     * @param customerId
+     * @Description 获取角色列表
+     * @Param customerId
+     * @Return {@link List<RoleListResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/8/19 15:09
+     */
+    @Override
+    public List<RoleListResultDTO> getRoleList(String customerId) {
+        return null;
+    }
+
 
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java

@@ -3,9 +3,7 @@ package com.epmet.dataaggre.service.govorg;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dataaggre.dto.govorg.CustomerAgencyDTO;
 import com.epmet.dataaggre.dto.govorg.CustomerGridDTO;
-import com.epmet.dataaggre.dto.govorg.form.NextAreaCodeFormDTO;
+import com.epmet.dataaggre.dto.govorg.form.*;
-import com.epmet.dataaggre.dto.govorg.form.OrgStaffListFormDTO;
-import com.epmet.dataaggre.dto.govorg.form.StaffDetailV2FormDTO;
 import com.epmet.dataaggre.dto.govorg.result.*;
 import com.epmet.dataaggre.dto.resigroup.result.OrgInfoCommonDTO;
 
@@ -96,4 +94,22 @@ public interface GovOrgService {
      * @author sun
      */
     StaffDetailV2FormDTO staffDetailV2(StaffDetailV2ResultDTO formDTO);
+
+    /**
+     * @Description 获取已读未读人员列表
+     * @Param formDTO
+     * @Return {@link ReceiversResultDTO}
+     * @Author zhaoqifeng
+     * @Date 2021/8/19 14:56
+     */
+    ReceiversResultDTO getReceiverList(ReceiversFormDTO formDTO);
+
+    /**
+     * @Description 下级组织/部门/网格列表
+     * @Param formDTO
+     * @Return {@link SubOrgResultDTO}
+     * @Author zhaoqifeng
+     * @Date 2021/8/19 15:12
+     */
+    SubOrgResultDTO getSubOrg(SubOrgFormDTO formDTO);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java

@@ -15,9 +15,7 @@ import com.epmet.dataaggre.dto.epmetuser.result.StaffRoleListResultDTO;
 import com.epmet.dataaggre.dto.govorg.CustomerAgencyDTO;
 import com.epmet.dataaggre.dto.govorg.CustomerGridDTO;
 import com.epmet.dataaggre.dto.govorg.CustomerStaffAgencyDTO;
-import com.epmet.dataaggre.dto.govorg.form.NextAreaCodeFormDTO;
+import com.epmet.dataaggre.dto.govorg.form.*;
-import com.epmet.dataaggre.dto.govorg.form.OrgStaffListFormDTO;
-import com.epmet.dataaggre.dto.govorg.form.StaffDetailV2FormDTO;
 import com.epmet.dataaggre.dto.govorg.result.*;
 import com.epmet.dataaggre.dto.resigroup.result.OrgInfoCommonDTO;
 import com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity;
@@ -394,4 +392,30 @@ public class GovOrgServiceImpl implements GovOrgService {
         return null;
     }
 
+    /**
+     * @param formDTO
+     * @Description 获取已读未读人员列表
+     * @Param formDTO
+     * @Return {@link ReceiversResultDTO}
+     * @Author zhaoqifeng
+     * @Date 2021/8/19 14:56
+     */
+    @Override
+    public ReceiversResultDTO getReceiverList(ReceiversFormDTO formDTO) {
+        return null;
+    }
+
+    /**
+     * @param formDTO
+     * @Description 下级组织/部门/网格列表
+     * @Param formDTO
+     * @Return {@link SubOrgResultDTO}
+     * @Author zhaoqifeng
+     * @Date 2021/8/19 15:12
+     */
+    @Override
+    public SubOrgResultDTO getSubOrg(SubOrgFormDTO formDTO) {
+        return null;
+    }
+
 }