From a33898c2a0374c249862a2b996e33352e30c8caf Mon Sep 17 00:00:00 2001 From: KonBAI <1527468660@qq.com> Date: 星期六, 02 四月 2022 13:02:56 +0800 Subject: [PATCH] !167 update 修改角色"菜单树选择项"和"部门树选择项"是否关联显示字段为Boolean类型 * fix 修改 postgres sql脚本,处理角色表字段类型错误问题。 * fix 修复postgreSQL新增或更新角色信息报错。修改角色"菜单树选择项"和"部门树选择项"是否关联显示字段为Boolean类型。 --- 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