From 5429bb091ca15df939ed5f7b7b3bb73a3550ebc2 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期六, 19 八月 2023 22:45:41 +0800
Subject: [PATCH] fix 修复 有界队列与优先队列 错误使用问题
---
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/BoundedQueueController.java | 9 +++-
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/PriorityQueueController.java | 6 +-
ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/QueueUtils.java | 52 ++++++++++++++++++++++++++
3 files changed, 61 insertions(+), 6 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 45b5496..f0fcb95 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
@@ -143,6 +143,32 @@
}
/**
+ * 浼樺厛闃熷垪鑾峰彇涓�涓槦鍒楁暟鎹� 娌℃湁鏁版嵁杩斿洖 null(涓嶆敮鎸佸欢杩熼槦鍒�)
+ *
+ * @param queueName 闃熷垪鍚�
+ */
+ public static <T> T getPriorityQueueObject(String queueName) {
+ RPriorityBlockingQueue<T> queue = CLIENT.getPriorityBlockingQueue(queueName);
+ return queue.poll();
+ }
+
+ /**
+ * 浼樺厛闃熷垪鍒犻櫎闃熷垪鏁版嵁(涓嶆敮鎸佸欢杩熼槦鍒�)
+ */
+ public static <T> boolean removePriorityQueueObject(String queueName, T data) {
+ RPriorityBlockingQueue<T> queue = CLIENT.getPriorityBlockingQueue(queueName);
+ return queue.remove(data);
+ }
+
+ /**
+ * 浼樺厛闃熷垪閿�姣侀槦鍒� 鎵�鏈夐樆濉炵洃鍚� 鎶ラ敊(涓嶆敮鎸佸欢杩熼槦鍒�)
+ */
+ public static <T> boolean destroyPriorityQueue(String queueName) {
+ RPriorityBlockingQueue<T> queue = CLIENT.getPriorityBlockingQueue(queueName);
+ return queue.delete();
+ }
+
+ /**
* 灏濊瘯璁剧疆 鏈夌晫闃熷垪 瀹归噺 鐢ㄤ簬闄愬埗鏁伴噺
*
* @param queueName 闃熷垪鍚�
@@ -170,6 +196,32 @@
}
/**
+ * 鏈夌晫闃熷垪鑾峰彇涓�涓槦鍒楁暟鎹� 娌℃湁鏁版嵁杩斿洖 null(涓嶆敮鎸佸欢杩熼槦鍒�)
+ *
+ * @param queueName 闃熷垪鍚�
+ */
+ public static <T> T getBoundedQueueObject(String queueName) {
+ RBoundedBlockingQueue<T> queue = CLIENT.getBoundedBlockingQueue(queueName);
+ return queue.poll();
+ }
+
+ /**
+ * 鏈夌晫闃熷垪鍒犻櫎闃熷垪鏁版嵁(涓嶆敮鎸佸欢杩熼槦鍒�)
+ */
+ public static <T> boolean removeBoundedQueueObject(String queueName, T data) {
+ RBoundedBlockingQueue<T> queue = CLIENT.getBoundedBlockingQueue(queueName);
+ return queue.remove(data);
+ }
+
+ /**
+ * 鏈夌晫闃熷垪閿�姣侀槦鍒� 鎵�鏈夐樆濉炵洃鍚� 鎶ラ敊(涓嶆敮鎸佸欢杩熼槦鍒�)
+ */
+ public static <T> boolean destroyBoundedQueue(String queueName) {
+ RBoundedBlockingQueue<T> queue = CLIENT.getBoundedBlockingQueue(queueName);
+ return queue.delete();
+ }
+
+ /**
* 璁㈤槄闃诲闃熷垪(鍙闃呮墍鏈夊疄鐜扮被 渚嬪: 寤惰繜 浼樺厛 鏈夌晫 绛�)
*/
public static <T> void subscribeBlockingQueue(String queueName, Consumer<T> consumer) {
diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/BoundedQueueController.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/BoundedQueueController.java
index b105ae9..f2fae0b 100644
--- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/BoundedQueueController.java
+++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/BoundedQueueController.java
@@ -1,9 +1,11 @@
package org.dromara.demo.controller.queue;
+import cn.dev33.satoken.annotation.SaIgnore;
import org.dromara.common.core.domain.R;
import org.dromara.common.redis.utils.QueueUtils;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.redisson.api.RBoundedBlockingQueue;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -19,6 +21,7 @@
* @author Lion Li
* @version 3.6.0
*/
+@SaIgnore
@Slf4j
@RequiredArgsConstructor
@RestController
@@ -35,7 +38,7 @@
@GetMapping("/add")
public R<Void> add(String queueName, int capacity) {
// 鐢ㄥ畬浜嗕竴瀹氳閿�姣� 鍚﹀垯浼氫竴鐩村瓨鍦�
- boolean b = QueueUtils.destroyQueue(queueName);
+ boolean b = QueueUtils.destroyBoundedQueue(queueName);
log.info("閫氶亾: {} , 鍒犻櫎: {}", queueName, b);
// 鍒濆鍖栬缃竴娆″嵆鍙�
if (QueueUtils.trySetBoundedQueueCapacity(queueName, capacity)) {
@@ -64,7 +67,7 @@
@GetMapping("/remove")
public R<Void> remove(String queueName) {
String data = "data-" + 5;
- if (QueueUtils.removeQueueObject(queueName, data)) {
+ if (QueueUtils.removeBoundedQueueObject(queueName, data)) {
log.info("閫氶亾: {} , 鍒犻櫎鏁版嵁: {}", queueName, data);
} else {
return R.fail("鎿嶄綔澶辫触");
@@ -81,7 +84,7 @@
public R<Void> get(String queueName) {
String data;
do {
- data = QueueUtils.getQueueObject(queueName);
+ data = QueueUtils.getBoundedQueueObject(queueName);
log.info("閫氶亾: {} , 鑾峰彇鏁版嵁: {}", queueName, data);
} while (data != null);
return R.ok("鎿嶄綔鎴愬姛");
diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/PriorityQueueController.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/PriorityQueueController.java
index 1989d9e..02c7396 100644
--- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/PriorityQueueController.java
+++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/PriorityQueueController.java
@@ -34,7 +34,7 @@
@GetMapping("/add")
public R<Void> add(String queueName) {
// 鐢ㄥ畬浜嗕竴瀹氳閿�姣� 鍚﹀垯浼氫竴鐩村瓨鍦�
- boolean b = QueueUtils.destroyQueue(queueName);
+ boolean b = QueueUtils.destroyPriorityQueue(queueName);
log.info("閫氶亾: {} , 鍒犻櫎: {}", queueName, b);
for (int i = 0; i < 10; i++) {
@@ -63,7 +63,7 @@
PriorityDemo data = new PriorityDemo();
data.setName(name);
data.setOrderNum(orderNum);
- if (QueueUtils.removeQueueObject(queueName, data)) {
+ if (QueueUtils.removePriorityQueueObject(queueName, data)) {
log.info("閫氶亾: {} , 鍒犻櫎鏁版嵁: {}", queueName, data);
} else {
return R.fail("鎿嶄綔澶辫触");
@@ -80,7 +80,7 @@
public R<Void> get(String queueName) {
PriorityDemo data;
do {
- data = QueueUtils.getQueueObject(queueName);
+ data = QueueUtils.getPriorityQueueObject(queueName);
log.info("閫氶亾: {} , 鑾峰彇鏁版嵁: {}", queueName, data);
} while (data != null);
return R.ok("鎿嶄綔鎴愬姛");
--
Gitblit v1.9.3