From 61a87b08f761a44ec4aff66177c92b27225722be Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 16 Jul 2021 09:59:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AEgridId=E6=9F=A5=E8=AF=A2pids?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/feign/GovOrgOpenFeignClient.java     |  9 +++++++++
 .../fallback/GovOrgOpenFeignClientFallback.java    |  5 +++++
 .../epmet/controller/CustomerGridController.java   | 11 +++++++++++
 .../main/java/com/epmet/dao/CustomerGridDao.java   |  8 ++++++++
 .../com/epmet/service/CustomerGridService.java     |  8 ++++++++
 .../service/impl/CustomerGridServiceImpl.java      | 14 ++++++++++++++
 .../src/main/resources/mapper/CustomerGridDao.xml  |  5 +++++
 7 files changed, 60 insertions(+)

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 1b99ac96f3..a79519837b 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
@@ -352,4 +352,13 @@ public interface GovOrgOpenFeignClient {
      **/
     @GetMapping(value = "/gov/org/customeragency/getareacodeswitch/{customerId}")
     Result<String> 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<String> selectPidsByGridId(@RequestParam("gridId") String gridId);
 }
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 0d13438885..f767c0ec69 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
@@ -209,4 +209,9 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
     public Result<String> getAreaCodeSwitch(String customerId) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getAreaCodeSwitch", customerId);
     }
+
+    @Override
+    public Result<String> 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<String> resultDTOS = customerGridService.listGridIdsInCommunity(gridId);
         return new Result<List<String>>().ok(resultDTOS);
     }
+
+    /**
+     * @Description  根据网格ID查询pids
+     * @Param gridId
+     * @author zxc
+     * @date 2021/7/16 9:52 上午
+     */
+    @PostMapping("pidsbygrid")
+    public Result<String> selectPidsByGridId(@RequestParam("gridId") String gridId){
+        return new Result<String>().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<CustomerGridEntity> {
      * @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<CustomerGridEntity> {
      * @date 2021/4/19 11:53 上午
      */
     Result<CustomerGridDTO> 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<CustomerGridDao, Cu
     public Result<CustomerGridDTO> getBaseInfo(CustomerGridFormDTO customerGridFormDTO) {
         return new Result<CustomerGridDTO>().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'
     </select>
+
+    <!-- 根据网格ID查询pids -->
+    <select id="selectPidsByGridId" resultType="java.lang.String">
+        SELECT PIDS FROM customer_grid WHERE DEL_FLAG = '0' AND ID = #{gridId}
+    </select>
 </mapper>