From 625c43bd56ca0d891eeda44536d018de8153cc49 Mon Sep 17 00:00:00 2001
From: wangxianzhang <ZHANGYUGE6666>
Date: Thu, 1 Dec 2022 09:00:22 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=96=AB=E6=83=85=E9=98=B2=E6=8E=A7?=
 =?UTF-8?q?=E3=80=91=E4=BF=A1=E6=81=AF=E5=90=8C=E6=AD=A5=E5=99=A8=EF=BC=8C?=
 =?UTF-8?q?=E5=8F=96=E9=94=81=E5=88=A4=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/processor/AbstractDataSyncJobProcessor.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/AbstractDataSyncJobProcessor.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/AbstractDataSyncJobProcessor.java
index 950c397c2d..2f3062448b 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/AbstractDataSyncJobProcessor.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/AbstractDataSyncJobProcessor.java
@@ -80,6 +80,10 @@ public abstract class AbstractDataSyncJobProcessor {
         RLock lock = null;
         try {
             lock = distributedLock.getLock(getDistributeLockKey(), getDistributeLockLeaseTime(), getDistributeLockWaitTime(), TimeUnit.SECONDS);
+            if (lock == null) {
+                log.warn("【异步数据更新】{}获取锁为空", getJobType());
+                return;
+            }
             // 查询可执行的任务列表，并且异步执行
             List<IcSyncJobEntity> icSyncJobToExec = icSyncJobDao.selectJobListByStatus("waiting", getJobType(), null, leftCount);
             if (!CollectionUtils.isEmpty(icSyncJobToExec)) {
@@ -89,9 +93,7 @@ public abstract class AbstractDataSyncJobProcessor {
         } catch (Exception e) {
             log.error("【异步数据更新】出错:{}", ExceptionUtils.getErrorStackTrace(e));
         } finally {
-            if (lock != null) {
-                lock.unlock();
-            }
+            distributedLock.unLock(lock);
         }
     }