From 0c8f727bd89677feb4c08b781af72807f4bd143a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 24 一月 2022 13:03:42 +0800
Subject: [PATCH] update maven-jar-plugin 3.2.0 => 3.2.2 update maven-war-plugin 3.2.0 => 3.2.2 update maven-compiler-plugin 3.1 => 3.9.0 update hutool 5.7.18 => 5.7.20 update springboot-admin 2.6.0 => 2.6.2 update redisson 3.16.7 => 3.16.8 update qiniu 7.9.0 => 7.9.2 update aliyun 3.13.1 => 3.14.0 update qcloud 5.6.58 => 5.6.68 update minio 8.3.4 => 8.3.5

---
 ruoyi-common/src/main/java/com/ruoyi/common/utils/redis/QueueUtils.java |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/redis/QueueUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/redis/QueueUtils.java
index c70acba..7850e01 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/redis/QueueUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/redis/QueueUtils.java
@@ -52,14 +52,21 @@
     public static <T> void addDelayedQueueObject(String queueName, T data, long time, TimeUnit timeUnit) {
         RBlockingQueue<T> queue = CLIENT.getBlockingQueue(queueName);
         RDelayedQueue<T> delayedQueue = CLIENT.getDelayedQueue(queue);
-        // 宸插瓨鍦ㄥ垯鏃犺
-        if (delayedQueue.contains(data)) {
-            return;
-        }
         delayedQueue.offer(data, time, timeUnit);
     }
 
     /**
+     * 鑾峰彇涓�涓欢杩熼槦鍒楁暟鎹� 娌℃湁鏁版嵁杩斿洖 null
+     *
+     * @param queueName 闃熷垪鍚�
+     */
+    public static <T> T getDelayedQueueObject(String queueName) {
+        RBlockingQueue<T> queue = CLIENT.getBlockingQueue(queueName);
+        RDelayedQueue<T> delayedQueue = CLIENT.getDelayedQueue(queue);
+        return delayedQueue.poll();
+    }
+
+    /**
      * 鍒犻櫎寤惰繜闃熷垪鏁版嵁
      */
     public static <T> boolean removeDelayedQueueObject(String queueName, T data) {

--
Gitblit v1.9.3