From f6ccfe6ed3fa97d62c7fe9b10279ab0d59e80319 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 10 六月 2021 14:04:41 +0800
Subject: [PATCH] update 独立 CountDownLatch 方法
---
ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisLockManager.java | 15 ++++-----------
1 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisLockManager.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisLockManager.java
index e00f800..0688bb1 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisLockManager.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisLockManager.java
@@ -33,11 +33,6 @@
private final static Integer FAIR_LOCK = 2;
/**
- * 璁℃暟閿�
- */
- private final static Integer COUNT_LOCK = 3;
-
- /**
* 瀛樻斁褰撳墠绾跨▼鑾峰彇閿佺殑绫诲瀷
*/
private final ThreadLocal<Integer> threadLocal = new ThreadLocal<>();
@@ -45,20 +40,18 @@
/**
* 鑾峰彇閿�
*/
- private <T> T getLock(String key, Integer lockType) {
+ private RLock getLock(String key, Integer lockType) {
Assert.isTrue(StrUtil.isNotBlank(key), "key涓嶈兘涓虹┖");
threadLocal.set(lockType);
- Object lock;
+ RLock lock;
if (BASE_LOCK.equals(lockType)) {
lock = redissonClient.getLock(key);
} else if (FAIR_LOCK.equals(lockType)) {
lock = redissonClient.getFairLock(key);
- } else if (COUNT_LOCK.equals(lockType)) {
- lock = redissonClient.getCountDownLatch(key);
} else {
throw new RuntimeException("閿佷笉瀛樺湪!");
}
- return (T)lock;
+ return lock;
}
/**
@@ -118,7 +111,7 @@
*/
public RCountDownLatch getCountDownLatch(String key, long count) {
Assert.isTrue(count >= 0, "count鏁伴噺蹇呴』澶т簬绛変簬0");
- RCountDownLatch rCountDownLatch = getLock(key, COUNT_LOCK);
+ RCountDownLatch rCountDownLatch = redissonClient.getCountDownLatch(key);
rCountDownLatch.trySetCount(count);
return rCountDownLatch;
}
--
Gitblit v1.9.3