From e4825dee6a3f6ff12cef2b8efcfbc7a8644aeaa2 Mon Sep 17 00:00:00 2001
From: wangxianzhang <ZHANGYUGE6666>
Date: Thu, 25 Nov 2021 10:40:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=201.=E5=B1=85?=
 =?UTF-8?q?=E6=B0=91=E4=BF=A1=E6=81=AF=E5=AF=BC=E5=85=A5=EF=BC=8C=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=9C=AC=E5=9C=B0=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/IcResiUserImportServiceImpl.java     | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
index f36d746475..9b50c237dd 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
@@ -29,6 +29,8 @@ import com.epmet.feign.EpmetAdminOpenFeignClient;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.service.IcResiUserImportService;
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -59,6 +61,15 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
     public static final ThreadLocal<Map<String, List<ErrorRow>>> errorRows = new ThreadLocal<>();
     public static final ThreadLocal<Map<String, List<SkipedRow>>> skipedRows = new ThreadLocal<>();
 
+    /**
+     * key: itemId
+     * value:
+     *      key: option的中文
+     *      value: options的英文key，也可能是数据id
+     */
+    Cache<String, Map<String, String>> itemIdAndOptionsCache = CacheBuilder.newBuilder().maximumSize(500).build();
+
+
     @Autowired
     private LoginUserUtil loginUserUtil;
 
@@ -212,6 +223,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
         } finally {
             skipedRows.remove();
             errorRows.remove();
+            itemIdAndOptionsCache.invalidateAll();
         }
     }
 
@@ -562,10 +574,13 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
                     String colValue = options.get(cellContent);
                     columnWrapper.setColValue(colValue);
                 } else {
-                    // remote类型
-
-                    Map<String, String> options = listRemoteOptions(headerColumnWrapper, columnWrapper.getOptionSourceValue(), currUserAgencyId, "saveorupdate");
-                    String colValue = options.get(cellContent);
+                    // remote类型。优先从缓存取
+                    Map<String, String> optionsOfItem = itemIdAndOptionsCache.getIfPresent(columnWrapperEntry.getKey());
+                    if (optionsOfItem == null || optionsOfItem.size() == 0) {
+                        optionsOfItem = listRemoteOptions(headerColumnWrapper, columnWrapper.getOptionSourceValue(), currUserAgencyId, "saveorupdate");
+                        itemIdAndOptionsCache.put(columnWrapperEntry.getKey(), optionsOfItem);
+                    }
+                    String colValue = optionsOfItem.get(cellContent);
                     columnWrapper.setColValue(colValue);
                 }
             } else if ("checkbox".equals(columnWrapper.getItemType())) {