From e46917c800df90f6567938643d4d28636292a474 Mon Sep 17 00:00:00 2001 From: yujintao Date: Tue, 28 Jan 2020 11:22:12 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=AE=8C=E6=95=B4=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E5=B1=82=E7=BA=A7=E7=9A=84=E4=B8=8B=E6=8B=89=E8=8F=9C?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/controller/SysUserController.java | 24 +++++-- .../esua/epdc/service/SysDeptService.java | 8 +++ .../epdc/service/impl/SysDeptServiceImpl.java | 65 +++++++++++++++---- .../epdc/commons/tools/redis/RedisKeys.java | 12 ++++ .../java/com/elink/esua/epdc/dto/NewsDTO.java | 5 ++ 5 files changed, 95 insertions(+), 19 deletions(-) diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java index ca5a5be2e..066944f63 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java @@ -309,9 +309,23 @@ public class SysUserController { return sysDeptService.getUserDeptOption(); } + /** + * 获取用户部门多层结构（完整层级结构，包括顶级部门），用户前端显示，请求需携带token + * + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author work@yujt.net.cn + * @date 2020/1/28 10:40 + */ + @GetMapping("deptOptions/getAllByLoginUser") + public Result getAllDeptOptionByLoginUser() { + DeptOption option = sysDeptService.getAllDeptOptionByLoginUser(); + return new Result().ok(option); + } + /** * 退出登录 - * @param userId @RequestBody SysUserDTO dto + * + * @param userId @RequestBody SysUserDTO dto * @return */ @GetMapping("updateUserOpenId/{userId}") @@ -325,24 +339,24 @@ public class SysUserController { /** * @Description: 根据部门id，查询部门下的所有用户手机号 * @Param: [deptId] - * @return: com.elink.esua.epdc.commons.tools.utils.Result> + * @return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: zy * @Date: 2020-01-09 */ @GetMapping("getUserPhoneByListDeptId") - public Result> getUserPhoneByListDeptId(@RequestBody List deptId){ + public Result> getUserPhoneByListDeptId(@RequestBody List deptId) { return sysUserService.getUserPhoneByListDeptId(deptId); } /** * @Description: 根据议题网格ID查询拥有这个网格数据权限且是网格长的角色，再根据角色查出所有用户手机号 * @Param: [deptId] - * @return: com.elink.esua.epdc.commons.tools.utils.Result> + * @return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: zy * @Date: 2020-01-09 */ @GetMapping("getSysGridLeaderPhone/{deptId}") - public Result> getSysGridLeaderPhone(@PathVariable("deptId") Long deptId){ + public Result> getSysGridLeaderPhone(@PathVariable("deptId") Long deptId) { return sysUserService.getSysGridLeaderPhone(deptId); } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java index 939e0ae14..c6466c715 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java @@ -199,4 +199,12 @@ public interface SysDeptService extends BaseService { * @Date 2019/12/19 11:20 **/ PageData listCompleteDeptDTO(Map params); + + /** + * 获取用户部门多层结构（完整层级结构，包括顶级部门），用户前端显示，请求需携带token + * + * @author work@yujt.net.cn + * @date 2020/1/28 10:40 + */ + DeptOption getAllDeptOptionByLoginUser(); } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java index 4f4f7deb0..f9ca0da85 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java @@ -341,6 +341,18 @@ public class SysDeptServiceImpl extends BaseServiceImpl().ok((DeptOption) obj); } + @Override + public DeptOption getAllDeptOptionByLoginUser() { + Long userId = SecurityUser.getUserId(); + String deptOptionKey = RedisKeys.getAdminUserDeptOptionKey(userId); + Object obj = redisUtils.get(deptOptionKey); + if (null == obj) { + this.packageAllUserDeptOption(userId); + obj = redisUtils.get(deptOptionKey); + } + return (DeptOption) obj; + } + /** * @param formDTO * @return java.util.List @@ -393,6 +405,23 @@ public class SysDeptServiceImpl extends BaseServiceImpl dataScopeDeptList = userDetail.getDeptIdList(); @@ -424,6 +453,9 @@ public class SysDeptServiceImpl extends BaseServiceImpl cache = Lists.newArrayList(); + if (packageAllDept) { + cache.add(parentNodeArray); + } Map object; while (CollUtil.isNotEmpty(dataScopeDeptList) && CollUtil.isNotEmpty(parentDeptIdList)) { // 通过上级节点组装所有下级节点 @@ -439,7 +471,12 @@ public class SysDeptServiceImpl extends BaseServiceImpl().ok((DeptOption) obj); } - /** - * @param params - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @Author yinzuomei - * @Description 查询未建立党员群的网格列表 - * @Date 2019/12/19 11:20 - **/ - @Override - public PageData listCompleteDeptDTO(Map params) { - //查询出已经建立党员群的网格id - Result> gridListResult=groupFeignClient.listPartyMemberGridId(); - params.put("gridList",gridListResult.getData()); + /** + * @param params + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Author yinzuomei + * @Description 查询未建立党员群的网格列表 + * @Date 2019/12/19 11:20 + **/ + @Override + public PageData listCompleteDeptDTO(Map params) { + //查询出已经建立党员群的网格id + Result> gridListResult = groupFeignClient.listPartyMemberGridId(); + params.put("gridList", gridListResult.getData()); IPage iPage = this.getPage(params); List userDtoList = this.baseDao.selectListCompleteDeptDTO(params); return new PageData<>(userDtoList, iPage.getTotal()); - } + } } diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java index f3ff7c4f1..75cf197a2 100644 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java +++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java @@ -139,6 +139,18 @@ public class RedisKeys { return rootPrefix.concat("options:dept:user:").concat(String.valueOf(userId)); } + /** + * 管理员完整部门层级关系 + * + * @param userId 用户id + * @return java.lang.String + * @author work@yujt.net.cn + * @date 2019/11/28 09:56 + */ + public static String getAllAdminUserDeptOptionKey(Long userId) { + return rootPrefix.concat("options:dept:user:all:").concat(String.valueOf(userId)); + } + /** * 事件分类 */ diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/NewsDTO.java b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/NewsDTO.java index 133886a9f..7f2bc55e9 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/NewsDTO.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/NewsDTO.java @@ -175,4 +175,9 @@ public class NewsDTO implements Serializable { * 所有部门列表 */ private List allDeptIdsShow; + + /** + * 前端选择新闻发布到哪个部门，多选 + */ + private List deptIdList; } \ No newline at end of file