Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java

@@ -67,7 +67,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
     /**
      * 本次导入涉及到的楼宇id 用于更新住户数
      */
-    private Set<String> buildingIdSet = new ConcurrentHashSet<>();
+//    private Set<String> buildingIdSet = new ConcurrentHashSet<>();
 
     private ImportInfoFormDTO formDTO;
     private IcBuildingDao icBuildingDao;
@@ -539,13 +539,13 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
     public void doAfterAllAnalysed(AnalysisContext context) {
         finalDispose();
         // 更新ic_building户数
-        if (!CollectionUtils.isEmpty(buildingIdSet)){
+        /*if (!CollectionUtils.isEmpty(buildingIdSet)){
             List<UpdateBuildingHouseNumResultDTO> houseNum = icBuildingDao.selectHouseNum(buildingIdSet);
             if (!CollectionUtils.isEmpty(houseNum)){
                 icBuildingDao.allUpdateHouseNum(houseNum);
             }
             buildingIdSet = null;
-        }
+        }*/
         // 删除缓存
         icHouseRedis.delTemporaryCacheGrids(formDTO.getCustomerId(), formDTO.getUserId());
         icHouseRedis.delTemporaryCacheNeighBorHood(formDTO.getCustomerId(), formDTO.getUserId());
@@ -586,7 +586,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
     public void houseInsert(List<ImportGeneralDTO> houses){
         if (!CollectionUtils.isEmpty(houses)){
             icHouseService.insertBatch(ConvertUtils.sourceToTarget(houses, IcHouseEntity.class));
-            buildingIdSet.addAll(houses.stream().map(ImportGeneralDTO::getBuildingId).collect(Collectors.toSet()));
+//            buildingIdSet.addAll(houses.stream().map(ImportGeneralDTO::getBuildingId).collect(Collectors.toSet()));
         }
     }
 
@@ -594,7 +594,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
     public void houseUpdate(List<ImportGeneralDTO> houses){
         if (!CollectionUtils.isEmpty(houses)){
             icHouseService.houseUpdate(houses);
-            buildingIdSet.addAll(houses.stream().map(ImportGeneralDTO::getBuildingId).collect(Collectors.toSet()));
+//            buildingIdSet.addAll(houses.stream().map(ImportGeneralDTO::getBuildingId).collect(Collectors.toSet()));
         }
     }