行程上报-地区

epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAdminController.java

@@ -4,6 +4,7 @@ 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.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.dto.epdc.form.CityAreaFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcAppGridManFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcAppGridManListResultDTO;
 import com.elink.esua.epdc.service.AdminService;
@@ -66,4 +67,16 @@ public class ApiAdminController {
         ValidatorUtils.validateEntity(formDto);
         return adminService.getGridmanList(userDetail,formDto);
     }
+
+    /**
+    * @describe: 行程上报获取省/市/区/街道/社区信息，通过pid
+    * @author wangtong
+    * @date 2021/10/14 9:35
+    * @params [formDto]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @GetMapping("/city/getAreaInfo")
+    public Result getAreaInfo(CityAreaFormDTO formDto){
+        return adminService.getAreaInfo(formDto);
+    }
 }

epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java

@@ -4,6 +4,7 @@ import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.*;
 import com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO;
+import com.elink.esua.epdc.dto.epdc.form.CityAreaFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcAppGridManFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcAppGridManListResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcAppIndexPanelResultDTO;
@@ -197,4 +198,14 @@ public interface AdminFeignClient {
      **/
     @GetMapping("sys/dict/listSimple/{dictType}")
     Result<List<SysSimpleDictDTO>> getListSimpleDictInfo(@PathVariable("dictType") String dictType);
+
+    /**
+     * @describe: 行程上报获取省/市/区/街道/社区信息，通过pid
+     * @author wangtong
+     * @date 2021/10/14 9:35
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    @GetMapping(value = "sys/city/getAreaInfo", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result getAreaInfo(CityAreaFormDTO formDto);
 }

epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java

@@ -5,6 +5,7 @@ import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.*;
 import com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO;
+import com.elink.esua.epdc.dto.epdc.form.CityAreaFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcAppGridManFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcAppGridManListResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcAppIndexPanelResultDTO;
@@ -101,4 +102,9 @@ public class AdminFeignClientFallback implements AdminFeignClient {
     public Result<List<SysSimpleDictDTO>> getListSimpleDictInfo(String dictType) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getListSimpleDictInfo", dictType);
     }
+
+    @Override
+    public Result getAreaInfo(CityAreaFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getAreaInfo", formDto);
+    }
 }

epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AdminService.java

@@ -3,6 +3,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.CityAreaFormDTO;
 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;
@@ -93,4 +94,13 @@ public interface AdminService {
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      */
     Result getMemberList(TokenDto userDetail,AppMemberListFromDTO dto);
+
+    /**
+     * @describe: 行程上报获取省/市/区/街道/社区信息，通过pid
+     * @author wangtong
+     * @date 2021/10/14 9:35
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    Result getAreaInfo(CityAreaFormDTO formDto);
 }

epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java

@@ -11,6 +11,7 @@ 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;
+import com.elink.esua.epdc.dto.epdc.form.CityAreaFormDTO;
 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;
@@ -151,4 +152,9 @@ public class AdminServiceImpl implements AdminService {
         dto.setDeptId(userDetail.getGridId());
         return adminFeignClient.getMemberList(dto);
     }
+
+    @Override
+    public Result getAreaInfo(CityAreaFormDTO formDto) {
+        return adminFeignClient.getAreaInfo(formDto);
+    }
 }