NewLife
/
AntJob
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[fix]修正DelayTime为空时无法消费消息的问题

This commit is contained in:
大石头 2024-09-06 21:59:57 +08:00
parent 20b9920944
commit e23c26d21a
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AntJob.Data/Entity/应用消息.Biz.cs
View File

@ -119,7 +119,7 @@ public partial class AppMessage : EntityBase<AppMessage>
/// <returns></returns> /// <returns></returns>
public static IList<AppMessage> GetTopic(Int32 appid, String topic, DateTime endTime, Int32 count) public static IList<AppMessage> GetTopic(Int32 appid, String topic, DateTime endTime, Int32 count)
{ {
return FindAll(_.AppID == appid & _.Topic == topic & _.DelayTime <= endTime, _.Id.Asc(), null, 0, count); return FindAll(_.AppID == appid & _.Topic == topic & (_.DelayTime.IsNull() | _.DelayTime <= endTime), _.Id.Asc(), null, 0, count);
} }
/// <summary>去重过滤</summary> /// <summary>去重过滤</summary>

5
AntJob.Server/Services/JobService.cs
View File

@ -361,7 +361,10 @@ public class JobService(AppService appService, ICacheProvider cacheProvider, ITr
jm.CreateTime = jm.UpdateTime = now; jm.CreateTime = jm.UpdateTime = now;
if (model.DelayTime > 0) jm.DelayTime = dTime; if (model.DelayTime > 0)
jm.DelayTime = dTime;
else
jm.DelayTime = now;
ms.Add(jm); ms.Add(jm);
} }