diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/RoleUsersFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/RoleUsersFormDTO.java new file mode 100644 index 0000000000..5978cd7c2c --- /dev/null +++ b/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; +} diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/RoleListResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/RoleListResultDTO.java new file mode 100644 index 0000000000..84a597245d --- /dev/null +++ b/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; +} diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/RoleUsersResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/RoleUsersResultDTO.java new file mode 100644 index 0000000000..250c4025bd --- /dev/null +++ b/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 roles; +} diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/OrgDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/OrgDTO.java new file mode 100644 index 0000000000..dadb069021 --- /dev/null +++ b/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; +} diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/ReceiverDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/ReceiverDTO.java new file mode 100644 index 0000000000..d743c808cf --- /dev/null +++ b/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; +} diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/ReceiversFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/ReceiversFormDTO.java new file mode 100644 index 0000000000..775086e16d --- /dev/null +++ b/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; + + +} diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/SubOrgFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/SubOrgFormDTO.java new file mode 100644 index 0000000000..1bc7ccddef --- /dev/null +++ b/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; +} diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/ReceiversResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/ReceiversResultDTO.java new file mode 100644 index 0000000000..4f8993456c --- /dev/null +++ b/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 dataList; +} diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/SubOrgResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/SubOrgResultDTO.java new file mode 100644 index 0000000000..26b915dea0 --- /dev/null +++ b/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 subAgencyList; + private List departmentList; + private List gridList; +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java index 88263c88ca..2c0eeeb439 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java +++ b/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>().ok(epmetUserService.listStaff(formDTO)); } + /** + * @Description 根据角色查询人员列表 + * @Param formDTO + * @Return {@link Result>} + * @Author zhaoqifeng + * @Date 2021/8/19 15:05 + */ + @PostMapping("roleusers") + public Result> roleUsers(@LoginUser TokenDto tokenDto, @RequestBody RoleUsersFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO); + formDTO.setCustomerId(tokenDto.getCustomerId()); + return new Result>().ok(epmetUserService.getRoleUsers(formDTO)); + + } + + /** + * @Description 角色列表(带人数) + * @Param tokenDto + * @Return {@link Result>} + * @Author zhaoqifeng + * @Date 2021/8/19 15:10 + */ + @PostMapping("rolelist") + public Result> roleList(@LoginUser TokenDto tokenDto) { + return new Result>().ok(epmetUserService.getRoleList(tokenDto.getCustomerId())); + + } + + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java index 5ef0282825..63a0922080 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java +++ b/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.NextAreaCodeFormDTO; -import com.epmet.dataaggre.dto.govorg.form.OrgStaffListFormDTO; -import com.epmet.dataaggre.dto.govorg.form.StaffDetailV2FormDTO; +import com.epmet.dataaggre.dto.govorg.form.*; 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().ok(govOrgService.staffDetailV2(formDTO)); } + /** + * @Description 下级组织/部门/网格列表 + * @Param formDTO + * @Return {@link Result} + * @Author zhaoqifeng + * @Date 2021/8/19 15:13 + */ + @PostMapping("suborg") + public Result subOrg(@RequestBody SubOrgFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO); + return new Result().ok(govOrgService.getSubOrg(formDTO)); + } + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/InfoController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/InfoController.java new file mode 100644 index 0000000000..124c0faf4f --- /dev/null +++ b/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} + * @Author zhaoqifeng + * @Date 2021/8/19 14:49 + */ + @PostMapping("receivers") + public Result receivers(@RequestBody ReceiversFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO); + ReceiversResultDTO result = govOrgService.getReceiverList(formDTO); + return new Result().ok(result); + + } +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java index add57d7886..d5c6b69663 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java +++ b/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 listStaff(ListStaffFormDTO formDTO); + + /** + * 根据角色查询人员列表 + * @Param formDTO + * @Return {@link List} + * @Author zhaoqifeng + * @Date 2021/8/19 15:03 + */ + List getRoleUsers(RoleUsersFormDTO formDTO); + + /** + * @Description 获取角色列表 + * @Param customerId + * @Return {@link List} + * @Author zhaoqifeng + * @Date 2021/8/19 15:09 + */ + List getRoleList(String customerId); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java index 3039f4a9c2..d3e840c36f 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java +++ b/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} + * @Author zhaoqifeng + * @Date 2021/8/19 15:03 + */ + @Override + public List getRoleUsers(RoleUsersFormDTO formDTO) { + return null; + } + + /** + * @param customerId + * @Description 获取角色列表 + * @Param customerId + * @Return {@link List} + * @Author zhaoqifeng + * @Date 2021/8/19 15:09 + */ + @Override + public List getRoleList(String customerId) { + return null; + } + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java index a912b2180b..ab88712f20 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java +++ b/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.OrgStaffListFormDTO; -import com.epmet.dataaggre.dto.govorg.form.StaffDetailV2FormDTO; +import com.epmet.dataaggre.dto.govorg.form.*; 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); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java index 1509a52d68..a56260a333 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java +++ b/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.OrgStaffListFormDTO; -import com.epmet.dataaggre.dto.govorg.form.StaffDetailV2FormDTO; +import com.epmet.dataaggre.dto.govorg.form.*; 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; + } + }