Merge remote-tracking branch 'remotes/origin/dev_epidemic_situation' into dev

# Conflicts:
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java

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);
+    }
 }

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

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java

@@ -38,7 +38,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;
@@ -71,8 +74,6 @@ public class BuildingServiceImpl implements BuildingService {
 
     @Resource
     private IcHouseDao icHouseDao;
-    @Autowired
-    private IcHouseService icHouseService;
 
     @Resource
     private CustomerAgencyDao customerAgencyDao;
@@ -557,6 +558,16 @@ public class BuildingServiceImpl implements BuildingService {
             }
         }
         icBuildingUnitService.insertBatch(unitList);
+
+        //删除楼栋下所有的房屋缓存
+        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);
+            });
+        }
+
     }
 
     /**

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,

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java

@@ -394,7 +394,7 @@ public class IcResiUserController implements ResultDataResolver {
     }
 
     /**
-     * desc:根据客户id 下载模版文件 如果不存在则返回null
+     * desc:根据客户id 先从oss下载模版,如果有没有则使用系统默认模板 如果不存在则返回null
      *
      * @param customerId
      * @return