ideship/track
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 处理死循环

Browse Source
This commit is contained in:
钟喜旺 2024-08-07 11:57:42 +08:00
parent c23542248e
commit 10f6096770
3 changed files with 18 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/SJZY.Track.Application/CAP/EventHandlers/PushWarningEventHandler.cs
View File

@ -32,20 +32,16 @@ public class PushWarningEventHandler : ITransientDependency, ICapSubscribe
await RedisHelper.Client.SetAsync(GlobalConst.TrackPushTrackWaringLockKey, 1, TimeSpan.FromHours(3)); await RedisHelper.Client.SetAsync(GlobalConst.TrackPushTrackWaringLockKey, 1, TimeSpan.FromHours(3));
int total = 0, pageSize = @event.PageSize, waitTime = 1000; int total = 0, pageSize = @event.PageSize, waitTime = 1000;
var dateTimes = Enumerable.Range(1, 12).Select(val => DateTime.Now.AddHours(-val)).ToList(); var rows = 0;
var pageindex = 0;
foreach (var dateTime in dateTimes) do
{ {
var rows = 0; rows = await _orderRepository.PushWarnOrdersAsync(pageSize, pageindex);
var pageindex = 1; pageindex++;
do total += rows;
{ await Task.Delay(waitTime);
rows = await _orderRepository.PushWarnOrdersAsync(pageSize, pageindex, dateTime); } while (rows == pageSize);
pageindex++;
total += rows;
await Task.Delay(waitTime);
} while (rows != pageSize);
}
await RedisHelper.Client.DelAsync(GlobalConst.TrackPushTrackWaringLockKey); await RedisHelper.Client.DelAsync(GlobalConst.TrackPushTrackWaringLockKey);
_logger.LogInformation(message: "本次预警扫描了：{total}个订单", total); _logger.LogInformation(message: "本次预警扫描了：{total}个订单", total);

4
src/SJZY.Track.Domain/Aggregates/OrderAggregate/IOrderRepository.cs
View File

@ -29,13 +29,13 @@ public interface IOrderRepository : IBasicRepository<OrderEntity>
/// 更新推送预警单 /// 更新推送预警单
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
Task<int> PushWarnOrdersAsync(int pageSize,DateTime createTime); Task<int> PushWarnOrdersAsync(int pageSize, DateTime createTime);
/// <summary> /// <summary>
/// 更新推送预警单 /// 更新推送预警单
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
Task<int> PushWarnOrdersAsync(int pageSize, int pageindex, DateTime createTime); Task<int> PushWarnOrdersAsync(int pageSize, int pageindex);
/// <summary> /// <summary>
/// 更新缺失标记，时区缺失和发生地缺失标记，1表示时区，2表示发生地，3表示两种 /// 更新缺失标记，时区缺失和发生地缺失标记，1表示时区，2表示发生地，3表示两种

22
src/SJZY.Track.Repository/Repositories/OrderRepository.cs
View File

@ -1,6 +1,5 @@
using SJZY.Track.Domain; using SJZY.Track.Domain;
using SJZY.Track.Domain.Aggregates.OrderAggregate; using SJZY.Track.Domain.Aggregates.OrderAggregate;
using SJZY.Track.Domain.Aggregates.TrackPushAggregate;
using SJZY.Track.Domain.Dtos.Order; using SJZY.Track.Domain.Dtos.Order;
namespace SJZY.Track.Repository.Repositories; namespace SJZY.Track.Repository.Repositories;
@ -81,17 +80,13 @@ AND `a`.`IsDeleted` = 0 AND `b`.`IsDeleted` = 0 limit @pageSize", new { pageSize
/// <param name="pageindex"></param> /// <param name="pageindex"></param>
/// <param name="createTime"></param> /// <param name="createTime"></param>
/// <returns></returns> /// <returns></returns>
public async Task<int> PushWarnOrdersAsync(int pageSize, int pageindex, DateTime createTime) public async Task<int> PushWarnOrdersAsync(int pageSize, int pageindex)
{ {
var ordersToUpdate = await Context.Queryable<OrderEntity>() var ordersToUpdate = await Context.Queryable<OrderEntity>()
.InnerJoin<TrackPushConfigEntity>((b, a) => a.SubSystemId == b.SubSystemId && a.CustomId == b.CustomId) .Where((b) => !b.IsCompleted
.Where((b, a) => && b.QuestionType != 1
!b.IsCompleted && !b.IsDeleted)
&& b.QuestionType != 1 .Select(b => new { b.LatestPushTime, b.Id, b.QuestionType })
&& b.CreateTime < createTime
&& !a.IsDeleted
&& !b.IsDeleted)
.Select((b, a) => new { b.LatestPushTime, b.Id, b.QuestionType })
.ToPageListAsync(pageindex, pageSize); .ToPageListAsync(pageindex, pageSize);
var latestPushTimeIds = new List<int>(); var latestPushTimeIds = new List<int>();
@ -106,10 +101,9 @@ AND `a`.`IsDeleted` = 0 AND `b`.`IsDeleted` = 0 limit @pageSize", new { pageSize
else questionZeroIds.AddLast(item.Id); else questionZeroIds.AddLast(item.Id);
} }
int rows = 0; if (latestPushTimeIds.Count > 0) UpdateOrderQuestionType(2, latestPushTimeIds);
if (latestPushTimeIds.Count > 0) rows += UpdateOrderQuestionType(2, latestPushTimeIds); if (questionZeroIds.Count > 0) UpdateOrderQuestionType(0, questionZeroIds);
if (questionZeroIds.Count > 0) rows += UpdateOrderQuestionType(0, questionZeroIds); return ordersToUpdate.Count;
return rows;
} }
private int UpdateOrderQuestionType(int questionType, IEnumerable<int> ids) private int UpdateOrderQuestionType(int questionType, IEnumerable<int> ids)