Merge remote-tracking branch 'remotes/origin/dev_house_resi_export' into dev_move_out_of

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java

@@ -360,6 +360,7 @@ public class HouseController implements ResultDataResolver {
                     .build();
             int[] mergeRowArr = new int[]{0,1,2,3,4,5,6,7,8,9,10,11,12};
 
+            //冻结表头 2行
             FreezeAndFilter writeHandler = new FreezeAndFilter();
             writeHandler.rowSplit = 2;
             ExcelFillCellMergeStrategy mergeStrategy = new ExcelFillCellMergeStrategy(2,mergeRowArr,false);
@@ -380,7 +381,7 @@ public class HouseController implements ResultDataResolver {
                 }
             }while (dataList.getTotal() == formDTO.getPageSize());
             //获取导出配置
-
+            haveSearchCache.invalidateAll();
         } catch (EpmetException e) {
             response.reset();
             response.setCharacterEncoding("UTF-8");

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

@@ -581,7 +581,7 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
             icBuildingService.update(icBuildingDTO);
         }
     }
-    Cache<String,List<HouseIcResiUserResultDTO.HouseMemberResultDTO>> memberMap = CacheBuilder.newBuilder().expireAfterAccess(1, TimeUnit.SECONDS).build();
+    Cache<String,List<HouseIcResiUserResultDTO.HouseMemberResultDTO>> memberCacheMap = CacheBuilder.newBuilder().expireAfterAccess(10, TimeUnit.SECONDS).expireAfterWrite(30,TimeUnit.MINUTES).build();
     @Override
     public PageData<HouseMemberResultDTO> getHouseUser(TokenDto tokenDto, IcHouseListFormDTO formDTO, Cache<String, Boolean> haveSearchCache) {
         RentTenantDataFormDTO resiParam = new RentTenantDataFormDTO();
@@ -620,9 +620,10 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
             if (finalSearchLevel == 2){
                 resiParam.setHouseId(o.getHouseId());
             }
-            this.getHouseMembers(resiParam, memberMap,haveSearchCache);
-            List<HouseIcResiUserResultDTO.HouseMemberResultDTO> members = memberMap.getIfPresent(o.getHouseId());
+            this.getHouseMembers(resiParam, memberCacheMap,haveSearchCache);
+            List<HouseIcResiUserResultDTO.HouseMemberResultDTO> members = memberCacheMap.getIfPresent(o.getHouseId());
 
+            //序号 一个houseId为一个序号
             int n = num.incrementAndGet();
 
             //没有住户 则直接写房屋