From 3c8d864b5f68af5167199e0d5c9ff6c0c5852638 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 20 一月 2025 11:35:45 +0800
Subject: [PATCH] !639 发布 5.3.0-BETA 公测版本 Merge pull request !639 from 疯狂的狮子Li/dev
---
ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/QueueUtils.java | 39 ++++++++++++++++++++++-----------------
1 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/QueueUtils.java b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/QueueUtils.java
index f0fcb95..7c09e31 100644
--- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/QueueUtils.java
+++ b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/QueueUtils.java
@@ -1,12 +1,13 @@
package org.dromara.common.redis.utils;
-import org.dromara.common.core.utils.SpringUtils;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
+import org.dromara.common.core.utils.SpringUtils;
import org.redisson.api.*;
+import java.util.concurrent.CompletionStage;
import java.util.concurrent.TimeUnit;
-import java.util.function.Consumer;
+import java.util.function.Function;
/**
* 鍒嗗竷寮忛槦鍒楀伐鍏�
@@ -132,17 +133,6 @@
}
/**
- * 灏濊瘯璁剧疆 鏈夌晫闃熷垪 瀹归噺 鐢ㄤ簬闄愬埗鏁伴噺
- *
- * @param queueName 闃熷垪鍚�
- * @param capacity 瀹归噺
- */
- public static <T> boolean trySetBoundedQueueCapacity(String queueName, int capacity) {
- RBoundedBlockingQueue<T> boundedBlockingQueue = CLIENT.getBoundedBlockingQueue(queueName);
- return boundedBlockingQueue.trySetCapacity(capacity);
- }
-
- /**
* 浼樺厛闃熷垪鑾峰彇涓�涓槦鍒楁暟鎹� 娌℃湁鏁版嵁杩斿洖 null(涓嶆敮鎸佸欢杩熼槦鍒�)
*
* @param queueName 闃熷垪鍚�
@@ -173,12 +163,23 @@
*
* @param queueName 闃熷垪鍚�
* @param capacity 瀹归噺
- * @param destroy 宸插瓨鍦ㄦ槸鍚﹂攢姣�
+ */
+ public static <T> boolean trySetBoundedQueueCapacity(String queueName, int capacity) {
+ RBoundedBlockingQueue<T> boundedBlockingQueue = CLIENT.getBoundedBlockingQueue(queueName);
+ return boundedBlockingQueue.trySetCapacity(capacity);
+ }
+
+ /**
+ * 灏濊瘯璁剧疆 鏈夌晫闃熷垪 瀹归噺 鐢ㄤ簬闄愬埗鏁伴噺
+ *
+ * @param queueName 闃熷垪鍚�
+ * @param capacity 瀹归噺
+ * @param destroy 鏄惁閿�姣�
*/
public static <T> boolean trySetBoundedQueueCapacity(String queueName, int capacity, boolean destroy) {
RBoundedBlockingQueue<T> boundedBlockingQueue = CLIENT.getBoundedBlockingQueue(queueName);
- if (boundedBlockingQueue.isExists() && destroy) {
- destroyQueue(queueName);
+ if (destroy) {
+ boundedBlockingQueue.delete();
}
return boundedBlockingQueue.trySetCapacity(capacity);
}
@@ -224,8 +225,12 @@
/**
* 璁㈤槄闃诲闃熷垪(鍙闃呮墍鏈夊疄鐜扮被 渚嬪: 寤惰繜 浼樺厛 鏈夌晫 绛�)
*/
- public static <T> void subscribeBlockingQueue(String queueName, Consumer<T> consumer) {
+ public static <T> void subscribeBlockingQueue(String queueName, Function<T, CompletionStage<Void>> consumer, boolean isDelayed) {
RBlockingQueue<T> queue = CLIENT.getBlockingQueue(queueName);
+ if (isDelayed) {
+ // 璁㈤槄寤惰繜闃熷垪
+ CLIENT.getDelayedQueue(queue);
+ }
queue.subscribeOnElements(consumer);
}
--
Gitblit v1.9.3