网格指导员修改

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();
+    }
+
 }

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();
 }

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");
+    }
 }

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();
 }

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();
+    }
 }