From 71b4875446cfc709de9953a4e606105a9fec1be7 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 3 Nov 2021 15:37:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=88=BF=E5=B1=8B=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/feign/GovOrgOpenFeignClient.java    |  9 +++++++++
 .../GovOrgOpenFeignClientFallback.java        |  5 +++++
 .../epmet/controller/IcHouseController.java   | 11 ++++++++++
 .../main/java/com/epmet/dao/IcHouseDao.java   |  9 +++++++++
 .../com/epmet/service/IcHouseService.java     |  9 +++++++++
 .../service/impl/IcHouseServiceImpl.java      | 20 +++++++++++++++----
 .../src/main/resources/mapper/IcHouseDao.xml  | 12 +++++++++++
 7 files changed, 71 insertions(+), 4 deletions(-)

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 d7621bd88b..4784584218 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
@@ -507,4 +507,13 @@ public interface GovOrgOpenFeignClient {
      */
     @PostMapping("/gov/org/icneighborhood/neighborhoodoption")
     Result<List<OptionResultDTO>> getNeighborHoodOptions(IcNeighborHoodDTO dto);
+
+    /**
+     * @Description  查询房屋信息
+     * @param idCard
+     * @author zxc
+     * @date 2021/11/3 3:30 下午
+     */
+    @PostMapping("/gov/org/ichouse/selecthouseinfobyidcard")
+    Result<List<String>> selectHouseInfoByIdCard(@RequestParam("idCard")String idCard);
 }
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 7e53823382..95219d6b1b 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
@@ -305,6 +305,11 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getNeighborHoodOptions", dto);
     }
 
+    @Override
+    public Result<List<String>> selectHouseInfoByIdCard(String idCard) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "selectHouseInfoByIdCard", idCard);
+    }
+
     @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/IcHouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java
index 982bf33835..4092579603 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java
@@ -88,4 +88,15 @@ public class IcHouseController {
         return new Result<List<OptionResultDTO>>().ok(icHouseService.getHouseOption(formDTO));
     }
 
+    /**
+     * @Description  查询房屋信息
+     * @param idCard
+     * @author zxc
+     * @date 2021/11/3 3:30 下午
+     */
+    @PostMapping("selecthouseinfobyidcard")
+    public Result<List<String>> selectHouseInfoByIdCard(@RequestParam("idCard")String idCard){
+        return new Result<List<String>>().ok(icHouseService.selectHouseInfoByIdCard(idCard));
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java
index fd07309c02..07ca76c21c 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java
@@ -52,4 +52,13 @@ public interface IcHouseDao extends BaseDao<IcHouseEntity> {
     List<IcHouseExcel> searchAllHouse(@Param("house") IcHouseEntity house);
 
     List<HouseInfoDTO> queryHouseInfo(@Param("houseIdList") Set<String> houseIdList);
+
+    /**
+     * @Description  查询房屋信息
+     * @param idCard
+     * @author zxc
+     * @date 2021/11/3 3:30 下午
+     */
+    List<String> selectHouseInfoByIdCard(@Param("idCard") String idCard);
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java
index 471007a582..2f434ab350 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java
@@ -103,4 +103,13 @@ public interface IcHouseService extends BaseService<IcHouseEntity> {
      * @Date 2021/10/25 17:04
      */
     List<OptionResultDTO> getHouseOption(HouseFormDTO formDTO);
+
+    /**
+     * @Description  查询房屋信息
+     * @param idCard
+     * @author zxc
+     * @date 2021/11/3 3:30 下午
+     */
+    List<String> selectHouseInfoByIdCard(String idCard);
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
index 0a6f7f50c4..041bdc6b54 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
@@ -36,10 +36,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -135,4 +132,19 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
         }).collect(Collectors.toList());
     }
 
+    /**
+     * @Description  查询房屋信息
+     * @param idCard
+     * @author zxc
+     * @date 2021/11/3 3:30 下午
+     */
+    @Override
+    public List<String> selectHouseInfoByIdCard(String idCard) {
+        List<String> result = baseDao.selectHouseInfoByIdCard(idCard);
+        if (CollectionUtils.isEmpty(result)){
+            return new ArrayList<>();
+        }
+        return result;
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
index 3dc145833a..e150566f8a 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
@@ -252,4 +252,16 @@
             ih.ID = #{houseId}
         </foreach>
     </select>
+
+    <!-- 查询房屋信息 -->
+    <select id="selectHouseInfoByIdCard" resultType="java.lang.String">
+        SELECT
+            CONCAT(inh.NEIGHBOR_HOOD_NAME,ib.BUILDING_NAME,ibu.UNIT_NAME,ih.HOUSE_NAME)
+        FROM ic_house ih
+        LEFT JOIN ic_neighbor_hood inh ON (inh.ID = ih.NEIGHBOR_HOOD_ID AND inh.DEL_FLAG = '0')
+        LEFT JOIN ic_building ib ON (ib.ID = ih.BUILDING_ID AND ib.DEL_FLAG = '0')
+        LEFT JOIN ic_building_unit ibu ON (ibu.ID = ih.BUILDING_UNIT_ID AND ibu.DEL_FLAG = '0')
+        WHERE ih.DEL_FLAG = '0'
+          AND ih.OWNER_ID_CARD = #{idCard}
+    </select>
 </mapper>
\ No newline at end of file