From 73a446a50cc1bc7e1337a11e0db6368d798f90d3 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Tue, 14 Sep 2021 17:30:28 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E9=98=9F=E4=BC=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ApiGridMemberController.java | 48 +++++++++++++++++++ .../esua/epdc/feign/AdminFeignClient.java | 25 ++++++++-- .../fallback/AdminFeignClientFallback.java | 15 ++++-- .../elink/esua/epdc/service/AdminService.java | 19 ++++++++ .../epdc/service/impl/AdminServiceImpl.java | 14 ++++++ 5 files changed, 113 insertions(+), 8 deletions(-) create mode 100644 epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiGridMemberController.java diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiGridMemberController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiGridMemberController.java new file mode 100644 index 0000000..7617e05 --- /dev/null +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiGridMemberController.java @@ -0,0 +1,48 @@ +package com.elink.esua.epdc.controller; + +import com.elink.esua.epdc.common.token.dto.TokenDto; +import com.elink.esua.epdc.commons.tools.annotation.LoginUser; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.AppMemberListFromDTO; +import com.elink.esua.epdc.service.AdminService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 居民端-网格队伍 + */ +@RestController +@RequestMapping("sys/gridMember") +public class ApiGridMemberController { + + @Autowired + private AdminService adminService; + + + /** + * @describe: 居民端-网格队伍-社区介绍 + * @author wangtong + * @date 2021/9/14 16:25 + * @params [userDetail] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @GetMapping("getDeptInfo") + public Result getDeptInfo(@LoginUser TokenDto userDetail){ + return adminService.getDeptInfo(userDetail); + } + + /** + * @describe: 居民端-网格队伍-网格员列表 + * @author wangtong + * @date 2021/9/14 16:29 + * @params [AppMemberListFromDTO] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @GetMapping("getMemberList") + public Result getMemberList(@LoginUser TokenDto userDetail,AppMemberListFromDTO dto){ + return adminService.getMemberList(userDetail,dto); + } + +} diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java index 15e6da0..f722dc1 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java @@ -2,10 +2,7 @@ package com.elink.esua.epdc.feign; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.CompleteDeptDTO; -import com.elink.esua.epdc.dto.DeptOption; -import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; -import com.elink.esua.epdc.dto.SysUserDTO; +import com.elink.esua.epdc.dto.*; import com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcAppGridManFormDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcAppGridManListResultDTO; @@ -169,4 +166,24 @@ public interface AdminFeignClient { */ @GetMapping("sys/sysUser/gridmanList") Result> getGridmanList(EpdcAppGridManFormDTO formDto); + + /** + * @describe: 居民端-网格队伍-社区介绍 + * @author wangtong + * @date 2021/9/14 16:25 + * @params [userDetail] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @GetMapping("sys/gridmember/getDeptInfo") + Result getDeptInfo(AppMemberListFromDTO dto); + + /** + * @describe: 居民端-网格队伍-网格员列表 + * @author wangtong + * @date 2021/9/14 16:29 + * @params [AppMemberListFromDTO] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @GetMapping("sys/gridmember/getMemberList") + Result getMemberList(AppMemberListFromDTO dto); } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java index 79775eb..269abd3 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java @@ -3,10 +3,7 @@ package com.elink.esua.epdc.feign.fallback; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.CompleteDeptDTO; -import com.elink.esua.epdc.dto.DeptOption; -import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; -import com.elink.esua.epdc.dto.SysUserDTO; +import com.elink.esua.epdc.dto.*; import com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcAppGridManFormDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcAppGridManListResultDTO; @@ -89,4 +86,14 @@ public class AdminFeignClientFallback implements AdminFeignClient { public Result> getGridmanList(EpdcAppGridManFormDTO formDto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER,"getGridmanList",formDto); } + + @Override + public Result getDeptInfo(AppMemberListFromDTO dto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER,"getDeptInfo",dto); + } + + @Override + public Result getMemberList(AppMemberListFromDTO dto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER,"getMemberList",dto); + } } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AdminService.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AdminService.java index d5d69ab..24b2cb6 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AdminService.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AdminService.java @@ -2,6 +2,7 @@ package com.elink.esua.epdc.service; import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.AppMemberListFromDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcAppGridManFormDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcAppGridManListResultDTO; import com.elink.esua.epdc.dto.result.EpdcAppWorkLogUserResult; @@ -74,4 +75,22 @@ public interface AdminService { * @since 2021/8/28 18:41 */ Result> getGridmanList(TokenDto userDetail, EpdcAppGridManFormDTO formDto); + + /** + * @describe: 居民端-网格队伍-社区介绍 + * @author wangtong + * @date 2021/9/14 16:25 + * @params [userDetail] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + Result getDeptInfo(TokenDto userDetail); + + /** + * @describe: 居民端-网格队伍-网格员列表 + * @author wangtong + * @date 2021/9/14 16:29 + * @params [AppMemberListFromDTO] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + Result getMemberList(TokenDto userDetail,AppMemberListFromDTO dto); } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java index fd0299e..5577982 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java @@ -7,6 +7,7 @@ import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; import com.elink.esua.epdc.commons.tools.security.user.UserDetail; import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.AppMemberListFromDTO; import com.elink.esua.epdc.dto.CompleteDeptDTO; import com.elink.esua.epdc.dto.DeptOption; import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; @@ -137,4 +138,17 @@ public class AdminServiceImpl implements AdminService { formDto.setDeptId(userDetail.getGridId()); return adminFeignClient.getGridmanList(formDto); } + + @Override + public Result getDeptInfo(TokenDto userDetail) { + AppMemberListFromDTO dto = new AppMemberListFromDTO(); + dto.setDeptId(userDetail.getGridId()); + return adminFeignClient.getDeptInfo(dto); + } + + @Override + public Result getMemberList(TokenDto userDetail, AppMemberListFromDTO dto) { + dto.setDeptId(userDetail.getGridId()); + return adminFeignClient.getMemberList(dto); + } }