Prechádzať zdrojové kódy

update Admin.NET/Admin.NET.Core/EventBus/RedisQueue.cs.
添加获取延迟队列数据, 队列 可信队列 延迟队列 按顺序排版。

Signed-off-by: npc6 <jjwsoft@qq.com>

npc6 1 rok pred
rodič
commit
e822a3b653
1 zmenil súbory, kde vykonal 48 pridanie a 23 odobranie
  1. 48 23
      Admin.NET/Admin.NET.Core/EventBus/RedisQueue.cs

+ 48 - 23
Admin.NET/Admin.NET.Core/EventBus/RedisQueue.cs

@@ -14,7 +14,7 @@ namespace Admin.NET.Core;
 public static class RedisQueue
 {
     private static readonly ICache _cache = App.GetRequiredService<ICache>();
-    
+
     /// <summary>
     /// 获取普通队列
     /// </summary>
@@ -28,7 +28,7 @@ public static class RedisQueue
     }
 
     /// <summary>
-    /// 发送一个数据列表到队列
+    /// 发送一个数据到队列
     /// </summary>
     /// <typeparam name="T"></typeparam>
     /// <param name="topic"></param>
@@ -60,12 +60,12 @@ public static class RedisQueue
     /// </summary>
     /// <typeparam name="T"></typeparam>
     /// <param name="topic"></param>
-    /// <param name="Count"></param>
+    /// <param name="count"></param>
     /// <returns></returns>
-    public static List<T> Take<T>(string topic, int Count = 1)
+    public static List<T> Take<T>(string topic, int count = 1)
     {
         var queue = GetQueue<T>(topic);
-        var result = queue.Take(Count).ToList();
+        var result = queue.Take(count).ToList();
         return result;
     }
 
@@ -137,6 +137,43 @@ public static class RedisQueue
     }
 
     /// <summary>
+    /// 在可信队列获取一条数据
+    /// </summary>
+    /// <param name="topic"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public static T ReliableTakeOne<T>(string topic)
+    {
+        var queue = GetRedisReliableQueue<T>(topic);
+        return queue.TakeOne(1);
+    }
+
+    /// <summary>
+    /// 异步在可信队列获取一条数据
+    /// </summary>
+    /// <param name="topic"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public static async Task<T> ReliableTakeOneAsync<T>(string topic)
+    {
+        var queue = GetRedisReliableQueue<T>(topic);
+        return await queue.TakeOneAsync(1);
+    }
+
+    /// <summary>
+    /// 在可信队列获取多条数据
+    /// </summary>
+    /// <param name="topic"></param>
+    /// <param name="count"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public static List<T> ReliableTake<T>(string topic, int count)
+    {
+        var queue = GetRedisReliableQueue<T>(topic);
+        return queue.Take(count).ToList();
+    }
+
+    /// <summary>
     /// 获取延迟队列
     /// </summary>
     /// <param name="topic"></param>
@@ -178,39 +215,27 @@ public static class RedisQueue
     }
 
     /// <summary>
-    /// 在可信队列获取一条数据
-    /// </summary>
-    /// <param name="topic"></param>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public static T ReliableTakeOne<T>(string topic)
-    {
-        var queue = GetRedisReliableQueue<T>(topic);
-        return queue.TakeOne(1);
-    }
-
-    /// <summary>
-    /// 异步在可信队列获取一条数据
+    /// 异步在延迟队列获取一条数据
     /// </summary>
     /// <param name="topic"></param>
     /// <typeparam name="T"></typeparam>
     /// <returns></returns>
-    public static async Task<T> ReliableTakeOneAsync<T>(string topic)
+    public static async Task<T> DelayTakeOne<T>(string topic)
     {
-        var queue = GetRedisReliableQueue<T>(topic);
+        var queue = GetDelayQueue<T>(topic);
         return await queue.TakeOneAsync(1);
     }
 
     /// <summary>
-    /// 在可信队列获取多条数据
+    /// 在延迟队列获取多条数据
     /// </summary>
     /// <param name="topic"></param>
     /// <param name="count"></param>
     /// <typeparam name="T"></typeparam>
     /// <returns></returns>
-    public static List<T> ReliableTake<T>(string topic, int count)
+    public static List<T> DelayTake<T>(string topic, int count = 1)
     {
-        var queue = GetRedisReliableQueue<T>(topic);
+        var queue = GetDelayQueue<T>(topic);
         return queue.Take(count).ToList();
     }
 }