From ed1e76873225a932fef66dbd2b1b3607cba25f98 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 18 Apr 2022 10:09:31 +0800
Subject: [PATCH] =?UTF-8?q?bug#2803,=E4=BF=AE=E6=94=B9=E6=88=BF=E5=B1=8B?=
 =?UTF-8?q?=E5=90=8D=E5=90=8E=E7=A4=BE=E5=8C=BA=E6=9F=A5=E8=AF=A2=E5=92=8C?=
 =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=E5=88=97=E8=A1=A8=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tools/redis/common/CustomerIcHouseRedis.java  |  4 ++++
 .../main/java/com/epmet/redis/IcHouseRedis.java   |  5 +++++
 .../epmet/service/impl/BuildingServiceImpl.java   | 15 ++++++++++++---
 .../src/main/resources/mapper/IcHouseDao.xml      |  2 +-
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerIcHouseRedis.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerIcHouseRedis.java
index ec0a79f1db..6f2e4959e0 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerIcHouseRedis.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerIcHouseRedis.java
@@ -62,4 +62,8 @@ public class CustomerIcHouseRedis {
         return buildInfoResult.getData();
     }
 
+    public static void delBuildingInfo(String buildingId){
+        String key = RedisKeys.getBuildingInfoKey(buildingId);
+        customerIcHouseRedis.redisUtils.delete(key);
+    }
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/IcHouseRedis.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/IcHouseRedis.java
index 01792daf8c..63ff8d25e5 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/IcHouseRedis.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/IcHouseRedis.java
@@ -90,6 +90,11 @@ public class IcHouseRedis {
         return houseInfo;
     }
 
+    public void delHouseInfo(String houseId,String customerId){
+        String key = RedisKeys.getHouseInfoCacheKey(houseId,customerId);
+        redisUtils.delete(key);
+    }
+
     /**
      * @Description 存放房屋临时缓存
      * @param customerId
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java
index 04670fde28..6e4ee6a7a3 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java
@@ -36,7 +36,10 @@ import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
 import com.epmet.model.BuildingInfoModel;
 import com.epmet.model.ImportBuildingInfoListener;
 import com.epmet.redis.IcHouseRedis;
-import com.epmet.service.*;
+import com.epmet.service.BuildingService;
+import com.epmet.service.IcBuildingService;
+import com.epmet.service.IcBuildingUnitService;
+import com.epmet.service.IcNeighborHoodService;
 import com.epmet.util.ExcelPoiUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -69,8 +72,6 @@ public class BuildingServiceImpl implements BuildingService {
 
     @Resource
     private IcHouseDao icHouseDao;
-    @Autowired
-    private IcHouseService icHouseService;
 
     @Resource
     private CustomerAgencyDao customerAgencyDao;
@@ -552,6 +553,14 @@ public class BuildingServiceImpl implements BuildingService {
             throw new RenException(EpmetErrorCode.ORG_EDIT_FAILED.getCode(),"楼宇单元下存在房屋，无法更新");
 
         }
+        //删除楼栋下所有的房屋缓存
+        List<IcHouseEntity> houseList = icHouseDao.selectList(new QueryWrapper<IcHouseEntity>().lambda().eq(IcHouseEntity::getBuildingId, formDTO.getBuildingId()));
+        if (!CollectionUtils.isEmpty(houseList)) {
+            houseList.forEach(house -> {
+                //删除房屋的缓存
+                icHouseRedis.delHouseInfo(house.getId(), customerId);
+            });
+        }
 
 
     }
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 f3698b35ed..327605cef6 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
@@ -149,7 +149,7 @@
     </select>-->
     <select id="searchHouseByPage" resultType="map">
       select
-        a.HOUSE_NAME as houseName,
+        concat(b.BUILDING_NAME,'-',d.UNIT_NUM,'-',a.DOOR_NAME) as houseName,
         c.NEIGHBOR_HOOD_NAME as neighborHoodName,
         b.BUILDING_NAME as buildingName,
         d.UNIT_NUM as unitNum,