From 7b880b48bc56a71b572883934de926df5f26deb3 Mon Sep 17 00:00:00 2001 From: liuxy Date: Sat, 27 Jan 2024 16:25:26 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9Aredisson=E8=87=AA=E5=8A=A8=E7=BB=AD?= =?UTF-8?q?=E6=9C=9F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index 987fd8e45..311684678 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -201,7 +201,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { String type = whereJson.getString("type"); JSONObject result = new JSONObject(); RLock lock = redissonClient.getLock("acs_to_wms:" + type); - boolean tryLock = lock.tryLock(5, TimeUnit.SECONDS); + boolean tryLock = lock.tryLock(5,20, TimeUnit.SECONDS); try { if (tryLock) { String device_code = whereJson.getString("device_code"); @@ -625,8 +625,10 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { return result; } } finally { - if (tryLock) { - lock.unlock(); + if (lock.isLocked() && lock.isHeldByCurrentThread()) { + try { + lock.unlock(); + }catch (Exception ex){} } } result.put("status", HttpStatus.BAD_REQUEST.value());