From e14006489d7e6a55b1eca1f2ac7ac2f66f09c20a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= <yunhao.wang@estsh.com>
Date: Thu, 2 Jan 2020 14:10:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=8E=BB=E9=87=8D=20?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=AF=BC=E5=85=A5=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../busi/SysLocaleResourceController.java           | 21 ++++++++++++++-------
 .../serviceimpl/busi/SysLocaleResourceService.java  |  5 ++++-
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleResourceController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleResourceController.java
index 451ecb4..3c4e701 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleResourceController.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleResourceController.java
@@ -370,6 +370,7 @@ public class SysLocaleResourceController extends CoreBaseController {
     public ResultBean incrementImportSysLocaleResource(@RequestParam("file") MultipartFile file){
         try {
             Long startTime = System.currentTimeMillis();
+            // 提取Excel数据
             LOGGER.info("开始增量导入 {}",file.getOriginalFilename());
             ExcelTool excelTool = new ExcelTool(entityManager, redisRes);
             List<SysLocaleResource> sysLocaleResourceList = excelTool.importData(file.getOriginalFilename(), file.getInputStream(),
@@ -378,13 +379,18 @@ public class SysLocaleResourceController extends CoreBaseController {
             long excelToolExecuteTime = System.currentTimeMillis();
             LOGGER.info("增量导入 数据量 {}, ExcelTool耗时 {}", sysLocaleResourceList.size(), excelToolExecuteTime - startTime);
 
-            // 初始化数据
-            boolean d = false;
-            if(d){
-                return ResultBean.success();
-            }
-
+            // 数据去重并初始化
+            Set<String> resourceSet = new HashSet<>();
+            String resourceKey;
             for (SysLocaleResource resource : sysLocaleResourceList) {
+                // 资源去重
+                resourceKey = resource.getResourceKey() + resource.getLanguageCode();
+                if(resourceSet.contains(resourceKey)){
+                    continue;
+                } else {
+                    resourceSet.add(resourceKey);
+                }
+                // 初始化
                 resource.setId(getResourceKey(resource.getResourceKey(),resource.getLanguageCode()));
                 resource.setIsSystem(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
                 ConvertBean.modelInitialize(resource, AuthUtil.getSessionUser());
@@ -393,6 +399,7 @@ public class SysLocaleResourceController extends CoreBaseController {
             long deduplicationExecuteTime = System.currentTimeMillis();
             LOGGER.info("数据去重完毕, 数据去重耗时 {}", deduplicationExecuteTime - excelToolExecuteTime);
 
+            // 分批导入
             for (List<SysLocaleResource> resourceList : splitList(sysLocaleResourceList, 1000)) {
                 sysLocaleResourceService.saveSysLocaleResource(resourceList);
             }
@@ -412,7 +419,7 @@ public class SysLocaleResourceController extends CoreBaseController {
     }
 
     private Long getResourceKey(String resKey, String languageCode) {
-        if (redisRes.checkKey("CACHE_LANGUAGE:"+resKey,languageCode)) {
+        if (redisRes.checkKey(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE + resKey, languageCode)) {
             LOGGER.info("查询到已存在资源 {}：{}",resKey,languageCode);
             SysLocaleResource sysLocaleResource =sysLocaleResourceService.getSysLocaleResourceByLanguageCodeAndResKey(
                     languageCode, resKey
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java
index 10f9485..9a51e1e 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java
@@ -80,7 +80,10 @@ public class SysLocaleResourceService implements ISysLocaleResourceService {
     @Override
     public List<SysLocaleResource> saveSysLocaleResource(List<SysLocaleResource> list) {
         LOGGER.info("系统资源 SYS_LOCALE_RESOURCE list：{}",list);
-        return sysLocaleResourceRDao.saveAll(list);
+        for (SysLocaleResource sysLocaleResource : list) {
+            sysLocaleResourceRDao.insert(sysLocaleResource);
+        }
+        return list;
     }
 
     @Override