From feb02f4b2f8591ca8e4a464de51abd70cf69699a Mon Sep 17 00:00:00 2001
From: wangxianzhang <ZHANGYUGE6666>
Date: Fri, 11 Nov 2022 11:26:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BA=E4=BA=86=E6=8F=90=E5=8D=87=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E5=B1=85=E6=B0=91=E6=95=88=E7=8E=87=EF=BC=8C=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E5=88=86=E5=B8=83=E5=BC=8F=E9=94=81=EF=BC=8C=E9=99=90?=
 =?UTF-8?q?=E5=88=B6=E4=BF=AE=E6=94=B9=E5=B0=8F=E5=8C=BA=E7=9A=84=E9=82=A3?=
 =?UTF-8?q?=E4=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/controller/IcResiUserController.java     | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
index 429585d104..d6fa1b2d72 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
@@ -718,7 +718,8 @@ public class IcResiUserController implements ResultDataResolver {
             boolean isAllSuccess = false;
             RLock lock = null;
             try {
-                lock = distributedLock.getLock(RedisKeys.getXiaoquEditLock(customerId), 120L, 3L, TimeUnit.SECONDS);
+                // todo 导入数据，临时去掉
+                //lock = distributedLock.getLock(RedisKeys.getXiaoquEditLock(customerId), 120L, 3L, TimeUnit.SECONDS);
                 List<FormItemResult> formItemList = icResiUserService.listFormItems(customerId, IcFormCodeEnum.RESI_BASE_INFO.getCode());
                 isAllSuccess = icResiUserImportService.importIcResiInfoFromExcel(importTaskId, formItemList, importTempFileSavePath.toString(), response, IC_RESI_UPLOAD_DIR);
             } catch (Throwable e) {
@@ -759,9 +760,10 @@ public class IcResiUserController implements ResultDataResolver {
                 epmetMessageOpenFeignClient.sendSystemMsgByMQ(form);
 
                 //解锁
-                if (lock != null) {
-                    lock.unlock();
-                }
+                // todo 导入数据临时去掉
+                //if (lock != null) {
+                //    lock.unlock();
+                //}
             }
         });