From e9fd74c93beeb44e687b142c1e5c1a8542c5c713 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 13 May 2022 08:51:07 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=93=E5=AD=98=E4=BD=8D=E7=BD=AE=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/controller/HouseController.java    | 2 +-
 .../main/java/com/epmet/service/impl/HouseServiceImpl.java | 7 +++++--
 2 files changed, 6 insertions(+), 3 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 a512f66e8d..c8cedf436e 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
@@ -385,7 +385,7 @@ public class HouseController implements ResultDataResolver {
         } catch (EpmetException e) {
             response.reset();
             response.setCharacterEncoding("UTF-8");
-            response.setHeader("content-type", "text/htm1; charset=UTF-8");
+            response.setHeader("content-type", "application/json; charset=UTF-8");
             PrintWriter printWriter = response.getWriter();
             Result<Object> result = new Result<>().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),e.getMsg());
             printWriter.write(JSON.toJSONString(result));
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 abacde2c6c..29f240f486 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
@@ -65,7 +65,10 @@ import java.util.stream.Collectors;
 @Service
 public class HouseServiceImpl implements HouseService, ResultDataResolver {
 
-
+    /**
+     * 导出房屋内家庭成员时本地缓存
+     */
+    private static final Cache<String,List<HouseIcResiUserResultDTO.HouseMemberResultDTO>> memberCacheMap = CacheBuilder.newBuilder().expireAfterAccess(10, TimeUnit.SECONDS).expireAfterWrite(30,TimeUnit.MINUTES).build();
 
     @Autowired
     private IcHouseService icHouseService;
@@ -580,7 +583,7 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
             icBuildingService.update(icBuildingDTO);
         }
     }
-    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();