|
@ -718,7 +718,8 @@ public class IcResiUserController implements ResultDataResolver { |
|
|
boolean isAllSuccess = false; |
|
|
boolean isAllSuccess = false; |
|
|
RLock lock = null; |
|
|
RLock lock = null; |
|
|
try { |
|
|
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()); |
|
|
List<FormItemResult> formItemList = icResiUserService.listFormItems(customerId, IcFormCodeEnum.RESI_BASE_INFO.getCode()); |
|
|
isAllSuccess = icResiUserImportService.importIcResiInfoFromExcel(importTaskId, formItemList, importTempFileSavePath.toString(), response, IC_RESI_UPLOAD_DIR); |
|
|
isAllSuccess = icResiUserImportService.importIcResiInfoFromExcel(importTaskId, formItemList, importTempFileSavePath.toString(), response, IC_RESI_UPLOAD_DIR); |
|
|
} catch (Throwable e) { |
|
|
} catch (Throwable e) { |
|
@ -759,9 +760,10 @@ public class IcResiUserController implements ResultDataResolver { |
|
|
epmetMessageOpenFeignClient.sendSystemMsgByMQ(form); |
|
|
epmetMessageOpenFeignClient.sendSystemMsgByMQ(form); |
|
|
|
|
|
|
|
|
//解锁
|
|
|
//解锁
|
|
|
if (lock != null) { |
|
|
// todo 导入数据临时去掉
|
|
|
lock.unlock(); |
|
|
//if (lock != null) {
|
|
|
} |
|
|
// lock.unlock();
|
|
|
|
|
|
//}
|
|
|
} |
|
|
} |
|
|
}); |
|
|
}); |
|
|
|
|
|
|
|
|