diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java index c246af8c09..c11cdb7874 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java @@ -353,6 +353,15 @@ public interface GovOrgOpenFeignClient { @GetMapping(value = "/gov/org/customeragency/getareacodeswitch/{customerId}") Result getAreaCodeSwitch(@PathVariable("customerId")String customerId); + /** + * @Description 根据网格ID查询pids + * @Param gridId + * @author zxc + * @date 2021/7/16 9:52 上午 + */ + @PostMapping(value = "/gov/org/customergrid/pidsbygrid") + Result selectPidsByGridId(@RequestParam("gridId") String gridId); + /** * 工作人员的个人信息 * @param fromDTO diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java index c83d34ca95..8110e53936 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java @@ -214,4 +214,9 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient { public Result queryStaffProfile(StaffInfoFromDTO fromDTO) { return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "mine", fromDTO); } + + @Override + public Result selectPidsByGridId(String gridId) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "selectPidsByGridId", gridId); + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java index eec27314ba..bb06477812 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java @@ -241,4 +241,15 @@ public class CustomerGridController { List resultDTOS = customerGridService.listGridIdsInCommunity(gridId); return new Result>().ok(resultDTOS); } + + /** + * @Description 根据网格ID查询pids + * @Param gridId + * @author zxc + * @date 2021/7/16 9:52 上午 + */ + @PostMapping("pidsbygrid") + public Result selectPidsByGridId(@RequestParam("gridId") String gridId){ + return new Result().ok(customerGridService.selectPidsByGridId(gridId)); + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java index 4277be98c6..ec16bf0dcd 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java @@ -268,4 +268,12 @@ public interface CustomerGridDao extends BaseDao { * @date 2021/4/19 11:56 上午 */ CustomerGridDTO getGridBaseInfoById(@Param("gridId") String gridId); + + /** + * @Description 根据网格ID查询pids + * @Param gridId + * @author zxc + * @date 2021/7/16 9:52 上午 + */ + String selectPidsByGridId(@Param("gridId")String gridId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java index 4799c38890..b892fa84f8 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java @@ -287,4 +287,12 @@ public interface CustomerGridService extends BaseService { * @date 2021/4/19 11:53 上午 */ Result getBaseInfo(CustomerGridFormDTO customerGridFormDTO); + + /** + * @Description 根据网格ID查询pids + * @Param gridId + * @author zxc + * @date 2021/7/16 9:52 上午 + */ + String selectPidsByGridId(String gridId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java index c0a987206b..007aabd4b9 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java @@ -707,4 +707,18 @@ public class CustomerGridServiceImpl extends BaseServiceImpl getBaseInfo(CustomerGridFormDTO customerGridFormDTO) { return new Result().ok(ConvertUtils.sourceToTarget(baseDao.selectById(customerGridFormDTO.getGridId()), CustomerGridDTO.class)); } + + /** + * @Description 根据网格ID查询pids + * @Param gridId + * @author zxc + * @date 2021/7/16 9:52 上午 + */ + @Override + public String selectPidsByGridId(String gridId) { + if (StringUtils.isNotBlank(gridId)){ + return baseDao.selectPidsByGridId(gridId); + } + return ""; + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml index 2036e76fa6..2738538cbf 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml @@ -576,4 +576,9 @@ cg.ID = #{gridId} AND cg.DEL_FLAG = '0' + + +