From d283f41c0761ef29fe0e276ade7805ce557eac97 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 11 May 2022 16:21:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E4=B8=AA=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/controller/HouseController.java | 3 ++- .../main/java/com/epmet/service/impl/HouseServiceImpl.java | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java index 1a5fcdb3fb..99404a5d89 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java @@ -361,6 +361,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); @@ -381,7 +382,7 @@ public class HouseController implements ResultDataResolver { } }while (dataList.getTotal() == formDTO.getPageSize()); //获取导出配置 - + haveSearchCache.invalidateAll(); } catch (EpmetException e) { response.reset(); response.setCharacterEncoding("UTF-8"); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index c4bd04db15..7cacfb2513 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -477,7 +477,7 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { icBuildingService.update(icBuildingDTO); } } - Cache> memberMap = CacheBuilder.newBuilder().expireAfterAccess(1, TimeUnit.SECONDS).build(); + Cache> memberCacheMap = CacheBuilder.newBuilder().expireAfterAccess(10, TimeUnit.SECONDS).expireAfterWrite(30,TimeUnit.MINUTES).build(); @Override public PageData getHouseUser(TokenDto tokenDto, IcHouseListFormDTO formDTO, Cache haveSearchCache) { RentTenantDataFormDTO resiParam = new RentTenantDataFormDTO(); @@ -516,9 +516,10 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { if (finalSearchLevel == 2){ resiParam.setHouseId(o.getHouseId()); } - this.getHouseMembers(resiParam, memberMap,haveSearchCache); - List members = memberMap.getIfPresent(o.getHouseId()); + this.getHouseMembers(resiParam, memberCacheMap,haveSearchCache); + List members = memberCacheMap.getIfPresent(o.getHouseId()); + //序号 一个houseId为一个序号 int n = num.incrementAndGet(); //没有住户 则直接写房屋