From 2952a9d04919ee2e1a334f420ac82d3676b5a3be Mon Sep 17 00:00:00 2001 From: Jackwang Date: Fri, 5 Nov 2021 11:16:04 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E6=8C=87=E5=AF=BC=E5=91=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ApiGridMemberController.java | 24 +++++++++++++++++++ .../esua/epdc/feign/AdminFeignClient.java | 20 ++++++++++++++++ .../fallback/AdminFeignClientFallback.java | 10 ++++++++ .../elink/esua/epdc/service/AdminService.java | 18 ++++++++++++++ .../epdc/service/impl/AdminServiceImpl.java | 12 +++++++++- 5 files changed, 83 insertions(+), 1 deletion(-) 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 index 7617e05..83b09a3 100644 --- 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 @@ -45,4 +45,28 @@ public class ApiGridMemberController { return adminService.getMemberList(userDetail,dto); } + /** + * @describe: 获取网格队伍分类 + * @author wangtong + * @date 2021/11/4 15:38 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @GetMapping("getGridCategoryList") + public Result getGridCategoryList() { + return adminService.getGridCategoryList(); + } + + /** + * @describe: 获取社区列表 + * @author wangtong + * @date 2021/11/5 10:24 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @GetMapping("getCommunityDeptList") + public Result getCommunityDeptList() { + return adminService.getCommunityDeptList(); + } + } 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 57afa0f..12e4267 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 @@ -208,4 +208,24 @@ public interface AdminFeignClient { */ @GetMapping(value = "sys/city/getAreaInfo", consumes = MediaType.APPLICATION_JSON_VALUE) Result getAreaInfo(CityAreaFormDTO formDto); + + /** + * @describe: 居民端-获取网格队伍分类 + * @author wangtong + * @date 2021/11/4 15:38 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @GetMapping("sys/gridmembercategory/getGridCategoryList") + Result getGridCategoryList(); + + /** + * @describe: 获取社区列表 + * @author wangtong + * @date 2021/11/5 10:24 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @GetMapping("sys/gridmembercategory/getCommunityDeptList") + Result getCommunityDeptList(); } 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 3e86d3a..5b77e03 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 @@ -107,4 +107,14 @@ public class AdminFeignClientFallback implements AdminFeignClient { public Result getAreaInfo(CityAreaFormDTO formDto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getAreaInfo", formDto); } + + @Override + public Result getGridCategoryList() { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getGridCategoryList"); + } + + @Override + public Result getCommunityDeptList() { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getCommunityDeptList"); + } } 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 fe47af1..b244bde 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 @@ -103,4 +103,22 @@ public interface AdminService { * @return com.elink.esua.epdc.commons.tools.utils.Result */ Result getAreaInfo(CityAreaFormDTO formDto); + + /** + * @describe: 获取网格队伍分类 + * @author wangtong + * @date 2021/11/4 15:38 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + Result getGridCategoryList(); + + /** + * @describe: 获取社区列表 + * @author wangtong + * @date 2021/11/5 10:24 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + Result getCommunityDeptList(); } 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 7b1f0ed..d831f49 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 @@ -151,7 +151,7 @@ public class AdminServiceImpl implements AdminService { @Override public Result getMemberList(TokenDto userDetail, AppMemberListFromDTO dto) { - dto.setDeptId(userDetail.getGridId()); +// dto.setDeptId(userDetail.getGridId()); return adminFeignClient.getMemberList(dto); } @@ -160,4 +160,14 @@ public class AdminServiceImpl implements AdminService { log.info("formDto:"+formDto); return adminFeignClient.getAreaInfo(formDto); } + + @Override + public Result getGridCategoryList() { + return adminFeignClient.getGridCategoryList(); + } + + @Override + public Result getCommunityDeptList() { + return adminFeignClient.getCommunityDeptList(); + } }