From f39cd3421c8934cd413d95a5649f6e38ec066aaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=86=9B?= <2357729423@qq.com> Date: Mon, 18 Mar 2024 09:44:42 +0800 Subject: [PATCH 1/7] init --- .../TrackPushContentConfigDto.cs | 10 ++ .../Dtos/TrackPull/TrackRefreshAttach.cs | 32 +++++ .../Dtos/TrackPull/TrackRefreshDto.cs | 16 --- .../Events/TrackPushAfterUpdateOrderEvent.cs | 24 ++++ .../Events/TrackPushEvent.cs | 74 ++++++++++ ...cs => TrackUpsertAfterUpdateOrderEvent.cs} | 2 +- .../Events/TrackUpsertEvent.cs | 5 + .../OrderLinkAfterFillTrackHandler.cs | 1 + .../EventHandlers/TrackDeleteEventHandler.cs | 7 +- .../TrackPushAfterUpdateOrderEventHandler.cs | 36 +++++ .../EventHandlers/TrackPushEventHandler.cs | 123 ++++++++++++++++ .../EventHandlers/TrackRefreshEventHandler.cs | 15 +- ...rackUpsertAfterUpdateOrderEventHandler.cs} | 23 +-- .../EventHandlers/TrackUpsertEventHandler.cs | 128 +++++++++++------ .../ProvideServices/OrderService.Link.cs | 1 + .../ProvideServices/TrackPullService.cs | 34 ++--- .../ProvideServices/TrackPushService.cs | 64 +++++---- .../Services/ProvideServices/TrackService.cs | 4 +- .../TrackPull/TrackPullCacheService.cs | 4 +- .../Services/TrackPull/TrackPullService.cs | 133 ++++++++++-------- .../TrackPush/TrackPushCacheService.cs | 4 +- .../TrackDetailsIndex.cs | 18 +-- .../ITrackPushRecordsRepository.cs | 11 ++ .../TrackPushRecordIndex.cs | 51 +++++++ .../Consts/GlobalConst.ES.cs | 14 ++ .../Consts/GlobalConst.MQ.cs | 39 +++++ .../Consts/GlobalConst.Redis.cs | 24 ++++ .../Consts/InterfaceRelayConst.cs | 27 ++++ .../Dtos/Order/LinkedOrderVO.cs | 5 + ...ProblemType.cs => TrackPushProblemType.cs} | 7 +- src/SJZY.Track.Domain/GlobalConst.cs | 54 ------- .../Queries/ProvideQueries.cs | 2 +- .../Repositories/OrderRepository.cs | 3 +- .../TrackPushRecordsRepository.cs | 28 ++++ 34 files changed, 766 insertions(+), 257 deletions(-) create mode 100644 src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackRefreshAttach.cs delete mode 100644 src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackRefreshDto.cs create mode 100644 src/SJZY.Track.Application.Contract/Events/TrackPushAfterUpdateOrderEvent.cs create mode 100644 src/SJZY.Track.Application.Contract/Events/TrackPushEvent.cs rename src/SJZY.Track.Application.Contract/Events/{UpdateOrderTrackEvent.cs => TrackUpsertAfterUpdateOrderEvent.cs} (95%) create mode 100644 src/SJZY.Track.Application/EventHandlers/TrackPushAfterUpdateOrderEventHandler.cs create mode 100644 src/SJZY.Track.Application/EventHandlers/TrackPushEventHandler.cs rename src/SJZY.Track.Application/EventHandlers/{UpdateOrderTrackEventHandler.cs => TrackUpsertAfterUpdateOrderEventHandler.cs} (76%) create mode 100644 src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/ITrackPushRecordsRepository.cs create mode 100644 src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushRecordIndex.cs create mode 100644 src/SJZY.Track.Domain/Consts/GlobalConst.ES.cs create mode 100644 src/SJZY.Track.Domain/Consts/GlobalConst.MQ.cs create mode 100644 src/SJZY.Track.Domain/Consts/GlobalConst.Redis.cs create mode 100644 src/SJZY.Track.Domain/Consts/InterfaceRelayConst.cs rename src/SJZY.Track.Domain/Enums/{TrackProblemType.cs => TrackPushProblemType.cs} (64%) delete mode 100644 src/SJZY.Track.Domain/GlobalConst.cs create mode 100644 src/SJZY.Track.Repository/Repositories/TrackPushRecordsRepository.cs diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/TrackPushContentConfigDto.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/TrackPushContentConfigDto.cs index 64ae2569..a019087f 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/TrackPushContentConfigDto.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/TrackPushContentConfigDto.cs @@ -15,6 +15,16 @@ public class TrackPushConfigDto public class TrackPushContentConfigDto { + /// + /// 是否自动推送 + /// + public bool IsAutoPush { get; set; } + + /// + /// 是否支持更新 + /// + public bool IsCanUpdate { get; set; } + /// /// 服务商code /// diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackRefreshAttach.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackRefreshAttach.cs new file mode 100644 index 00000000..ae47f35a --- /dev/null +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackRefreshAttach.cs @@ -0,0 +1,32 @@ +namespace SJZY.Track.Application.Contract.Dtos.TrackPull; + +public class TrackRefreshAttach +{ + public TrackRefreshAttach(int serviceProviderId, string serviceProviderCode, int subSystemId, int orderType) + { + ServiceProviderId = serviceProviderId; + ServiceProviderCode = serviceProviderCode; + SubSystemId = subSystemId; + OrderType = orderType; + } + + /// + /// 服务商id + /// + public int ServiceProviderId { get; set; } + + /// + /// 服务商code + /// + public string ServiceProviderCode { get; set; } + + /// + /// 订单类型（主数据枚举TrackOrderType） + /// + public int OrderType { get; set; } + + /// + /// 子系统id + /// + public int SubSystemId { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackRefreshDto.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackRefreshDto.cs deleted file mode 100644 index d8d476d2..00000000 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackRefreshDto.cs +++ /dev/null @@ -1,16 +0,0 @@ -using SJZY.Track.Application.Contract.Dtos.ProvideServices; - -namespace SJZY.Track.Application.Contract.Dtos.TrackPull; - -public class TrackRefreshDto : OrderNoInfo -{ - /// - /// 服务商id - /// - public int ServiceProviderId { get; set; } - - /// - /// 子系统id - /// - public int SubSystemId { get; set; } -} \ No newline at end of file diff --git a/src/SJZY.Track.Application.Contract/Events/TrackPushAfterUpdateOrderEvent.cs b/src/SJZY.Track.Application.Contract/Events/TrackPushAfterUpdateOrderEvent.cs new file mode 100644 index 00000000..b81b52cc --- /dev/null +++ b/src/SJZY.Track.Application.Contract/Events/TrackPushAfterUpdateOrderEvent.cs @@ -0,0 +1,24 @@ +namespace SJZY.Track.Application.Contract.Events; + +public class TrackPushAfterUpdateOrderEvent +{ + /// + /// 订单Id + /// + public int OrderId { get; set; } + + /// + /// 轨迹内容id + /// + public int TrackContentId { get; set; } + + /// + /// 是否成功 + /// + public bool IsSuccess { get; set; } + + /// + /// 最新描述 + /// + public string? Message { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application.Contract/Events/TrackPushEvent.cs b/src/SJZY.Track.Application.Contract/Events/TrackPushEvent.cs new file mode 100644 index 00000000..c7277eb2 --- /dev/null +++ b/src/SJZY.Track.Application.Contract/Events/TrackPushEvent.cs @@ -0,0 +1,74 @@ +namespace SJZY.Track.Application.Contract.Events; + +public class TrackPushEvent +{ + /// + /// 操作类型 + /// + public OptionType OptionType { get; set; } = OptionType.新增; + + /// + /// 服务商code + /// + public string ServiceProviderCode { get; set; } = null!; + + /// + /// 订单id + /// + public int OrderId { get; set; } + + /// + /// 订单号 + /// + public string OrderNo { get; set; } = null!; + + /// + /// 轨迹内容id + /// + public int TrackContentId { get; set; } + + /// + /// 轨迹发生地 + /// + public string TrackPlace { get; set; } = null!; + + /// + /// 轨迹发生时间 + /// + public DateTime TrackTime { get; set; } + + /// + /// 轨迹发生时区 + /// + public float TrackTimeZone { get; set; } + + /// + /// 轨迹代码参数值 + /// + public string? TrackContentCodeValue { get; set; } + + /// + /// 轨迹内容参数值 + /// + public string? TrackContentValue { get; set; } + + /// + /// 轨迹内容英文参数值 + /// + public string? TrackEnContentValue { get; set; } + + /// + /// 轨迹状态参数值 + /// + public string? TrackStatusValue { get; set; } + + /// + /// 扩展字段参数值 + /// + public string? ExpandFieldsValue { get; set; } + + /// + /// 推送人 + /// + public string? PushMan { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application.Contract/Events/UpdateOrderTrackEvent.cs b/src/SJZY.Track.Application.Contract/Events/TrackUpsertAfterUpdateOrderEvent.cs similarity index 95% rename from src/SJZY.Track.Application.Contract/Events/UpdateOrderTrackEvent.cs rename to src/SJZY.Track.Application.Contract/Events/TrackUpsertAfterUpdateOrderEvent.cs index 7daa9a7d..bf3907b4 100644 --- a/src/SJZY.Track.Application.Contract/Events/UpdateOrderTrackEvent.cs +++ b/src/SJZY.Track.Application.Contract/Events/TrackUpsertAfterUpdateOrderEvent.cs @@ -1,6 +1,6 @@ namespace SJZY.Track.Application.Contract.Events; -public class UpdateOrderTrackEvent +public class TrackUpsertAfterUpdateOrderEvent { /// /// 订单Id diff --git a/src/SJZY.Track.Application.Contract/Events/TrackUpsertEvent.cs b/src/SJZY.Track.Application.Contract/Events/TrackUpsertEvent.cs index 5bbcbea6..eb836245 100644 --- a/src/SJZY.Track.Application.Contract/Events/TrackUpsertEvent.cs +++ b/src/SJZY.Track.Application.Contract/Events/TrackUpsertEvent.cs @@ -9,6 +9,11 @@ public class TrackUpsertEvent : UpsertTrackInput /// public int OrderId { get; set; } + /// + /// 订单是否完成 + /// + public bool IsCompleted { get; set; } + /// /// 客户id /// diff --git a/src/SJZY.Track.Application/EventHandlers/OrderLinkAfterFillTrackHandler.cs b/src/SJZY.Track.Application/EventHandlers/OrderLinkAfterFillTrackHandler.cs index 9335175a..1d628a3a 100644 --- a/src/SJZY.Track.Application/EventHandlers/OrderLinkAfterFillTrackHandler.cs +++ b/src/SJZY.Track.Application/EventHandlers/OrderLinkAfterFillTrackHandler.cs @@ -2,6 +2,7 @@ using SJZY.Track.Application.Contract.Events; using SJZY.Track.Domain.Aggregates.OrderAggregate; using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate; +using SJZY.Track.Domain.Consts; using Volo.Abp.DependencyInjection; namespace SJZY.Track.Application.EventHandlers; diff --git a/src/SJZY.Track.Application/EventHandlers/TrackDeleteEventHandler.cs b/src/SJZY.Track.Application/EventHandlers/TrackDeleteEventHandler.cs index 1bbf3aac..1a1f0df0 100644 --- a/src/SJZY.Track.Application/EventHandlers/TrackDeleteEventHandler.cs +++ b/src/SJZY.Track.Application/EventHandlers/TrackDeleteEventHandler.cs @@ -3,6 +3,7 @@ using SJZY.Expand.ABP.Core.Logger; using SJZY.Track.Application.Contract.Events; using SJZY.Track.Domain.Aggregates.OrderAggregate; using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate; +using SJZY.Track.Domain.Consts; using SJZY.Track.Domain.Queries; using Volo.Abp.DependencyInjection; @@ -63,12 +64,12 @@ public class TrackDeleteEventHandler : ITransientDependency, ICapSubscribe { var track = await _trackDetailsRepository.GetLatestAsync(@event.OrderId); var updateOrderEvent = track == default - ? new UpdateOrderTrackEvent + ? new TrackUpsertAfterUpdateOrderEvent { OrderId = @event.OrderId, IsDelete = true } - : new UpdateOrderTrackEvent + : new TrackUpsertAfterUpdateOrderEvent { OrderId = @event.OrderId, IsCompleted = track.IsCompleted, @@ -79,7 +80,7 @@ public class TrackDeleteEventHandler : ITransientDependency, ICapSubscribe TrackTimeZone = track.TrackTimeZone, IsDelete = true }; - await _capPublisher.PublishAsync(GlobalConst.UpdateOrderTrackSubscribe, updateOrderEvent); + await _capPublisher.PublishAsync(GlobalConst.TrackUpsertAfterUpdateOrderSubscribe, updateOrderEvent); } // 根据订单关联关系异步向下刷 diff --git a/src/SJZY.Track.Application/EventHandlers/TrackPushAfterUpdateOrderEventHandler.cs b/src/SJZY.Track.Application/EventHandlers/TrackPushAfterUpdateOrderEventHandler.cs new file mode 100644 index 00000000..a1953f49 --- /dev/null +++ b/src/SJZY.Track.Application/EventHandlers/TrackPushAfterUpdateOrderEventHandler.cs @@ -0,0 +1,36 @@ +using DotNetCore.CAP; +using SJZY.Track.Application.Contract.Events; +using SJZY.Track.Domain.Aggregates.OrderAggregate; +using SJZY.Track.Domain.Consts; +using Volo.Abp.DependencyInjection; + +namespace SJZY.Track.Application.EventHandlers; + +public class TrackPushAfterUpdateOrderEventHandler : ITransientDependency, ICapSubscribe +{ + private readonly IOrderRepository _orderRepository; + + public TrackPushAfterUpdateOrderEventHandler(IOrderRepository orderRepository) + { + _orderRepository = orderRepository; + } + + [CapSubscribe(GlobalConst.TrackPushAfterUpdateOrderSubscribe)] + public async Task ConsumerAsync(TrackPushAfterUpdateOrderEvent @event) + { + var order = await _orderRepository.GetFirstAsync(x => x.Id == @event.OrderId); + if (order == default) return; + + // 异常：最近一条推送是失败 + // 预警：添加一条推送距离现在超过12h + // if (!@event.IsSuccess) + // { + // order.QuestionType = TrackPushProblemType.Error; + // } + + await _orderRepository.UpdateColumnAsync(order, x => new + { + x.LatestPushTrackContentId, x.QuestionType + }); + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application/EventHandlers/TrackPushEventHandler.cs b/src/SJZY.Track.Application/EventHandlers/TrackPushEventHandler.cs new file mode 100644 index 00000000..b2b977a8 --- /dev/null +++ b/src/SJZY.Track.Application/EventHandlers/TrackPushEventHandler.cs @@ -0,0 +1,123 @@ +using DotNetCore.CAP; +using SJZY.InterfaceRelay.Application.Contracts; +using SJZY.Track.Application.Contract.Events; +using SJZY.Track.Domain.Aggregates.TrackPushAggregate; +using SJZY.Track.Domain.Consts; +using Volo.Abp.DependencyInjection; +using Volo.Abp.Http.Client.DynamicProxying; + +namespace SJZY.Track.Application.EventHandlers; + +public class TrackPushEventHandler : ITransientDependency, ICapSubscribe +{ + private readonly IHttpClientProxy _httpClientProxy; + private readonly ITrackPushRecordsRepository _trackPushRecordsRepository; + private readonly ICapPublisher _capPublisher; + + public TrackPushEventHandler(IHttpClientProxy httpClientProxy, + ITrackPushRecordsRepository trackPushRecordsRepository, ICapPublisher capPublisher) + { + _httpClientProxy = httpClientProxy; + _trackPushRecordsRepository = trackPushRecordsRepository; + _capPublisher = capPublisher; + } + + [CapSubscribe(GlobalConst.TrackPushSubscribe)] + public async Task ConsumerAsync(TrackPushEvent @event) + { + switch (@event.OptionType) + { + case OptionType.无: + break; + case OptionType.新增: + await PushAddAsync(@event); + break; + case OptionType.删除: + break; + case OptionType.修改: + await PushUpdateAsync(@event); + break; + default: + throw new ArgumentOutOfRangeException(); + } + } + + private async Task PushAddAsync(TrackPushEvent @event) + { + var data = new + { + orderNo = @event.OrderNo, + data = new[] + { + new + { + // 推真实的发生地和发生时间（时间是计算后的） + location = @event.TrackPlace, + date = @event.TrackTime, + timeZone = @event.TrackTimeZone, + description = @event.TrackEnContentValue, + description_cn = @event.TrackContentValue, + code = @event.TrackContentCodeValue, + status = @event.TrackStatusValue, + extra = @event.ExpandFieldsValue + } + } + }; + + + var res = await _httpClientProxy.Service.ForwardWithSubscribeAsync(InterfaceRelayConst.PushTrackInterfaceCode, + @event.ServiceProviderCode, data); + + var isSuccess = res.Code == InterfaceRelayConst.SuccessCode; + // 写推送日志 + await _trackPushRecordsRepository.AddAsync(new TrackPushRecordIndex + { + IndexName = $"{GlobalConst.TrackPushRecordsIndex}-{DateTime.Now:yyyy.MM.dd}", + RequestId = res.RequestId, + OptionType = OptionType.新增, + TrackPlace = @event.TrackPlace, + TrackTime = @event.TrackTime, + TrackTimeZone = @event.TrackTimeZone, + IsSuccess = isSuccess, + CreateUser = @event.PushMan ?? "系统", + CreateTime = DateTime.Now + }); + + // 更新订单主表 + await _capPublisher.PublishAsync(GlobalConst.TrackPushAfterUpdateOrderSubscribe, + new TrackPushAfterUpdateOrderEvent + { + OrderId = @event.OrderId, + TrackContentId = @event.TrackContentId, + IsSuccess = isSuccess, + Message = res.Msg + }); + } + + private async Task PushUpdateAsync(TrackPushEvent @event) + { + var data = new + { + orderNo = @event.OrderNo, + data = new[] + { + new + { + // 推真实的发生地和发生时间 + location = @event.TrackPlace, + date = @event.TrackTime, + timeZone = @event.TrackTimeZone, + description = @event.TrackEnContentValue, + description_cn = @event.TrackContentValue, + code = @event.TrackContentCodeValue, + status = @event.TrackStatusValue, + extra = @event.ExpandFieldsValue + } + } + }; + + + await _httpClientProxy.Service.ForwardWithSubscribeAsync(InterfaceRelayConst.TrackUpdateInterfaceCode, + @event.ServiceProviderCode, data); + } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application/EventHandlers/TrackRefreshEventHandler.cs b/src/SJZY.Track.Application/EventHandlers/TrackRefreshEventHandler.cs index 52c005f2..d732258d 100644 --- a/src/SJZY.Track.Application/EventHandlers/TrackRefreshEventHandler.cs +++ b/src/SJZY.Track.Application/EventHandlers/TrackRefreshEventHandler.cs @@ -9,6 +9,7 @@ using SJZY.Track.Application.Contract.Dtos.TrackPull; using SJZY.Track.Application.Contract.Events; using SJZY.Track.Application.Contract.Services; using SJZY.Track.Domain.Aggregates.OrderAggregate; +using SJZY.Track.Domain.Consts; using SJZY.Track.Domain.Enums; using Volo.Abp.DependencyInjection; @@ -31,12 +32,10 @@ public class TrackRefreshEventHandler : ITransientDependency, ICapSubscribe [CapSubscribe(GlobalConst.TrackRefreshSubscribe)] public async Task ConsumerAsync(InterfaceRelayForwardReplayEvent @event) { - // tips：attach返回的是服务商id，必有 - var refreshDto = JsonConvert.DeserializeObject>(@event.RequestParams)?.FirstOrDefault(); - if (refreshDto is null) return; - var config = - await _trackPullCacheService.GetPullParamWithContentConfigAsync(refreshDto.SubSystemId, - refreshDto.ServiceProviderId); + var attach = JsonConvert.DeserializeObject(@event.Attach); + if (attach is null) return; + var config = await _trackPullCacheService.GetPullParamWithContentConfigAsync(attach.SubSystemId, + attach.ServiceProviderId); var data = JObject.Parse(@event.Data.ToString()!); var orderToken = data[config.ParamConfig.OrderPath]; @@ -44,12 +43,12 @@ public class TrackRefreshEventHandler : ITransientDependency, ICapSubscribe { foreach (var token in orderTokens) { - await HandleOrderAsync(token, config, refreshDto.OrderType); + await HandleOrderAsync(token, config, attach.OrderType); } } else if (orderToken is JObject) { - await HandleOrderAsync(orderToken, config, refreshDto.OrderType); + await HandleOrderAsync(orderToken, config, attach.OrderType); } } diff --git a/src/SJZY.Track.Application/EventHandlers/UpdateOrderTrackEventHandler.cs b/src/SJZY.Track.Application/EventHandlers/TrackUpsertAfterUpdateOrderEventHandler.cs similarity index 76% rename from src/SJZY.Track.Application/EventHandlers/UpdateOrderTrackEventHandler.cs rename to src/SJZY.Track.Application/EventHandlers/TrackUpsertAfterUpdateOrderEventHandler.cs index 7eb5811a..1ce9ae93 100644 --- a/src/SJZY.Track.Application/EventHandlers/UpdateOrderTrackEventHandler.cs +++ b/src/SJZY.Track.Application/EventHandlers/TrackUpsertAfterUpdateOrderEventHandler.cs @@ -1,21 +1,22 @@ using DotNetCore.CAP; using SJZY.Track.Application.Contract.Events; using SJZY.Track.Domain.Aggregates.OrderAggregate; +using SJZY.Track.Domain.Consts; using Volo.Abp.DependencyInjection; namespace SJZY.Track.Application.EventHandlers; -public class UpdateOrderTrackEventHandler : ITransientDependency, ICapSubscribe +public class TrackUpsertAfterUpdateOrderEventHandler : ITransientDependency, ICapSubscribe { private readonly IOrderRepository _orderRepository; - public UpdateOrderTrackEventHandler(IOrderRepository orderRepository) + public TrackUpsertAfterUpdateOrderEventHandler(IOrderRepository orderRepository) { _orderRepository = orderRepository; } - [CapSubscribe(GlobalConst.UpdateOrderTrackSubscribe)] - public async Task ConsumerAsync(UpdateOrderTrackEvent @event) + [CapSubscribe(GlobalConst.TrackUpsertAfterUpdateOrderSubscribe)] + public async Task ConsumerAsync(TrackUpsertAfterUpdateOrderEvent @event) { var order = await _orderRepository.GetFirstAsync(x => x.Id == @event.OrderId); if (order == default) return; @@ -37,14 +38,20 @@ public class UpdateOrderTrackEventHandler : ITransientDependency, ICapSubscribe // 删除引发的回退更新 if (order.LatestTrackTime != null && - order.LatestTrackTime.Value.Subtract(TimeSpan.FromHours(order.LatestTrackTimeZone ?? 0)) == - @event.TrackTime.Subtract(TimeSpan.FromHours(@event.TrackTimeZone))) return; + @event.TrackTime.Subtract(TimeSpan.FromHours(@event.TrackTimeZone)) == + order.LatestTrackTime.Value.Subtract(TimeSpan.FromHours(order.LatestTrackTimeZone ?? 0))) + { + return; + } } else // upsert引发的更新 { if (order.LatestTrackTime != null && - order.LatestTrackTime.Value.Subtract(TimeSpan.FromHours(order.LatestTrackTimeZone ?? 0)) > - @event.TrackTime.Subtract(TimeSpan.FromHours(@event.TrackTimeZone))) return; + @event.TrackTime.Subtract(TimeSpan.FromHours(@event.TrackTimeZone)) < + order.LatestTrackTime.Value.Subtract(TimeSpan.FromHours(order.LatestTrackTimeZone ?? 0))) + { + return; + } } order.IsCompleted = @event.IsCompleted; diff --git a/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs b/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs index 7c6f3159..a0733812 100644 --- a/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs +++ b/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs @@ -1,10 +1,12 @@ -using DotNetCore.CAP; +using System.Diagnostics; +using DotNetCore.CAP; using SJZY.Expand.ABP.Core.Logger; using SJZY.Expand.ABP.Core.PublicMethords; using SJZY.Track.Application.Contract.Events; using SJZY.Track.Application.Contract.Services; using SJZY.Track.Domain.Aggregates.OrderAggregate; using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate; +using SJZY.Track.Domain.Consts; using SJZY.Track.Domain.Queries; using SJZY.UserCenter.HttpApi.Services; using Volo.Abp.DependencyInjection; @@ -57,15 +59,52 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe @event.TrackCode = mapCode; } - await UpsertTrackAsync(@event); - } - - private async Task UpsertTrackAsync(TrackUpsertEvent @event) - { - // 不存在则新增轨迹，存在则更新 var track = await _trackDetailsRepository.GetFirstOrDefaultAsync(@event.OrderId, @event.TrackCode); - var orderIsCompleted = false; + // step1、upsert es轨迹 + await UpsertTrackAsync(track, @event); + Debug.Assert(track != null, nameof(track) + " != null"); + + // step2、触发轨迹推送事件（异步） + await HandleTrackPushAsync(@event, track); + + // step3、触发订单主表更新事件（异步） + await _capPublisher.PublishAsync(GlobalConst.TrackUpsertAfterUpdateOrderSubscribe, + new TrackUpsertAfterUpdateOrderEvent + { + OrderId = track.OrderId, + IsCompleted = track.IsCompleted, + TrackCode = track.TrackCode, + TrackContent = track.TrackContent, + TrackEnContent = track.TrackEnContent, + TrackPlace = track.TrackPlace, + TrackTime = track.TrackTime, + TrackTimeZone = track.TrackTimeZone + }); + + // step4、根据订单关联关系异步向下刷（异步） + var linkedOrders = await _orderRepository.GetLinkedOrdersAsync(@event.OrderId); + foreach (var linkedOrder in linkedOrders) + { + var nextEvent = @event.DeepCopy(); + nextEvent.OrderId = linkedOrder.OrderId; + nextEvent.OrderType = linkedOrder.OrderType; + nextEvent.OrderNo = linkedOrder.OrderNo; + nextEvent.SubSystemId = linkedOrder.SubSystemId; + nextEvent.LatestPushTrackContentId = linkedOrder.LatestPushTrackContentId; + nextEvent.CustomId = linkedOrder.CustomId; + nextEvent.UpSubSystemId = @event.SubSystemId; + await _capPublisher.PublishAsync(GlobalConst.TrackUpsertSubscribe, nextEvent); + } + } + + /// + /// 不存在则新增轨迹，存在则更新 + /// + /// + /// + private async Task UpsertTrackAsync(TrackDetailsIndex? track, TrackUpsertEvent @event) + { if (track == default) { //todo：可以优化 @@ -73,12 +112,10 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe var trackContent = await _provideQueries.MatchTrackContentAsync(@event.OrderId, @event.TrackCode); if (trackContent == default) { - //throw new BusinessException(message: $"订单：{@event.OrderNo} 所绑定的模板，没有一条内容可以匹配轨迹代码：{@event.TrackCode}"); + // 订单所绑定的模板，没有一条内容可以匹配发生的轨迹 return; } - orderIsCompleted = trackContent.IsCompleted; - track = new TrackDetailsIndex { IndexName = $"{GlobalConst.TrackIndex}-{DateTime.Now:yyyy.MM.dd}", @@ -89,7 +126,7 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe TrackCode = @event.TrackCode, TrackContent = trackContent.Content, TrackContentId = trackContent.Id, - IsCompleted = orderIsCompleted, + IsCompleted = trackContent.IsCompleted, TrackEnContent = trackContent.EnContent, TrackPlace = @event.TrackPlace, TrackTime = @event.TrackTime!.Value, @@ -108,44 +145,47 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe track.UpdateTime = DateTime.Now; } - // upsert es轨迹 await _trackDetailsRepository.UpsertAsync(track); + } - // 触发轨迹推送事件 - var content = await _trackPushCacheService.InferNextPushContentOrNullAsync( + /// + /// 处理轨迹自动推送 + /// + /// + /// + private async Task HandleTrackPushAsync(TrackUpsertEvent @event, TrackDetailsIndex track) + { + var config = await _trackPushCacheService.InferNextPushContentOrNullAsync( @event.SubSystemId, @event.CustomId, @event.LatestPushTrackContentId); - if (content != default && content.TrackContentId == track.TrackContentId && - content.OrderType == @event.OrderType) - { - //await PushTrack(content); - } - // 触发订单主表更新事件 - await _capPublisher.PublishAsync(GlobalConst.UpdateOrderTrackSubscribe, new UpdateOrderTrackEvent - { - OrderId = track.OrderId, - IsCompleted = orderIsCompleted, - TrackCode = track.TrackCode, - TrackContent = track.TrackContent, - TrackEnContent = track.TrackEnContent, - TrackPlace = track.TrackPlace, - TrackTime = track.TrackTime, - TrackTimeZone = track.TrackTimeZone - }); + if (config == null || !config.IsAutoPush) return; - // 根据订单关联关系异步向下刷 - var linkedOrders = await _orderRepository.GetLinkedOrdersAsync(@event.OrderId); - foreach (var linkedOrder in linkedOrders) + // 当前发生的轨迹就是要推送的 + if (config.TrackContentId == track.TrackContentId && config.OrderType == @event.OrderType) { - var nextEvent = @event.DeepCopy(); - nextEvent.OrderId = linkedOrder.OrderId; - nextEvent.OrderType = linkedOrder.OrderType; - nextEvent.OrderNo = linkedOrder.OrderNo; - nextEvent.SubSystemId = linkedOrder.SubSystemId; - nextEvent.LatestPushTrackContentId = linkedOrder.LatestPushTrackContentId; - nextEvent.CustomId = linkedOrder.CustomId; - nextEvent.UpSubSystemId = @event.SubSystemId; - await _capPublisher.PublishAsync(GlobalConst.TrackUpsertSubscribe, nextEvent); + var trackPushEvent = new TrackPushEvent + { + ServiceProviderCode = config.ServiceProviderCode, + OrderNo = track.OrderNo, + TrackContentId = config.TrackContentId, + TrackPlace = track.TrackPlace, + TrackTime = track.TrackTime.AddHours(config.TrackTimeZone ?? track.TrackTimeZone - track.TrackTimeZone), + TrackTimeZone = (float)(config.TrackTimeZone ?? track.TrackTimeZone), + TrackContentCodeValue = config.TrackContentCodeValue, + TrackContentValue = config.TrackContentValue, + TrackEnContentValue = config.TrackEnContentValue, + TrackStatusValue = config.TrackStatusValue, + ExpandFieldsValue = config.ExpandFieldsValue + }; + + // 推送更新 + if (!track.Id.IsNullOrWhiteSpace()) + { + trackPushEvent.OptionType = OptionType.修改; + if (!config.IsCanUpdate) return; + } + + await _capPublisher.PublishAsync(GlobalConst.TrackPushSubscribe, trackPushEvent); } } } \ No newline at end of file diff --git a/src/SJZY.Track.Application/Services/ProvideServices/OrderService.Link.cs b/src/SJZY.Track.Application/Services/ProvideServices/OrderService.Link.cs index 51f50f3b..88eb9530 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/OrderService.Link.cs +++ b/src/SJZY.Track.Application/Services/ProvideServices/OrderService.Link.cs @@ -2,6 +2,7 @@ using SJZY.Track.Application.Contract.Dtos.ProvideServices; using SJZY.Track.Application.Contract.Events; using SJZY.Track.Domain.Aggregates.OrderAggregate; +using SJZY.Track.Domain.Consts; using SJZY.Track.Domain.Queries; namespace SJZY.Track.Application.Services.ProvideServices; diff --git a/src/SJZY.Track.Application/Services/ProvideServices/TrackPullService.cs b/src/SJZY.Track.Application/Services/ProvideServices/TrackPullService.cs index 10f1d52a..f1f72e52 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/TrackPullService.cs +++ b/src/SJZY.Track.Application/Services/ProvideServices/TrackPullService.cs @@ -1,9 +1,11 @@ using Microsoft.AspNetCore.Authorization; +using Newtonsoft.Json; using SJZY.Expand.ABP.Core; using SJZY.InterfaceRelay.Application.Contracts; using SJZY.Track.Application.Contract.Dtos.ProvideServices; using SJZY.Track.Application.Contract.Dtos.TrackPull; using SJZY.Track.Application.Contract.Services; +using SJZY.Track.Domain.Consts; using SJZY.Track.Domain.Queries; using Volo.Abp.Http.Client.DynamicProxying; @@ -40,27 +42,27 @@ public class TrackPullService : ApplicationService // todo：罚时？ input.OrderNos = input.OrderNos.Where(x => !x.IsNullOrWhiteSpace()).Distinct().ToList(); // 单号去重、去空 - // 这里没有区分订单类型，就算的不同类型的单一起刷新了也无所谓 + // tips：这里没有区分订单类型，就算的不同类型的单一起刷新了也无所谓 var orders = await _provideQueries.FindOrderWithServiceProviderAsync(input.OrderNos); if (orders.Count == 0) { - throw new BusinessException(message: "一个拉取配置都不存在"); + // tips：可能是没有配置、或者所有单都刷完了、或者单不存在 + throw new BusinessException(message: "一个能更新的都没有"); } - foreach (var group in orders.GroupBy(x => x.ServiceProviderCode)) + foreach (var group in orders.GroupBy(x => + new TrackRefreshAttach(x.ServiceProviderId, x.ServiceProviderCode, x.SubSystemId, x.OrderType))) { - var data = group.Select(x => new TrackRefreshDto + var data = group.Select(x => new { - OrderType = x.OrderType, - OrderNo = x.OrderNo, - ServiceProviderId = x.ServiceProviderId, - SubSystemId = x.SubSystemId + x.OrderNo }).ToList(); // 批量获取轨迹 await _httpClientProxy.Service.BatchForwardThenPushToQueueAsync( - "A012", group.Key, data, GlobalConst.TrackRefreshSubscribe); + "A012", group.Key.ServiceProviderCode, data, + GlobalConst.TrackRefreshSubscribe, JsonConvert.SerializeObject(group.Key)); } return true; @@ -85,19 +87,19 @@ public class TrackPullService : ApplicationService var orders = await _provideQueries.FindOrderWithServiceProviderAsync(config.ServiceProviderId); - foreach (var group in orders.GroupBy(x => x.ServiceProviderCode)) + foreach (var group in orders.GroupBy(x => + new TrackRefreshAttach(x.ServiceProviderId, x.ServiceProviderCode, x.SubSystemId, + x.OrderType))) { - var data = group.Select(x => new TrackRefreshDto + var data = group.Select(x => new { - OrderType = x.OrderType, - OrderNo = x.OrderNo, - ServiceProviderId = x.ServiceProviderId, - SubSystemId = x.SubSystemId + x.OrderNo }).ToList(); // 批量获取轨迹 await _httpClientProxy.Service.BatchForwardThenPushToQueueAsync( - "A012", group.Key, data, GlobalConst.TrackRefreshSubscribe); + InterfaceRelayConst.GetTrackInterfaceCode, group.Key.ServiceProviderCode, data, + GlobalConst.TrackRefreshSubscribe, JsonConvert.SerializeObject(group.Key)); } await RedisHelper.Client.SetExAsync(redisKey, config.PullInterval * 60, 1); diff --git a/src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs b/src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs index 443bceb3..1ad3a61c 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs +++ b/src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs @@ -1,9 +1,11 @@ -using SJZY.InterfaceRelay.Application.Contracts; +using DotNetCore.CAP; using SJZY.Track.Application.Contract.Dtos.ProvideServices; +using SJZY.Track.Application.Contract.Events; using SJZY.Track.Application.Contract.Services; using SJZY.Track.Domain.Aggregates.OrderAggregate; using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate; -using Volo.Abp.Http.Client.DynamicProxying; +using SJZY.Track.Domain.Consts; +using SJZY.UserCenter.HttpApi.Services; namespace SJZY.Track.Application.Services.ProvideServices; @@ -17,16 +19,17 @@ public class TrackPushService : ApplicationService private readonly ITrackDetailsRepository _trackDetailsRepository; private readonly IOrderRepository _orderRepository; private readonly ITrackPushCacheService _pushCacheService; - private readonly IHttpClientProxy _httpClientProxy; + private readonly ICapPublisher _capPublisher; - public TrackPushService( - IHttpClientProxy httpClientProxy, ITrackPushCacheService pushCacheService, - ITrackDetailsRepository trackDetailsRepository, IOrderRepository orderRepository) + public TrackPushService(ITrackPushCacheService pushCacheService, + ITrackDetailsRepository trackDetailsRepository + , IOrderRepository orderRepository + , ICapPublisher capPublisher) { - _httpClientProxy = httpClientProxy; _pushCacheService = pushCacheService; _trackDetailsRepository = trackDetailsRepository; _orderRepository = orderRepository; + _capPublisher = capPublisher; } /// @@ -35,11 +38,10 @@ public class TrackPushService : ApplicationService /// /// [HttpPost("Track/Push")] - public async Task PushTrackAsync(PushTrackInput input) + public async Task PushTrackAsync(PushTrackInput input) { input.OrderNos = input.OrderNos.Where(x => !x.IsNullOrWhiteSpace()).Distinct().ToList(); // 单号去重、去空 - var orders = await _orderRepository.GetListAsync(x => x.OrderType == input.OrderType && input.OrderNos.Contains(x.OrderNo), x => new { @@ -53,6 +55,13 @@ public class TrackPushService : ApplicationService var tracks = await _trackDetailsRepository.GetListAsync(input.OrderType, input.OrderNos, input.TrackCode); + if (tracks.Count == 0) + { + throw new BusinessException(message: "一个能推的轨迹都不存在"); + } + + var res = 0; + foreach (var order in orders) { // 如果没有轨迹，就不需要推 @@ -64,30 +73,27 @@ public class TrackPushService : ApplicationService await _pushCacheService.GetPushContentConfigAsync(order.SubSystemId, order.CustomId, track.TrackContentId); - var data = new + var trackPushEvent = new TrackPushEvent { - order.OrderNo, - data = new[] - { - new - { - // 推真实的发生地和发生时间 - location = track.TrackPlace, - date = track.TrackTime.AddHours(config.TrackTimeZone ?? - track.TrackTimeZone - track.TrackTimeZone), - timeZone = config.TrackTimeZone ?? track.TrackTimeZone, - description = config.TrackEnContentValue, - description_cn = config.TrackContentValue, - code = config.TrackContentCodeValue, - status = config.TrackStatusValue, - extra = config.ExpandFieldsValue - } - } + ServiceProviderCode = config.ServiceProviderCode, + OrderNo = order.OrderNo, + TrackPlace = track.TrackPlace, + TrackTime = track.TrackTime.AddHours(config.TrackTimeZone ?? + track.TrackTimeZone - track.TrackTimeZone), + TrackTimeZone = (float)(config.TrackTimeZone ?? track.TrackTimeZone), + TrackContentCodeValue = config.TrackContentCodeValue, + TrackContentValue = config.TrackContentValue, + TrackEnContentValue = config.TrackEnContentValue, + TrackStatusValue = config.TrackStatusValue, + ExpandFieldsValue = config.ExpandFieldsValue, + PushMan = CurrentUserRequest.CurrentUser.Name, }; - await _httpClientProxy.Service.ForwardWithSubscribeAsync("A024", config.ServiceProviderCode, data); + await _capPublisher.PublishAsync(GlobalConst.TrackPushSubscribe, trackPushEvent); + + res++; } - return true; + return $"即将推送轨迹代码{input.TrackCode}给{res}个订单"; } } \ No newline at end of file diff --git a/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs b/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs index b9af7e6e..b45d9313 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs +++ b/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs @@ -4,6 +4,7 @@ using SJZY.Track.Application.Contract.Events; using SJZY.Track.Application.Contract.Services; using SJZY.Track.Domain.Aggregates.OrderAggregate; using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate; +using SJZY.Track.Domain.Consts; using SJZY.Track.Domain.Queries; namespace SJZY.Track.Application.Services.ProvideServices; @@ -41,7 +42,7 @@ public partial class TrackService : ApplicationService, ITrackService var order = await _orderRepository.GetFirstAsync(x => x.OrderType == input.OrderType && x.OrderNo == input.OrderNo, x => new { - x.Id, x.SubSystemId, x.LatestPushTrackContentId, x.CustomId + x.Id, x.SubSystemId, x.LatestPushTrackContentId, x.CustomId, x.IsCompleted }); if (order == default) { @@ -54,6 +55,7 @@ public partial class TrackService : ApplicationService, ITrackService @event.SubSystemId = order.SubSystemId; @event.LatestPushTrackContentId = order.LatestPushTrackContentId; @event.CustomId = order.CustomId; + @event.IsCompleted = order.IsCompleted; await _capPublisher.PublishAsync(GlobalConst.TrackUpsertSubscribe, @event); return true; } diff --git a/src/SJZY.Track.Application/Services/TrackPull/TrackPullCacheService.cs b/src/SJZY.Track.Application/Services/TrackPull/TrackPullCacheService.cs index b5418f24..c5c7f8fd 100644 --- a/src/SJZY.Track.Application/Services/TrackPull/TrackPullCacheService.cs +++ b/src/SJZY.Track.Application/Services/TrackPull/TrackPullCacheService.cs @@ -3,12 +3,12 @@ using SJZY.Expand.ABP.Core; using SJZY.Track.Application.Contract.Dtos.TrackPull; using SJZY.Track.Application.Contract.Services; using SJZY.Track.Domain.Aggregates.TrackPullAggregate; +using SJZY.Track.Domain.Consts; using SJZY.Track.Domain.Dtos.TrackPull; -using Volo.Abp.DependencyInjection; namespace SJZY.Track.Application.Services.TrackPull; -public class TrackPullCacheService : ApplicationService, ITrackPullCacheService, ITransientDependency +public class TrackPullCacheService : ApplicationService, ITrackPullCacheService { private readonly ITrackPullConfigRepository _trackPullConfigRepository; diff --git a/src/SJZY.Track.Application/Services/TrackPull/TrackPullService.cs b/src/SJZY.Track.Application/Services/TrackPull/TrackPullService.cs index daba134c..af00b7c6 100644 --- a/src/SJZY.Track.Application/Services/TrackPull/TrackPullService.cs +++ b/src/SJZY.Track.Application/Services/TrackPull/TrackPullService.cs @@ -9,7 +9,6 @@ using SJZY.Track.Domain.Aggregates.TrackPullAggregate; using SJZY.Track.Domain.Dtos.Common; using SJZY.Track.Domain.Dtos.TrackPull; using SqlSugar; -using Volo.Abp.DependencyInjection; namespace SJZY.Track.Application.Services.TrackPull; @@ -18,7 +17,7 @@ namespace SJZY.Track.Application.Services.TrackPull; /// [ApiExplorerSettings(GroupName = "轨迹拉取")] [Route("/Track/PullConfig")] -public class TrackPullService : ApplicationService, ITransientDependency +public class TrackPullService : ApplicationService { private readonly IStringLocalizer _stringLocalizer; private readonly ITrackPullConfigRepository _trackPullConfigRepository; @@ -100,52 +99,57 @@ public class TrackPullService : ApplicationService, ITransientDependency switch (input.Options) { case OptionTypeNoNull.新增: + { + var trackPullEntity = ObjectMapper.Map(input); + var trackPullParamsEntity = + ObjectMapper.Map(input); + + int id; + + using (var ts = TransactionScopeHelper.Create()) { - var trackPullEntity = ObjectMapper.Map(input); - var trackPullParamsEntity = ObjectMapper.Map(input); + id = await _trackPullConfigRepository.InsertReturnIdentityAsync(trackPullEntity); - int id = 0; + trackPullParamsEntity.PullOrPushConfigId = id; + await _trackPullConfigRepository.InsertParamsAsync(trackPullParamsEntity); - using (var ts = TransactionScopeHelper.Create()) - { - id = await _trackPullConfigRepository.InsertReturnIdentityAsync(trackPullEntity); - - trackPullParamsEntity.PullOrPushConfigId = id; - await _trackPullConfigRepository.InsertParamsAsync(trackPullParamsEntity); - - ts.Complete(); - } - - await _trackPullCacheService.SetPullConfigAsync(id); + ts.Complete(); } + + await _trackPullCacheService.SetPullConfigAsync(id); + } break; case OptionTypeNoNull.修改: + { + var oldTrackPullEntity = await _trackPullConfigRepository.GetFirstAsync(x => x.Id == input.Id) ?? + throw new BusinessException(message: _stringLocalizer["NotFindData"]); + + var oldTrackPullParamsEntity = + await _trackPullConfigRepository.GetParamsSingleAsync(x => + x.PullOrPushConfigId == input.Id && !x.IsPush); + + ObjectMapper.Map(input, oldTrackPullEntity); + ObjectMapper.Map(input, oldTrackPullParamsEntity); + + using (var ts = TransactionScopeHelper.Create()) { - var oldTrackPullEntity = await _trackPullConfigRepository.GetFirstAsync(x => x.Id == input.Id) ?? throw new BusinessException(message: _stringLocalizer["NotFindData"]); + await _trackPullConfigRepository.UpdateAsync(oldTrackPullEntity); + await _trackPullConfigRepository.UpdateParamsAsync(oldTrackPullParamsEntity); - var oldTrackPullParamsEntity = await _trackPullConfigRepository.GetParamsSingleAsync(x => x.PullOrPushConfigId == input.Id && !x.IsPush); - - ObjectMapper.Map(input, oldTrackPullEntity); - ObjectMapper.Map(input, oldTrackPullParamsEntity); - - using (var ts = TransactionScopeHelper.Create()) - { - await _trackPullConfigRepository.UpdateAsync(oldTrackPullEntity); - await _trackPullConfigRepository.UpdateParamsAsync(oldTrackPullParamsEntity); - - ts.Complete(); - } - - await _trackPullCacheService.SetPullConfigAsync(input.Id); + ts.Complete(); } + + await _trackPullCacheService.SetPullConfigAsync(input.Id); + } break; case OptionTypeNoNull.删除: using (var ts = TransactionScopeHelper.Create()) { await _trackPullConfigRepository.SoftDeleteAsync(x => x.Id == input.Id); - await _trackPullConfigRepository.SoftDeleteParamsAsync(x => x.PullOrPushConfigId == input.Id && !x.IsPush); + await _trackPullConfigRepository.SoftDeleteParamsAsync(x => + x.PullOrPushConfigId == input.Id && !x.IsPush); await _trackPullConfigRepository.SoftDeleteContentAsync(x => x.TrackPullConfigId == input.Id); ts.Complete(); @@ -171,21 +175,32 @@ public class TrackPullService : ApplicationService, ITransientDependency { if (input.Options != OptionTypeNoNull.删除) { - Expression> isContentAnyExp = x => x.TrackPullConfigId == input.TrackPullConfigId; + Expression> isContentAnyExp = x => + x.TrackPullConfigId == input.TrackPullConfigId; if (input.Options == OptionTypeNoNull.修改) isContentAnyExp = isContentAnyExp.And(x => x.Id != input.Id); - if (await _trackPullConfigRepository.IsContentAnyAsync(isContentAnyExp.And(x => x.TrackContentId == input.TrackContentId))) + if (await _trackPullConfigRepository.IsContentAnyAsync(isContentAnyExp.And(x => + x.TrackContentId == input.TrackContentId))) throw new BusinessException(message: _stringLocalizer["IsTrackPullContentAny"]); - else if (!input.TrackContentCodeValue.IsNullOrWhiteSpace() && await _trackPullConfigRepository.IsContentAnyAsync(isContentAnyExp.And(x => x.TrackContentCodeValue == input.TrackContentCodeValue))) + else if (!input.TrackContentCodeValue.IsNullOrWhiteSpace() && + await _trackPullConfigRepository.IsContentAnyAsync(isContentAnyExp.And(x => + x.TrackContentCodeValue == input.TrackContentCodeValue))) throw new BusinessException(message: _stringLocalizer["IsTrackPullContentCodeValueAny"]); - else if (!input.TrackStatusValue.IsNullOrWhiteSpace() && await _trackPullConfigRepository.IsContentAnyAsync(isContentAnyExp.And(x => x.TrackStatusValue == input.TrackStatusValue))) + else if (!input.TrackStatusValue.IsNullOrWhiteSpace() && + await _trackPullConfigRepository.IsContentAnyAsync(isContentAnyExp.And(x => + x.TrackStatusValue == input.TrackStatusValue))) throw new BusinessException(message: _stringLocalizer["IsTrackPullContentStatusValueAny"]); - else if (!input.TrackContentValue.IsNullOrWhiteSpace() && await _trackPullConfigRepository.IsContentAnyAsync(isContentAnyExp.And(x => x.TrackContentValue == input.TrackContentValue))) + else if (!input.TrackContentValue.IsNullOrWhiteSpace() && + await _trackPullConfigRepository.IsContentAnyAsync(isContentAnyExp.And(x => + x.TrackContentValue == input.TrackContentValue))) throw new BusinessException(message: _stringLocalizer["IsTrackPullContentValueAny"]); else if (!input.TrackKeywords.IsNullOrEmpty()) { Expression> trackKeywordExp = _ => false; - input.TrackKeywords!.ForEach(item => { trackKeywordExp = trackKeywordExp.Or(x => SqlFunc.SplitIn(x.TrackKeyword, item)); }); + input.TrackKeywords!.ForEach(item => + { + trackKeywordExp = trackKeywordExp.Or(x => SqlFunc.SplitIn(x.TrackKeyword, item)); + }); if (await _trackPullConfigRepository.IsContentAnyAsync(isContentAnyExp.And(trackKeywordExp))) throw new BusinessException(message: _stringLocalizer["IsTrackPullContentKeywordsAny"]); @@ -195,38 +210,38 @@ public class TrackPullService : ApplicationService, ITransientDependency switch (input.Options) { case OptionTypeNoNull.新增: - { - var entity = ObjectMapper.Map(input); + { + var entity = ObjectMapper.Map(input); - await _trackPullConfigRepository.InsertContentAsync(entity); - await _trackPullCacheService.SetPullConfigAsync(input.TrackPullConfigId); + await _trackPullConfigRepository.InsertContentAsync(entity); + await _trackPullCacheService.SetPullConfigAsync(input.TrackPullConfigId); - break; - } + break; + } case OptionTypeNoNull.修改: - { - var oldTrackPullContentEntity = await _trackPullConfigRepository.GetContentByIdAsync(input.Id!.Value) ?? - throw new BusinessException(message: _stringLocalizer["NotFindData"]); + { + var oldTrackPullContentEntity = await _trackPullConfigRepository.GetContentByIdAsync(input.Id!.Value) ?? + throw new BusinessException(message: _stringLocalizer["NotFindData"]); - ObjectMapper.Map(input, oldTrackPullContentEntity); + ObjectMapper.Map(input, oldTrackPullContentEntity); - await _trackPullConfigRepository.UpdateContentAsync(oldTrackPullContentEntity); - await _trackPullCacheService.SetPullConfigAsync(oldTrackPullContentEntity.TrackPullConfigId); + await _trackPullConfigRepository.UpdateContentAsync(oldTrackPullContentEntity); + await _trackPullCacheService.SetPullConfigAsync(oldTrackPullContentEntity.TrackPullConfigId); - break; - } + break; + } case OptionTypeNoNull.删除: - { - var oldTrackPullContentEntity = await _trackPullConfigRepository.GetContentByIdAsync(input.Id!.Value) ?? - throw new BusinessException(message: _stringLocalizer["NotFindData"]); + { + var oldTrackPullContentEntity = await _trackPullConfigRepository.GetContentByIdAsync(input.Id!.Value) ?? + throw new BusinessException(message: _stringLocalizer["NotFindData"]); - await _trackPullConfigRepository.SoftDeleteContentAsync(x => x.Id == input.Id); - await _trackPullCacheService.SetPullConfigAsync(oldTrackPullContentEntity.TrackPullConfigId); + await _trackPullConfigRepository.SoftDeleteContentAsync(x => x.Id == input.Id); + await _trackPullCacheService.SetPullConfigAsync(oldTrackPullContentEntity.TrackPullConfigId); - break; - } + break; + } default: throw new BusinessException(message: _stringLocalizer[SjzyBasicLocalization.Validation_IsInEnum, diff --git a/src/SJZY.Track.Application/Services/TrackPush/TrackPushCacheService.cs b/src/SJZY.Track.Application/Services/TrackPush/TrackPushCacheService.cs index 36e386b8..46155e2e 100644 --- a/src/SJZY.Track.Application/Services/TrackPush/TrackPushCacheService.cs +++ b/src/SJZY.Track.Application/Services/TrackPush/TrackPushCacheService.cs @@ -3,11 +3,11 @@ using SJZY.Expand.ABP.Core; using SJZY.Track.Application.Contract.Dtos.ProvideServices; using SJZY.Track.Application.Contract.Services; using SJZY.Track.Domain.Aggregates.TrackPushAggregate; -using Volo.Abp.DependencyInjection; +using SJZY.Track.Domain.Consts; namespace SJZY.Track.Application.Services.TrackPush; -public class TrackPushCacheService : ApplicationService, ITrackPushCacheService, ITransientDependency +public class TrackPushCacheService : ApplicationService, ITrackPushCacheService { private readonly ITrackPushConfigRepository _trackPushConfigRepository; diff --git a/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/TrackDetailsIndex.cs b/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/TrackDetailsIndex.cs index 964b4ee4..43721588 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/TrackDetailsIndex.cs +++ b/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/TrackDetailsIndex.cs @@ -1,5 +1,6 @@ using Nest; using SJZY.Expand.ElasticSearch; +using SJZY.Track.Domain.Consts; namespace SJZY.Track.Domain.Aggregates.TrackDetailsAggregate; @@ -11,11 +12,6 @@ public class TrackDetailsIndex : IdBaseIndex /// public int OrderId { get; set; } - /// - /// 服务商code - /// - public string? ServiceProviderCode { get; set; } - /// /// 订单号 /// @@ -36,11 +32,6 @@ public class TrackDetailsIndex : IdBaseIndex /// public string TrackStatus { get; set; } = null!; - /// - /// 原轨迹状态 - /// - public string? OriginTrackStatus { get; set; } - /// /// 轨迹内容代码 /// @@ -57,10 +48,15 @@ public class TrackDetailsIndex : IdBaseIndex public int TrackContentId { get; set; } /// - /// 是否意味着完成 + /// 这条轨迹是否意味着完成（删除回退需要用到） /// public bool IsCompleted { get; set; } + /// + /// 原轨迹状态 + /// + public string? OriginTrackStatus { get; set; } + /// /// 原轨迹内容 /// diff --git a/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/ITrackPushRecordsRepository.cs b/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/ITrackPushRecordsRepository.cs new file mode 100644 index 00000000..c7ae38be --- /dev/null +++ b/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/ITrackPushRecordsRepository.cs @@ -0,0 +1,11 @@ +namespace SJZY.Track.Domain.Aggregates.TrackPushAggregate; + +public interface ITrackPushRecordsRepository +{ + /// + /// 添加推送记录 + /// + /// + /// + Task AddAsync(TrackPushRecordIndex index); +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushRecordIndex.cs b/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushRecordIndex.cs new file mode 100644 index 00000000..66800c8a --- /dev/null +++ b/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushRecordIndex.cs @@ -0,0 +1,51 @@ +using Nest; +using SJZY.Expand.ABP.Common.Enums; +using SJZY.Expand.ElasticSearch; +using SJZY.Track.Domain.Consts; + +namespace SJZY.Track.Domain.Aggregates.TrackPushAggregate; + +[ElasticsearchType(RelationName = GlobalConst.TrackPushRecordsIndex)] +public class TrackPushRecordIndex : IdBaseIndex +{ + /// + /// 索引名称 + /// + public string IndexName { get; set; } = null!; + + /// + /// 接口通请求Id + /// + public Guid RequestId { get; set; } + + /// + /// 操作类型 + /// + public OptionType OptionType { get; set; } + + /// + /// 轨迹发生地 + /// + public string TrackPlace { get; set; } = null!; + + /// + /// 轨迹发生时间 + /// + public DateTime TrackTime { get; set; } + + /// + /// 轨迹发生时区 + /// + public float TrackTimeZone { get; set; } + + /// + /// 是否成功 + /// + public bool IsSuccess { get; set; } + + /// 创建人 + public string? CreateUser { get; set; } + + /// 创建时间 + public DateTime CreateTime { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Consts/GlobalConst.ES.cs b/src/SJZY.Track.Domain/Consts/GlobalConst.ES.cs new file mode 100644 index 00000000..3dd246c4 --- /dev/null +++ b/src/SJZY.Track.Domain/Consts/GlobalConst.ES.cs @@ -0,0 +1,14 @@ +namespace SJZY.Track.Domain.Consts; + +public partial class GlobalConst +{ + /// + /// 轨迹明细 es索引名称（模板） + /// + public const string TrackIndex = "sjzy_track_details"; + + /// + /// 轨迹推送记录 es索引名称（模板） + /// + public const string TrackPushRecordsIndex = "sjzy_track_push_records"; +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Consts/GlobalConst.MQ.cs b/src/SJZY.Track.Domain/Consts/GlobalConst.MQ.cs new file mode 100644 index 00000000..d9dfd74b --- /dev/null +++ b/src/SJZY.Track.Domain/Consts/GlobalConst.MQ.cs @@ -0,0 +1,39 @@ +namespace SJZY.Track.Domain.Consts; + +public partial class GlobalConst +{ + /// + /// 轨迹新增/更新 + /// + public const string TrackUpsertSubscribe = "SJZY.Track.TrackUpsert"; + + /// + /// 轨迹删除 + /// + public const string TrackDeleteSubscribe = "SJZY.Track.TrackDelete"; + + /// + /// 接口通批量轨迹刷新 + /// + public const string TrackRefreshSubscribe = "SJZY.Track.TrackRefresh"; + + /// + /// 轨迹推送 + /// + public const string TrackPushSubscribe = "SJZY.Track.TrackPush"; + + /// + /// 轨迹新增/更新后触发更新订单主表 + /// + public const string TrackUpsertAfterUpdateOrderSubscribe = "SJZY.Track.TrackUpsertAfterUpdateOrder"; + + /// + /// 轨迹推送后触发更新订单主表 + /// + public const string TrackPushAfterUpdateOrderSubscribe = "SJZY.Traack.TrackPushAfterUpdateOrder"; + + /// + /// 关联订单后补轨迹 + /// + public const string OrderLinkAfterFillTrack = "SJZY.Track.OrderLinkAfterFillTrack"; +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Consts/GlobalConst.Redis.cs b/src/SJZY.Track.Domain/Consts/GlobalConst.Redis.cs new file mode 100644 index 00000000..e2ca18ae --- /dev/null +++ b/src/SJZY.Track.Domain/Consts/GlobalConst.Redis.cs @@ -0,0 +1,24 @@ +namespace SJZY.Track.Domain.Consts; + +public partial class GlobalConst +{ + /// + /// 轨迹要推送的客户redis key前缀 + /// + public const string TrackPushKeyPrefix = "TrackPush"; + + /// + /// 轨迹推送内容配置redis key前缀 + /// + public const string TrackPushContentKeyPrefix = "TrackPushContent"; + + /// + /// 轨迹拉取配置信息redis key前缀 + /// + public const string TrackPullKeyPrefix = "TrackPull"; + + /// + /// 轨迹拉取配置信息redis key前缀 + /// + public const string TrackPullContentKeyPrefix = "TrackPullContent"; +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Consts/InterfaceRelayConst.cs b/src/SJZY.Track.Domain/Consts/InterfaceRelayConst.cs new file mode 100644 index 00000000..24743a5b --- /dev/null +++ b/src/SJZY.Track.Domain/Consts/InterfaceRelayConst.cs @@ -0,0 +1,27 @@ +namespace SJZY.Track.Domain.Consts; + +/// +/// 接口通常量 +/// +public class InterfaceRelayConst +{ + /// + /// 接口通成功代码 + /// + public const string SuccessCode = "200"; + + /// + /// 获取轨迹接口代码 + /// + public const string GetTrackInterfaceCode = "A012"; + + /// + /// 推送轨迹接口代码 + /// + public const string PushTrackInterfaceCode = "A024"; + + /// + /// 更新轨迹接口代码 + /// + public const string TrackUpdateInterfaceCode = "A040"; +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Dtos/Order/LinkedOrderVO.cs b/src/SJZY.Track.Domain/Dtos/Order/LinkedOrderVO.cs index 8cc9fbb2..2e0ffbed 100644 --- a/src/SJZY.Track.Domain/Dtos/Order/LinkedOrderVO.cs +++ b/src/SJZY.Track.Domain/Dtos/Order/LinkedOrderVO.cs @@ -31,4 +31,9 @@ public class LinkedOrderVO /// 客户id /// public int CustomId { get; set; } + + /// + /// 订单是否完成 + /// + public bool IsCompleted { get; set; } } \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Enums/TrackProblemType.cs b/src/SJZY.Track.Domain/Enums/TrackPushProblemType.cs similarity index 64% rename from src/SJZY.Track.Domain/Enums/TrackProblemType.cs rename to src/SJZY.Track.Domain/Enums/TrackPushProblemType.cs index 4abcc47e..93bbdbcb 100644 --- a/src/SJZY.Track.Domain/Enums/TrackProblemType.cs +++ b/src/SJZY.Track.Domain/Enums/TrackPushProblemType.cs @@ -1,8 +1,13 @@ namespace SJZY.Track.Domain.Enums; [Flags] -public enum TrackProblemType +public enum TrackPushProblemType { + /// + /// 没问题 + /// + None = 0, + /// /// 异常 /// diff --git a/src/SJZY.Track.Domain/GlobalConst.cs b/src/SJZY.Track.Domain/GlobalConst.cs deleted file mode 100644 index 528115ea..00000000 --- a/src/SJZY.Track.Domain/GlobalConst.cs +++ /dev/null @@ -1,54 +0,0 @@ -namespace SJZY.Track.Domain; - -public class GlobalConst -{ - /// - /// 轨迹明细 es索引名称 - /// - public const string TrackIndex = "sjzy_track_details"; - - /// - /// 轨迹新增/更新 mq订阅名称 - /// - public const string TrackUpsertSubscribe = "SJZY.Track.TrackUpsert"; - - /// - /// 轨迹删除 mq订阅名称 - /// - public const string TrackDeleteSubscribe = "SJZY.Track.TrackDelete"; - - /// - /// 接口通批量轨迹刷新 mq订阅名称 - /// - public const string TrackRefreshSubscribe = "SJZY.Track.TrackRefresh"; - - /// - /// 轨迹新增/更新后触发更新订单轨迹 mq订阅名称 - /// - public const string UpdateOrderTrackSubscribe = "SJZY.Track.UpdateOrderTrack"; - - /// - /// 关联订单后补轨迹 mq订阅名称 - /// - public const string OrderLinkAfterFillTrack = "SJZY.Track.OrderLinkAfterFillTrack"; - - /// - /// 轨迹要推送的客户redis key前缀 - /// - public const string TrackPushKeyPrefix = "TrackPush"; - - /// - /// 轨迹推送内容配置redis key前缀 - /// - public const string TrackPushContentKeyPrefix = "TrackPushContent"; - - /// - /// 轨迹拉取配置信息redis key前缀 - /// - public const string TrackPullKeyPrefix = "TrackPull"; - - /// - /// 轨迹拉取配置信息redis key前缀 - /// - public const string TrackPullContentKeyPrefix = "TrackPullContent"; -} \ No newline at end of file diff --git a/src/SJZY.Track.Repository/Queries/ProvideQueries.cs b/src/SJZY.Track.Repository/Queries/ProvideQueries.cs index 8058689e..5bf07b06 100644 --- a/src/SJZY.Track.Repository/Queries/ProvideQueries.cs +++ b/src/SJZY.Track.Repository/Queries/ProvideQueries.cs @@ -113,7 +113,7 @@ public class ProvideQueries : ISugarRepository, IProvideQueries, return await Context.Queryable() .LeftJoin((a, b) => a.Id == b.OrderId) .LeftJoin((a, b, c) => b.ServiceProviderId == c.Id) - .Where(a => orderNos.Contains(a.OrderNo)) + .Where(a => !a.IsCompleted && orderNos.Contains(a.OrderNo)) .Select((a, b, c) => new OrderWithServiceProviderVO { OrderNo = a.OrderNo, diff --git a/src/SJZY.Track.Repository/Repositories/OrderRepository.cs b/src/SJZY.Track.Repository/Repositories/OrderRepository.cs index 633db8c2..26a8ed2b 100644 --- a/src/SJZY.Track.Repository/Repositories/OrderRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/OrderRepository.cs @@ -67,7 +67,8 @@ public class OrderRepository : BasicRepository, IOrderRepository, I OrderNo = b.OrderNo, SubSystemId = b.SubSystemId, LatestPushTrackContentId = b.LatestPushTrackContentId, - CustomId = b.CustomId + CustomId = b.CustomId, + IsCompleted = b.IsCompleted }) .ToListAsync(); } diff --git a/src/SJZY.Track.Repository/Repositories/TrackPushRecordsRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackPushRecordsRepository.cs new file mode 100644 index 00000000..31adf93d --- /dev/null +++ b/src/SJZY.Track.Repository/Repositories/TrackPushRecordsRepository.cs @@ -0,0 +1,28 @@ +using SJZY.Expand.ABP.Core.Logger; +using SJZY.Expand.ElasticSearch.Services; +using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate; +using SJZY.Track.Domain.Aggregates.TrackPushAggregate; + +namespace SJZY.Track.Repository.Repositories; + +public class TrackPushRecordsRepository : ElasticSearchContextAbstract, ITrackPushRecordsRepository, + ITransientDependency +{ + public TrackPushRecordsRepository(ConnectionFactory connectionFactory) : base(connectionFactory) + { + } + + public async Task AddAsync(TrackPushRecordIndex index) + { + // 按天写入es + var r = await Context.IndexAsync(index, request => request + .Index(index.IndexName) + //.Refresh(Refresh.True) // 可选：立即刷新索引使更改立即可见 + ); + + if (!r.IsValid) + { + LogHelper.Error($"轨迹推送记录写入es失败，原因：{r.DebugInformation}。"); + } + } +} \ No newline at end of file From 80e6cc0c53f47651389314feb1a9532c4c60a803 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=86=9B?= <2357729423@qq.com> Date: Mon, 18 Mar 2024 14:39:09 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=88=9D=E6=AD=A5=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E8=BD=A8=E8=BF=B9=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Events/TrackPushAfterUpdateOrderEvent.cs | 9 ++- .../Events/TrackPushEvent.cs | 4 +- .../TrackPushAfterUpdateOrderEventHandler.cs | 28 ++++++-- .../EventHandlers/TrackPushEventHandler.cs | 69 +++++++++++-------- .../ProvideServices/TrackPullService.cs | 2 +- .../ProvideServices/TrackPushService.cs | 22 +++++- .../Aggregates/OrderAggregate/OrderEntity.cs | 10 ++- .../TrackPushRecordIndex.cs | 13 +++- .../Dtos/Order/GetPageTrackOrderInputVO.cs | 14 ++-- .../Queries/TrackOrderQueries.cs | 9 --- 10 files changed, 114 insertions(+), 66 deletions(-) diff --git a/src/SJZY.Track.Application.Contract/Events/TrackPushAfterUpdateOrderEvent.cs b/src/SJZY.Track.Application.Contract/Events/TrackPushAfterUpdateOrderEvent.cs index b81b52cc..f57fad41 100644 --- a/src/SJZY.Track.Application.Contract/Events/TrackPushAfterUpdateOrderEvent.cs +++ b/src/SJZY.Track.Application.Contract/Events/TrackPushAfterUpdateOrderEvent.cs @@ -2,6 +2,11 @@ public class TrackPushAfterUpdateOrderEvent { + /// + /// 操作类型 + /// + public OptionType OptionType { get; set; } = OptionType.新增; + /// /// 订单Id /// @@ -13,12 +18,12 @@ public class TrackPushAfterUpdateOrderEvent public int TrackContentId { get; set; } /// - /// 是否成功 + /// 问题类型 /// public bool IsSuccess { get; set; } /// - /// 最新描述 + /// 问题描述 /// public string? Message { get; set; } } \ No newline at end of file diff --git a/src/SJZY.Track.Application.Contract/Events/TrackPushEvent.cs b/src/SJZY.Track.Application.Contract/Events/TrackPushEvent.cs index c7277eb2..b74281a9 100644 --- a/src/SJZY.Track.Application.Contract/Events/TrackPushEvent.cs +++ b/src/SJZY.Track.Application.Contract/Events/TrackPushEvent.cs @@ -68,7 +68,7 @@ public class TrackPushEvent public string? ExpandFieldsValue { get; set; } /// - /// 推送人 + /// 操作人 /// - public string? PushMan { get; set; } + public string? OperationMan { get; set; } } \ No newline at end of file diff --git a/src/SJZY.Track.Application/EventHandlers/TrackPushAfterUpdateOrderEventHandler.cs b/src/SJZY.Track.Application/EventHandlers/TrackPushAfterUpdateOrderEventHandler.cs index a1953f49..a514639e 100644 --- a/src/SJZY.Track.Application/EventHandlers/TrackPushAfterUpdateOrderEventHandler.cs +++ b/src/SJZY.Track.Application/EventHandlers/TrackPushAfterUpdateOrderEventHandler.cs @@ -2,6 +2,7 @@ using SJZY.Track.Application.Contract.Events; using SJZY.Track.Domain.Aggregates.OrderAggregate; using SJZY.Track.Domain.Consts; +using SJZY.Track.Domain.Enums; using Volo.Abp.DependencyInjection; namespace SJZY.Track.Application.EventHandlers; @@ -21,16 +22,29 @@ public class TrackPushAfterUpdateOrderEventHandler : ITransientDependency, ICapS var order = await _orderRepository.GetFirstAsync(x => x.Id == @event.OrderId); if (order == default) return; - // 异常：最近一条推送是失败 - // 预警：添加一条推送距离现在超过12h - // if (!@event.IsSuccess) - // { - // order.QuestionType = TrackPushProblemType.Error; - // } + /* + * 异常：最近一条推送是失败 + */ + if (!@event.IsSuccess) + { + order.QuestionType = (int)TrackPushProblemType.Error; + order.ProblemDescription = @event.Message; + } + else + { + order.QuestionType = (int)TrackPushProblemType.None; + if (@event.OptionType == OptionType.新增) + { + // tips：只有新增会影响推送进度？ + order.LatestPushTrackContentId = @event.TrackContentId; + order.LatestPushTime = DateTime.Now; + } + } + await _orderRepository.UpdateColumnAsync(order, x => new { - x.LatestPushTrackContentId, x.QuestionType + x.LatestPushTrackContentId, x.QuestionType, x.ProblemDescription, x.LatestPushTime }); } } \ No newline at end of file diff --git a/src/SJZY.Track.Application/EventHandlers/TrackPushEventHandler.cs b/src/SJZY.Track.Application/EventHandlers/TrackPushEventHandler.cs index b2b977a8..5aa94802 100644 --- a/src/SJZY.Track.Application/EventHandlers/TrackPushEventHandler.cs +++ b/src/SJZY.Track.Application/EventHandlers/TrackPushEventHandler.cs @@ -25,24 +25,54 @@ public class TrackPushEventHandler : ITransientDependency, ICapSubscribe [CapSubscribe(GlobalConst.TrackPushSubscribe)] public async Task ConsumerAsync(TrackPushEvent @event) { + InterfaceRelayUnifyResultDto res = null!; switch (@event.OptionType) { case OptionType.无: - break; + return; case OptionType.新增: - await PushAddAsync(@event); + res = await PushAddAsync(@event); break; case OptionType.删除: break; case OptionType.修改: - await PushUpdateAsync(@event); + res = await PushUpdateAsync(@event); break; default: throw new ArgumentOutOfRangeException(); } + + var isSuccess = res.Code == InterfaceRelayConst.SuccessCode; + + // 写推送日志 + await _trackPushRecordsRepository.AddAsync(new TrackPushRecordIndex + { + IndexName = $"{GlobalConst.TrackPushRecordsIndex}-{DateTime.Now:yyyy.MM.dd}", + RequestId = res.RequestId, + Message = res.Msg, + OptionType = @event.OptionType.ToString(), + TrackPlace = @event.TrackPlace, + TrackTime = @event.TrackTime, + TrackTimeZone = @event.TrackTimeZone, + IsSuccess = isSuccess, + IsAuto = @event.OperationMan == null, + CreateUser = @event.OperationMan ?? "系统", + CreateTime = DateTime.Now + }); + + // 更新订单主表（异步） + await _capPublisher.PublishAsync(GlobalConst.TrackPushAfterUpdateOrderSubscribe, + new TrackPushAfterUpdateOrderEvent + { + OptionType = @event.OptionType, + OrderId = @event.OrderId, + TrackContentId = @event.TrackContentId, + IsSuccess = isSuccess, + Message = res.Msg + }); } - private async Task PushAddAsync(TrackPushEvent @event) + private async Task PushAddAsync(TrackPushEvent @event) { var data = new { @@ -68,33 +98,10 @@ public class TrackPushEventHandler : ITransientDependency, ICapSubscribe var res = await _httpClientProxy.Service.ForwardWithSubscribeAsync(InterfaceRelayConst.PushTrackInterfaceCode, @event.ServiceProviderCode, data); - var isSuccess = res.Code == InterfaceRelayConst.SuccessCode; - // 写推送日志 - await _trackPushRecordsRepository.AddAsync(new TrackPushRecordIndex - { - IndexName = $"{GlobalConst.TrackPushRecordsIndex}-{DateTime.Now:yyyy.MM.dd}", - RequestId = res.RequestId, - OptionType = OptionType.新增, - TrackPlace = @event.TrackPlace, - TrackTime = @event.TrackTime, - TrackTimeZone = @event.TrackTimeZone, - IsSuccess = isSuccess, - CreateUser = @event.PushMan ?? "系统", - CreateTime = DateTime.Now - }); - - // 更新订单主表 - await _capPublisher.PublishAsync(GlobalConst.TrackPushAfterUpdateOrderSubscribe, - new TrackPushAfterUpdateOrderEvent - { - OrderId = @event.OrderId, - TrackContentId = @event.TrackContentId, - IsSuccess = isSuccess, - Message = res.Msg - }); + return res; } - private async Task PushUpdateAsync(TrackPushEvent @event) + private async Task PushUpdateAsync(TrackPushEvent @event) { var data = new { @@ -117,7 +124,9 @@ public class TrackPushEventHandler : ITransientDependency, ICapSubscribe }; - await _httpClientProxy.Service.ForwardWithSubscribeAsync(InterfaceRelayConst.TrackUpdateInterfaceCode, + var res = await _httpClientProxy.Service.ForwardWithSubscribeAsync(InterfaceRelayConst.TrackUpdateInterfaceCode, @event.ServiceProviderCode, data); + + return res; } } \ No newline at end of file diff --git a/src/SJZY.Track.Application/Services/ProvideServices/TrackPullService.cs b/src/SJZY.Track.Application/Services/ProvideServices/TrackPullService.cs index f1f72e52..de894ef4 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/TrackPullService.cs +++ b/src/SJZY.Track.Application/Services/ProvideServices/TrackPullService.cs @@ -74,7 +74,7 @@ public class TrackPullService : ApplicationService /// [AllowAnonymous] [HttpPost("Track/RefreshForTask")] - public async Task RefreshTrackAsync() + public async Task RefreshForTaskAsync() { var configs = await _trackPullCacheService.GetAllPullConfigsAsync(); foreach (var config in configs) diff --git a/src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs b/src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs index 1ad3a61c..9c24046b 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs +++ b/src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs @@ -5,6 +5,7 @@ using SJZY.Track.Application.Contract.Services; using SJZY.Track.Domain.Aggregates.OrderAggregate; using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate; using SJZY.Track.Domain.Consts; +using SJZY.Track.Domain.Enums; using SJZY.UserCenter.HttpApi.Services; namespace SJZY.Track.Application.Services.ProvideServices; @@ -86,7 +87,7 @@ public class TrackPushService : ApplicationService TrackEnContentValue = config.TrackEnContentValue, TrackStatusValue = config.TrackStatusValue, ExpandFieldsValue = config.ExpandFieldsValue, - PushMan = CurrentUserRequest.CurrentUser.Name, + OperationMan = CurrentUserRequest.CurrentUser.Name, }; await _capPublisher.PublishAsync(GlobalConst.TrackPushSubscribe, trackPushEvent); @@ -96,4 +97,23 @@ public class TrackPushService : ApplicationService return $"即将推送轨迹代码{input.TrackCode}给{res}个订单"; } + + + /// + /// 定时任务推送预警（》12小时没有推送的） + /// + /// + [HttpPost("Track/PushWarnForTask")] + public async Task PushWarnForTaskAsync() + { + var time = DateTime.Now.Subtract(TimeSpan.FromHours(12)); + var orders = await _orderRepository.GetListAsync(x => + !x.IsCompleted && x.QuestionType == 0 && x.LatestPushTime < time); + + orders.ForEach(x => { x.QuestionType = (int)TrackPushProblemType.Warn; }); + + await _orderRepository.UpdateRangeAsync(orders, x => new { x.QuestionType }); + + return $"成功将{orders.Select(x => x.OrderNo).JoinAsString(",")}置为预警单"; + } } \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderEntity.cs b/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderEntity.cs index 3defe94f..2553cb31 100644 --- a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderEntity.cs +++ b/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderEntity.cs @@ -48,6 +48,12 @@ public class OrderEntity : IFullAuditedBasicEntitys, IAggregateRoot [SugarColumn(ColumnName = "LatestPushTrackContentId")] public int? LatestPushTrackContentId { get; set; } + /// + /// 最新推送时间（异步维护） + /// + [SugarColumn(ColumnName = "LatestPushTime")] + public DateTime? LatestPushTime { get; set; } + /// /// 最新轨迹内容（异步维护） /// @@ -115,10 +121,10 @@ public class OrderEntity : IFullAuditedBasicEntitys, IAggregateRoot public int QuestionType { get; set; } /// - /// 问题描述（主数据枚举TrackProblemDescription） + /// 问题描述 /// [SugarColumn(ColumnName = "ProblemDescription")] - public int ProblemDescription { get; set; } + public string? ProblemDescription { get; set; } /// /// 起运港口 diff --git a/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushRecordIndex.cs b/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushRecordIndex.cs index 66800c8a..ef9dfb74 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushRecordIndex.cs +++ b/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushRecordIndex.cs @@ -1,5 +1,4 @@ using Nest; -using SJZY.Expand.ABP.Common.Enums; using SJZY.Expand.ElasticSearch; using SJZY.Track.Domain.Consts; @@ -18,10 +17,20 @@ public class TrackPushRecordIndex : IdBaseIndex /// public Guid RequestId { get; set; } + /// + /// 信息 + /// + public string Message { get; set; } = null!; + /// /// 操作类型 /// - public OptionType OptionType { get; set; } + public string OptionType { get; set; } = null!; + + /// + /// 是否自动推送 + /// + public bool IsAuto { get; set; } /// /// 轨迹发生地 diff --git a/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs b/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs index c6b966e6..3dd85154 100644 --- a/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs +++ b/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace SJZY.Track.Domain.Dtos.Order +namespace SJZY.Track.Domain.Dtos.Order { public class GetPageTrackOrderInputVO : PageInfoInput { @@ -97,7 +91,7 @@ namespace SJZY.Track.Domain.Dtos.Order /// /// 客户id /// - public int CustomerId { get; set; } + public int CustomerId { get; set; } ///// ///// 订单明细（json） @@ -162,11 +156,11 @@ namespace SJZY.Track.Domain.Dtos.Order /// /// 问题描述（主数据枚举TrackProblemDescription） /// - public int ProblemDescription { get; set; } + public string? ProblemDescription { get; set; } /// /// 问题描述名称 /// public string? ProblemDescriptionName { get; set; } } -} +} \ No newline at end of file diff --git a/src/SJZY.Track.Repository/Queries/TrackOrderQueries.cs b/src/SJZY.Track.Repository/Queries/TrackOrderQueries.cs index 73a566d0..108026b9 100644 --- a/src/SJZY.Track.Repository/Queries/TrackOrderQueries.cs +++ b/src/SJZY.Track.Repository/Queries/TrackOrderQueries.cs @@ -73,15 +73,6 @@ public class TrackOrderQueries : ISugarRepository, ITrackOrderQueries, QuestionTypeName = SqlFunc.IF(a.QuestionType == 1).Return("异常").ElseIF(a.QuestionType == 2).Return("预警") .End(""), ProblemDescription = a.ProblemDescription, - ProblemDescriptionName = SqlFunc.IF(a.ProblemDescription == 1).Return("推送异常") - .ElseIF(a.ProblemDescription == 2).Return("推送预警").End(""), - //TrackTemplateNames = SqlFunc.Subqueryable() - // .LeftJoin((aa, bb) => aa.TrackTemplateId == bb.Id) - // .Where((aa, bb) => a.Id == aa.OrderId).SelectStringJoin((aa, bb) => bb.Name, ","), - - //TrackTemplateIds = SqlFunc.Subqueryable() - // .LeftJoin((aa, bb) => aa.TrackTemplateId == bb.Id) - // .Where((aa, bb) => a.Id == aa.OrderId).SelectStringJoin((aa, bb) => bb.Id, ","), NewestTrackContent = a.LatestTrackContent, NewestTrackEnContent = a.LatestTrackEnContent, NewestTrackPlace = a.LatestTrackPlace, From f189cb1a632fcc0eb0069a74d465a90acd8b258c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=86=9B?= <2357729423@qq.com> Date: Mon, 18 Mar 2024 15:40:50 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Dtos/TrackOrder/GetTrackCounterOutput.cs | 19 ++++++ .../TrackPushAfterUpdateOrderEventHandler.cs | 4 +- .../ProvideServices/TrackPushService.cs | 2 +- .../Services/TrackOrders/TrackOrderService.cs | 62 +++++++++++++------ .../Dtos/Order/GetPageTrackOrderInputVO.cs | 30 --------- .../Dtos/Order/GetTrackCounterVO.cs | 14 +++++ src/SJZY.Track.Domain/Enums/OrderType.cs | 6 ++ ...PushProblemType.cs => TrackProblemType.cs} | 2 +- .../Queries/ITrackOrderQueries.cs | 6 ++ .../Queries/TrackOrderQueries.cs | 21 ++++--- 10 files changed, 104 insertions(+), 62 deletions(-) create mode 100644 src/SJZY.Track.Application.Contract/Dtos/TrackOrder/GetTrackCounterOutput.cs create mode 100644 src/SJZY.Track.Domain/Dtos/Order/GetTrackCounterVO.cs create mode 100644 src/SJZY.Track.Domain/Enums/OrderType.cs rename src/SJZY.Track.Domain/Enums/{TrackPushProblemType.cs => TrackProblemType.cs} (88%) diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackOrder/GetTrackCounterOutput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackOrder/GetTrackCounterOutput.cs new file mode 100644 index 00000000..e330fabb --- /dev/null +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackOrder/GetTrackCounterOutput.cs @@ -0,0 +1,19 @@ +namespace SJZY.Track.Application.Contract.Dtos.TrackOrder; + +public class GetTrackCounterOutput +{ + /// + /// 总条数 + /// + public int TotalCount { get; set; } + + /// + /// 异常数 + /// + public int ErrorCount { get; set; } + + /// + /// 预警数 + /// + public int WarnCount { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Application/EventHandlers/TrackPushAfterUpdateOrderEventHandler.cs b/src/SJZY.Track.Application/EventHandlers/TrackPushAfterUpdateOrderEventHandler.cs index a514639e..268db6c1 100644 --- a/src/SJZY.Track.Application/EventHandlers/TrackPushAfterUpdateOrderEventHandler.cs +++ b/src/SJZY.Track.Application/EventHandlers/TrackPushAfterUpdateOrderEventHandler.cs @@ -27,12 +27,12 @@ public class TrackPushAfterUpdateOrderEventHandler : ITransientDependency, ICapS */ if (!@event.IsSuccess) { - order.QuestionType = (int)TrackPushProblemType.Error; + order.QuestionType = (int)TrackProblemType.Error; order.ProblemDescription = @event.Message; } else { - order.QuestionType = (int)TrackPushProblemType.None; + order.QuestionType = (int)TrackProblemType.None; if (@event.OptionType == OptionType.新增) { // tips：只有新增会影响推送进度？ diff --git a/src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs b/src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs index 9c24046b..6ce154dd 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs +++ b/src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs @@ -110,7 +110,7 @@ public class TrackPushService : ApplicationService var orders = await _orderRepository.GetListAsync(x => !x.IsCompleted && x.QuestionType == 0 && x.LatestPushTime < time); - orders.ForEach(x => { x.QuestionType = (int)TrackPushProblemType.Warn; }); + orders.ForEach(x => { x.QuestionType = (int)TrackProblemType.Warn; }); await _orderRepository.UpdateRangeAsync(orders, x => new { x.QuestionType }); diff --git a/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs b/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs index e799aeea..029d5523 100644 --- a/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs +++ b/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs @@ -1,8 +1,11 @@ -using SJZY.Track.Application.Contract.Dtos.ProvideServices; +using System.Diagnostics; +using SJZY.Track.Application.Contract.Dtos.ProvideServices; +using SJZY.Track.Application.Contract.Dtos.TrackOrder; using SJZY.Track.Domain.Aggregates.TrackContentAggregate; using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate; using SJZY.Track.Domain.Dtos.Order; using SJZY.Track.Domain.Dtos.TrackTemplate; +using SJZY.Track.Domain.Enums; using SJZY.Track.Domain.Queries; namespace SJZY.Track.Application.Services.TrackOrders; @@ -42,25 +45,32 @@ public class TrackOrderService : ApplicationService var list = ObjectMapper.Map, List>(trackDetails); var trackCodes = list.Where(a => !a.Code.IsNullOrWhiteSpace()).Select(a => a.Code).Distinct().ToList(); - var trackContents = await _trackContentRepository.GetTrackContentAttributeValue(new GetTemplateContentAttributeValueInputVO - { - SubSystemId = input.SubSystemId, - TrackTemplateIds = input.TrackTemplateIds, - TrackCodes = trackCodes - }); + var trackContents = await _trackContentRepository.GetTrackContentAttributeValue( + new GetTemplateContentAttributeValueInputVO + { + SubSystemId = input.SubSystemId, + TrackTemplateIds = input.TrackTemplateIds, + TrackCodes = trackCodes + }); + Debug.Assert(input.TrackTemplateIds != null, "input.TrackTemplateIds != null"); input.TrackTemplateIds = input.TrackTemplateIds.Where(a => a > 0).ToList(); int id = 1; list.ForEach(a => { a.Id = id++; - var trackContentsOfTemplates = trackContents.Where(b => b.SubSystemId == input.SubSystemId && b.TrackCode == a.Code - && input.TrackTemplateIds.Contains(b.TrackTemplateId)); - GetTemplateContentAttributeValueVO trackContent = null; - var insertData = input.TrackTemplateIds.Intersect(trackContentsOfTemplates.Select(aa => aa.TrackTemplateId)).ToList(); + var trackContentsOfTemplates = trackContents.Where(b => b.SubSystemId == input.SubSystemId && + b.TrackCode == a.Code + && input.TrackTemplateIds.Contains( + b.TrackTemplateId)).ToList(); + GetTemplateContentAttributeValueVO? trackContent = null; + var insertData = input.TrackTemplateIds + .Intersect(trackContentsOfTemplates.Select(aa => aa.TrackTemplateId)).ToList(); if (!insertData.IsNullOrEmpty()) { - trackContent = trackContentsOfTemplates.FirstOrDefault(a => a.TrackTemplateId == insertData.FirstOrDefault()); + trackContent = + trackContentsOfTemplates.FirstOrDefault(it => + it.TrackTemplateId == insertData.FirstOrDefault()); } if (trackContent != null) @@ -68,14 +78,10 @@ public class TrackOrderService : ApplicationService a.IsCanDelete = trackContent.IsCanDelete; a.IsExternal = trackContent.IsExternal; } - //else - //{ - // a.IsCanDelete=false; - // a.IsExternal=false; - //} + if (a.TrackTimeZoneValue == 0f) { - a.TrackTimeZone = $"GTM{" "}+00:00"; + a.TrackTimeZone = "GTM +00:00"; } else { @@ -85,11 +91,10 @@ public class TrackOrderService : ApplicationService TimeSpan offset = new TimeSpan(hours, minutes, 0); string timeZoneStr = offset.ToString(); string flag = a.TrackTimeZoneValue > 0f ? "+" : ""; - a.TrackTimeZone = $"GTM{" "}{flag}{timeZoneStr.RemovePostFix(":00")}"; + a.TrackTimeZone = $"GTM {flag}{timeZoneStr.RemovePostFix(":00")}"; } }); return list; - } return new List(); @@ -115,4 +120,21 @@ public class TrackOrderService : ApplicationService } #endregion + + /// + /// 获取轨迹计数器 + /// + /// + [HttpGet] + public async Task GetTrackCounterAsync() + { + var counts = await _trackOrderQueries.GetTrackProblemCountsAsync(); + + return new GetTrackCounterOutput + { + TotalCount = counts.Sum(x => x.Count), + ErrorCount = counts.FirstOrDefault(x => x.ProblemType == (int)TrackProblemType.Error)?.Count ?? 0, + WarnCount = counts.FirstOrDefault(x => x.ProblemType == (int)TrackProblemType.Warn)?.Count ?? 0, + }; + } } \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs b/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs index 3dd85154..06cfe9e9 100644 --- a/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs +++ b/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs @@ -7,21 +7,11 @@ /// public int SubSystemId { get; set; } - ///// - ///// 单号 - ///// - //public List? OrderNos { get; set; } - /// /// 当tab选中 0 默认不传 1 直接写死传值 [1,4] 2 传 [2,4] /// public int TabType { get; set; } - ///// - ///// 当tab选中 1 直接写死传值 [1,4] 2 传 [2,4] - ///// - //public List? QuestionTypeIds { get; set; } - /// /// 订单类型 /// @@ -142,25 +132,5 @@ /// 轨迹模板Id数组 /// public List? TrackTemplateIds { get; set; } - - /// - /// 问题类型（主数据枚举TrackQuestionType） - /// - public int QuestionType { get; set; } - - /// - /// 问题类型名称 - /// - public string? QuestionTypeName { get; set; } - - /// - /// 问题描述（主数据枚举TrackProblemDescription） - /// - public string? ProblemDescription { get; set; } - - /// - /// 问题描述名称 - /// - public string? ProblemDescriptionName { get; set; } } } \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Dtos/Order/GetTrackCounterVO.cs b/src/SJZY.Track.Domain/Dtos/Order/GetTrackCounterVO.cs new file mode 100644 index 00000000..67cc8496 --- /dev/null +++ b/src/SJZY.Track.Domain/Dtos/Order/GetTrackCounterVO.cs @@ -0,0 +1,14 @@ +namespace SJZY.Track.Domain.Dtos.Order; + +public class GetTrackCounterVO +{ + /// + /// 问题类型 + /// + public int ProblemType { get; set; } + + /// + /// 总条数 + /// + public int Count { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Enums/OrderType.cs b/src/SJZY.Track.Domain/Enums/OrderType.cs new file mode 100644 index 00000000..072aba6b --- /dev/null +++ b/src/SJZY.Track.Domain/Enums/OrderType.cs @@ -0,0 +1,6 @@ +namespace SJZY.Track.Domain.Enums; + +public enum OrderType +{ + 干线提单 = 1 +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Enums/TrackPushProblemType.cs b/src/SJZY.Track.Domain/Enums/TrackProblemType.cs similarity index 88% rename from src/SJZY.Track.Domain/Enums/TrackPushProblemType.cs rename to src/SJZY.Track.Domain/Enums/TrackProblemType.cs index 93bbdbcb..10087ba0 100644 --- a/src/SJZY.Track.Domain/Enums/TrackPushProblemType.cs +++ b/src/SJZY.Track.Domain/Enums/TrackProblemType.cs @@ -1,7 +1,7 @@ namespace SJZY.Track.Domain.Enums; [Flags] -public enum TrackPushProblemType +public enum TrackProblemType { /// /// 没问题 diff --git a/src/SJZY.Track.Domain/Queries/ITrackOrderQueries.cs b/src/SJZY.Track.Domain/Queries/ITrackOrderQueries.cs index 45309ad5..b521d97d 100644 --- a/src/SJZY.Track.Domain/Queries/ITrackOrderQueries.cs +++ b/src/SJZY.Track.Domain/Queries/ITrackOrderQueries.cs @@ -10,4 +10,10 @@ public interface ITrackOrderQueries /// /// Task> GetPageTrackOrder(GetPageTrackOrderInputVO input); + + /// + /// 获取轨迹各个问题数 + /// + /// + Task> GetTrackProblemCountsAsync(); } \ No newline at end of file diff --git a/src/SJZY.Track.Repository/Queries/TrackOrderQueries.cs b/src/SJZY.Track.Repository/Queries/TrackOrderQueries.cs index 108026b9..2542a33e 100644 --- a/src/SJZY.Track.Repository/Queries/TrackOrderQueries.cs +++ b/src/SJZY.Track.Repository/Queries/TrackOrderQueries.cs @@ -29,7 +29,7 @@ public class TrackOrderQueries : ISugarRepository, ITrackOrderQueries, int ques = 0; if (!input.OrderNos.IsNullOrWhiteSpace()) { - orderNoList = input.OrderNos!.Split(new[] { ',', '，', ':', '：' }).ToList(); + orderNoList = input.OrderNos!.Split(',', '，', ':', '：').ToList(); } if (input.TabType == 1) @@ -63,16 +63,9 @@ public class TrackOrderQueries : ISugarRepository, ITrackOrderQueries, Id = a.Id, OrderNumber = a.OrderNo, OrderType = a.OrderType, - OrderTypeName = SqlFunc.IF(a.OrderType == 1).Return("干线提单").ElseIF(a.OrderType == 2).Return("小包运单") - .ElseIF(a.OrderType == 3) - .Return("箱/袋单").ElseIF(a.OrderType == 4).Return("FBA订单").End(""), CustomerShortName = b.Abbreviation, CustomerCode = b.Code, CustomerId = a.CustomId, - QuestionType = a.QuestionType, - QuestionTypeName = SqlFunc.IF(a.QuestionType == 1).Return("异常").ElseIF(a.QuestionType == 2).Return("预警") - .End(""), - ProblemDescription = a.ProblemDescription, NewestTrackContent = a.LatestTrackContent, NewestTrackEnContent = a.LatestTrackEnContent, NewestTrackPlace = a.LatestTrackPlace, @@ -105,4 +98,16 @@ public class TrackOrderQueries : ISugarRepository, ITrackOrderQueries, return pageList; } + + public async Task> GetTrackProblemCountsAsync() + { + return await Context.Queryable() + .GroupBy(x => x.QuestionType) + .Select(x => new GetTrackCounterVO + { + ProblemType = x.QuestionType, + Count = SqlFunc.AggregateCount(1) + }) + .ToListAsync(); + } } \ No newline at end of file From 36706ae62cbed9bfa8c9385e0a2687c77b293c84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=86=9B?= <2357729423@qq.com> Date: Mon, 18 Mar 2024 16:15:01 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EventHandlers/TrackRefreshEventHandler.cs | 2 +- .../Repositories/TrackDetailsRepository.cs | 25 +++++++++++++++++-- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/src/SJZY.Track.Application/EventHandlers/TrackRefreshEventHandler.cs b/src/SJZY.Track.Application/EventHandlers/TrackRefreshEventHandler.cs index d732258d..9d0e410d 100644 --- a/src/SJZY.Track.Application/EventHandlers/TrackRefreshEventHandler.cs +++ b/src/SJZY.Track.Application/EventHandlers/TrackRefreshEventHandler.cs @@ -29,7 +29,7 @@ public class TrackRefreshEventHandler : ITransientDependency, ICapSubscribe _trackPullCacheService = trackPullCacheService; } - [CapSubscribe(GlobalConst.TrackRefreshSubscribe)] + [CapSubscribe(GlobalConst.TrackRefreshSubscribe, Group = GlobalConst.TrackRefreshSubscribe)] public async Task ConsumerAsync(InterfaceRelayForwardReplayEvent @event) { var attach = JsonConvert.DeserializeObject(@event.Attach); diff --git a/src/SJZY.Track.Repository/Repositories/TrackDetailsRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackDetailsRepository.cs index 132341a1..f50d7ebb 100644 --- a/src/SJZY.Track.Repository/Repositories/TrackDetailsRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/TrackDetailsRepository.cs @@ -87,9 +87,30 @@ internal class TrackDetailsRepository : ElasticSearchContextAbstract> GetListAsync(int orderType, List orderNos, string trackCode) + public async Task> GetListAsync(int orderType, List orderNos, string trackCode) { - throw new NotImplementedException(); + if (orderNos.Count < 1) return new List(); + + var data = await Context.SearchAsync(x => x + .Source(s => s.Includes(fd => fd + .Field(f => f.OrderNo) + .Field(f => f.TrackStatus) + .Field(f => f.TrackCode) + .Field(f => f.TrackContent) + .Field(f => f.TrackPlace) + .Field(f => f.TrackTime) + .Field(f => f.TrackTimeZone) + )) + .Query(q => + q.Terms(t => t + .Field(f => f.OrderNo.Suffix("keyword")) + .Terms(orderNos)) + && q.Term(f => f.OrderType, orderType) + && q.Term(f => f.TrackCode.Suffix("keyword"), trackCode) + ) + ); + + return data.Documents.ToList(); } public async Task> GetListAsync(int orderId) From 757f60e5e8cefcaf3ec9fdae0436540260975c18 Mon Sep 17 00:00:00 2001 From: moyongzhen <2534173414@qq.com> Date: Mon, 18 Mar 2024 17:08:28 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProvideServices/GetPageTrackOrderInput.cs | 30 +++++++------- .../AutoMapper/OrderAutoMapperProfile.cs | 40 ++++++++++++++++++- .../SJZY.Track.Application.csproj | 6 ++- .../Services/TrackOrders/TrackOrderService.cs | 1 - .../Dtos/Order/GetPageTrackOrderInputVO.cs | 21 ++++++++-- src/SJZY.Track.Domain/Enums/OrderType.cs | 16 +++++++- .../Enums/TrackProblemType.cs | 7 +++- .../Queries/TrackOrderQueries.cs | 23 +---------- .../Repositories/TrackContentRepository.cs | 34 ++++++++-------- 9 files changed, 116 insertions(+), 62 deletions(-) diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs index c6a143df..d9c87ab0 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs @@ -7,15 +7,15 @@ public class GetPageTrackOrderInput : PageInfoInput /// public int SubSystemId { get; set; } - ///// - ///// 单号 - ///// - //public List? OrderNos { get; set; } - /// /// 单号 /// - public string? OrderNos { get; set; } + public List? OrderNos { get; set; } + + ///// + ///// 单号 + ///// + //public string? OrderNos { get; set; } /// /// tab标签类型 0 全部， 1 异常 2 预警 @@ -136,7 +136,7 @@ public class TrackOrderDto /// /// 子系统 /// - public string SubSystem { get; set; } + public string? SubSystem { get; set; } /// /// 子系统id @@ -153,13 +153,13 @@ public class TrackOrderDto /// public string? QuestionTypeName { get; set; } - /// - /// 问题描述（主数据枚举TrackProblemDescription） - /// - public int ProblemDescription { get; set; } + ///// + ///// 问题描述（主数据枚举TrackProblemDescription） + ///// + //public int ProblemDescription { get; set; } - /// - /// 问题描述名称 - /// - public string? ProblemDescriptionName { get; set; } + ///// + ///// 问题描述名称 + ///// + //public string? ProblemDescriptionName { get; set; } } \ No newline at end of file diff --git a/src/SJZY.Track.Application/AutoMapper/OrderAutoMapperProfile.cs b/src/SJZY.Track.Application/AutoMapper/OrderAutoMapperProfile.cs index 25cb3b57..da077adf 100644 --- a/src/SJZY.Track.Application/AutoMapper/OrderAutoMapperProfile.cs +++ b/src/SJZY.Track.Application/AutoMapper/OrderAutoMapperProfile.cs @@ -1,8 +1,13 @@ using AutoMapper; +using Google.Protobuf.WellKnownTypes; +using SJZY.Expand.ABP.Core.PublicMethords; using SJZY.Track.Application.Contract.Dtos.ProvideServices; using SJZY.Track.Domain.Aggregates.OrderAggregate; using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate; using SJZY.Track.Domain.Dtos.Order; +using SJZY.Track.Domain.Enums; +using System.ComponentModel; +using System.Reflection; using Volo.Abp.AutoMapper; namespace SJZY.Track.Application.AutoMapper; @@ -20,7 +25,10 @@ public class OrderAutoMapperProfile : Profile CreateMap(MemberList.None); CreateMap(MemberList.None); - CreateMap(MemberList.None); + CreateMap(MemberList.None) + .ForMember(dest => dest.OrderTypeName, opt => opt.MapFrom(source => GetEnumDescription(2, source.OrderType))) + .ForMember(dest => dest.QuestionTypeName, opt => opt.MapFrom(source => GetEnumDescription(1, source.QuestionType))); + CreateMap, UnifyPageResultDto>(MemberList.None); CreateMap(MemberList.None).Ignore(dest => dest.TrackTimeZone) .ForMember(dest => dest.Id, opt => opt.Ignore()) @@ -29,4 +37,34 @@ public class OrderAutoMapperProfile : Profile .ForMember(dest => dest.EnContent, opt => opt.MapFrom(m => m.TrackEnContent)) .ForMember(dest => dest.TrackTimeZoneValue, opt => opt.MapFrom(m => m.TrackTimeZone)); } + + /// + /// 通过类型int获取枚举描述 + /// + /// 1 问题类型枚举 2 订单枚举 + /// + /// + public static string GetEnumDescription(int type, int value) + { + string enumDescription = string.Empty; + if (type == 1) + { + TrackProblemType trackProblem = (TrackProblemType)value; // 将int值转换为枚举 + if (trackProblem.GetDescription().IsNullOrWhiteSpace()) + enumDescription = ""; + else + enumDescription = trackProblem.GetDescription(); // 获取描述标记 + } + else + { + OrderType orderType = (OrderType)value; // 将int值转换为枚举 + if (orderType.GetDescription().IsNullOrWhiteSpace()) + enumDescription = ""; + else + enumDescription = orderType.GetDescription(); // 获取描述标记 + + } + + return enumDescription; + } } \ No newline at end of file diff --git a/src/SJZY.Track.Application/SJZY.Track.Application.csproj b/src/SJZY.Track.Application/SJZY.Track.Application.csproj index 62282f44..e3162402 100644 --- a/src/SJZY.Track.Application/SJZY.Track.Application.csproj +++ b/src/SJZY.Track.Application/SJZY.Track.Application.csproj @@ -8,7 +8,11 @@ - + + + + + diff --git a/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs b/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs index 029d5523..4ca4b245 100644 --- a/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs +++ b/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs @@ -58,7 +58,6 @@ public class TrackOrderService : ApplicationService list.ForEach(a => { a.Id = id++; - var trackContentsOfTemplates = trackContents.Where(b => b.SubSystemId == input.SubSystemId && b.TrackCode == a.Code && input.TrackTemplateIds.Contains( diff --git a/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs b/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs index 06cfe9e9..5f164841 100644 --- a/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs +++ b/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs @@ -8,7 +8,7 @@ public int SubSystemId { get; set; } /// - /// 当tab选中 0 默认不传 1 直接写死传值 [1,4] 2 传 [2,4] + /// 当tab选中 0 全部 1 异常 2 警告 /// public int TabType { get; set; } @@ -22,10 +22,15 @@ /// public int? CustomerId { get; set; } + ///// + ///// 单号 + ///// + //public string? OrderNos { get; set; } + /// /// 单号 /// - public string? OrderNos { get; set; } + public List? OrderNos { get; set; } /// /// 创建时间开始 @@ -121,7 +126,7 @@ /// /// 子系统 /// - public string SubSystem { get; set; } + public string? SubSystem { get; set; } /// /// 子系统id @@ -132,5 +137,15 @@ /// 轨迹模板Id数组 /// public List? TrackTemplateIds { get; set; } + + /// + /// 问题类型（主数据枚举TrackQuestionType） + /// + public int QuestionType { get; set; } + + /// + /// 问题类型名称 + /// + public string? QuestionTypeName { get; set; } } } \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Enums/OrderType.cs b/src/SJZY.Track.Domain/Enums/OrderType.cs index 072aba6b..79a97c52 100644 --- a/src/SJZY.Track.Domain/Enums/OrderType.cs +++ b/src/SJZY.Track.Domain/Enums/OrderType.cs @@ -1,6 +1,18 @@ -namespace SJZY.Track.Domain.Enums; +using System.ComponentModel; + +namespace SJZY.Track.Domain.Enums; public enum OrderType { - 干线提单 = 1 + [Description("干线提单")] + 干线提单 = 1, + + [Description("小包运单")] + 小包运单 = 2, + + [Description("箱/袋单")] + 箱袋单 = 3, + + [Description("FBA订单")] + FBA订单 = 4, } \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Enums/TrackProblemType.cs b/src/SJZY.Track.Domain/Enums/TrackProblemType.cs index 10087ba0..92369b84 100644 --- a/src/SJZY.Track.Domain/Enums/TrackProblemType.cs +++ b/src/SJZY.Track.Domain/Enums/TrackProblemType.cs @@ -1,4 +1,6 @@ -namespace SJZY.Track.Domain.Enums; +using System.ComponentModel; + +namespace SJZY.Track.Domain.Enums; [Flags] public enum TrackProblemType @@ -6,15 +8,18 @@ public enum TrackProblemType /// /// 没问题 /// + [Description("无")] None = 0, /// /// 异常 /// + [Description("异常")] Error = 1, /// /// 预警 /// + [Description("预警")] Warn = 2, } \ No newline at end of file diff --git a/src/SJZY.Track.Repository/Queries/TrackOrderQueries.cs b/src/SJZY.Track.Repository/Queries/TrackOrderQueries.cs index 2542a33e..6a3314eb 100644 --- a/src/SJZY.Track.Repository/Queries/TrackOrderQueries.cs +++ b/src/SJZY.Track.Repository/Queries/TrackOrderQueries.cs @@ -24,30 +24,11 @@ public class TrackOrderQueries : ISugarRepository, ITrackOrderQueries, /// public async Task> GetPageTrackOrder(GetPageTrackOrderInputVO input) { - List orderNoList = new List(); - List questionTypeIds = new List(); - int ques = 0; - if (!input.OrderNos.IsNullOrWhiteSpace()) - { - orderNoList = input.OrderNos!.Split(',', '，', ':', '：').ToList(); - } - - if (input.TabType == 1) - { - questionTypeIds = new List { 1, 4 }; - ques = questionTypeIds.Sum(); - } - else if (input.TabType == 2) - { - questionTypeIds = new List { 2, 4 }; - ques = questionTypeIds.Sum(); - } - var pageList = await Context.Queryable() .LeftJoin((a, b) => a.CustomId == b.Id && b.IsDeleted == false) .LeftJoin((a, b, c) => a.SubSystemId == c.Id && c.IsDeleted == false) .WhereIF(input.SubSystemId > 0, (a, b, c) => a.SubSystemId == input.SubSystemId) - .WhereIF(!orderNoList.IsNullOrEmpty(), (a, b, c) => orderNoList.Contains(a.OrderNo)) + .WhereIF(!input.OrderNos.IsNullOrEmpty(), (a, b, c) => input.OrderNos!.Contains(a.OrderNo)) .WhereIF(input.CreateTimeStart.HasValue && input.CreateTimeEnd.HasValue, (a, b, c) => a.CreateTime >= input.CreateTimeStart && a.CreateTime <= input.CreateTimeEnd) .WhereIF(input.CreateTimeStart.HasValue && (!input.CreateTimeEnd.HasValue), @@ -56,7 +37,7 @@ public class TrackOrderQueries : ISugarRepository, ITrackOrderQueries, (a, b, c) => a.CreateTime <= input.CreateTimeEnd) .WhereIF(input.CustomerId > 0, (a, b, c) => a.CustomId == input.CustomerId) .WhereIF(input.TrackOrderType > 0, (a, b, c) => a.OrderType == input.TrackOrderType) - .WhereIF(input.TabType > 0 && !questionTypeIds.IsNullOrEmpty(), (a, b, c) => (a.QuestionType & ques) > 0) + .WhereIF(input.TabType > 0, (a, b, c) => a.QuestionType == input.TabType) .OrderByDescending((a, b, c) => a.CreateTime) .Select((a, b, c) => new TrackOrderVO { diff --git a/src/SJZY.Track.Repository/Repositories/TrackContentRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackContentRepository.cs index 7609c5a6..360f2a88 100644 --- a/src/SJZY.Track.Repository/Repositories/TrackContentRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/TrackContentRepository.cs @@ -83,7 +83,7 @@ public class TrackContentRepository : BasicRepository, ITrac CreateUser = e.Name, UpdateTime = a.UpdateTime, UpdateUser = f.Name, - IsFinish= a.IsCompleted + IsFinish = a.IsCompleted }) .ToPagedListAsync(input.PageIndex, input.PageSize); @@ -97,21 +97,21 @@ public class TrackContentRepository : BasicRepository, ITrac public async Task> GetTrackContentAttributeValue(GetTemplateContentAttributeValueInputVO input) { var list = await Context.Queryable() - .LeftJoin((a, b) => a.Id==b.TrackContentId&& b.TrackTemplateId>0 && b.IsDeleted==false) - .LeftJoin((a, b, c) => b.TrackTemplateId==c.Id&& c.IsDeleted==false) - .WhereIF(!input.TrackCodes.IsNullOrEmpty(), (a, b, c) => input.TrackCodes.Contains(a.Code)) - .WhereIF(input.SubSystemId>0, (a, b, c) => a.SubSystemId==input.SubSystemId) - .WhereIF(!input.TrackTemplateIds.IsNullOrEmpty(), (a, b, c) => input.TrackTemplateIds.Contains(c.Id)) - .Where((a, b, c) => c.Id>0) + .LeftJoin((a, b) => a.Id == b.TrackContentId && b.TrackTemplateId > 0 && b.IsDeleted == false) + .LeftJoin((a, b, c) => b.TrackTemplateId == c.Id && c.IsDeleted == false) + .WhereIF(!input.TrackCodes.IsNullOrEmpty(), (a, b, c) => input.TrackCodes!.Contains(a.Code)) + .WhereIF(input.SubSystemId > 0, (a, b, c) => a.SubSystemId == input.SubSystemId) + .WhereIF(!input.TrackTemplateIds.IsNullOrEmpty(), (a, b, c) => input.TrackTemplateIds!.Contains(c.Id)) + .Where((a, b, c) => c.Id > 0) //.OrderByIF(!input.TrackTemplateIds.IsNullOrEmpty(), (a, b, c) => SqlFunc.IIF(input.TrackTemplateIds.Contains(a.Id), SqlFunc.DateAdd(SqlFunc.GetDate(), 1), c.CreateTime), OrderByType.Desc) .Select((a, b, c) => new GetTemplateContentAttributeValueVO { - IsCanDelete=b.IsCanDelete, - IsExternal=b.IsExternal, - SubSystemId= a.SubSystemId, - TrackCode= a.Code, - TrackContenId= a.Id, - TrackTemplateId=c.Id + IsCanDelete = b.IsCanDelete, + IsExternal = b.IsExternal, + SubSystemId = a.SubSystemId, + TrackCode = a.Code, + TrackContenId = a.Id, + TrackTemplateId = c.Id }).ToListAsync(); return list; @@ -125,9 +125,9 @@ public class TrackContentRepository : BasicRepository, ITrac public async Task GetTemplateIsExist(int trackContentId) { //var trackTemplateContents = await _trackTemplateContentBasicQuery.GetListAsync(a => a.TrackContentId == input.Id); - var trackContentEntities = await Context.Queryable().LeftJoin((a, b) => a.Id==b.TrackContentId && b.IsDeleted==false) - .LeftJoin((a, b, c) => b.TrackTemplateId==c.Id&& c.IsDeleted==false) - .Where((a, b, c) => a.Id==trackContentId) + var trackContentEntities = await Context.Queryable().LeftJoin((a, b) => a.Id == b.TrackContentId && b.IsDeleted == false) + .LeftJoin((a, b, c) => b.TrackTemplateId == c.Id && c.IsDeleted == false) + .Where((a, b, c) => a.Id == trackContentId) .Select((a, b, c) => new { TrackContentId = a.Id, @@ -135,7 +135,7 @@ public class TrackContentRepository : BasicRepository, ITrac }) .ToListAsync(); - if (trackContentEntities.Any(a => a.TemplateId>0)) + if (trackContentEntities.Any(a => a.TemplateId > 0)) { return true; } From 21c6422f23919a00d0387112ca1c2c563ddd9a38 Mon Sep 17 00:00:00 2001 From: moyongzhen <2534173414@qq.com> Date: Mon, 18 Mar 2024 17:20:00 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/SJZY.Track.Repository/Queries/TrackOrderQueries.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/SJZY.Track.Repository/Queries/TrackOrderQueries.cs b/src/SJZY.Track.Repository/Queries/TrackOrderQueries.cs index 6a3314eb..8d9d2504 100644 --- a/src/SJZY.Track.Repository/Queries/TrackOrderQueries.cs +++ b/src/SJZY.Track.Repository/Queries/TrackOrderQueries.cs @@ -44,6 +44,7 @@ public class TrackOrderQueries : ISugarRepository, ITrackOrderQueries, Id = a.Id, OrderNumber = a.OrderNo, OrderType = a.OrderType, + QuestionType = a.QuestionType, CustomerShortName = b.Abbreviation, CustomerCode = b.Code, CustomerId = a.CustomId, From 6cc32ffbadb43ffacdc94f8f3e64265ffca9353f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=86=9B?= <2357729423@qq.com> Date: Mon, 18 Mar 2024 17:30:21 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E7=B4=A2=E5=BC=95=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Dtos/TrackOrder/TrackPushRecordItem.cs | 5 ++ .../Events/TrackPushEvent.cs | 15 ++++ .../EventHandlers/TrackPushEventHandler.cs | 9 ++- .../EventHandlers/TrackUpsertEventHandler.cs | 74 +++++++++++-------- .../ProvideServices/TrackPushService.cs | 4 + .../Services/TrackOrders/TrackOrderService.cs | 17 ++++- .../ITrackDetailsRepository.cs | 2 - .../ITrackPushRecordsRepository.cs | 7 ++ .../TrackPushRecordIndex.cs | 44 ++++++++++- .../TrackPushRecordsRepository.cs | 15 +++- 10 files changed, 155 insertions(+), 37 deletions(-) create mode 100644 src/SJZY.Track.Application.Contract/Dtos/TrackOrder/TrackPushRecordItem.cs diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackOrder/TrackPushRecordItem.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackOrder/TrackPushRecordItem.cs new file mode 100644 index 00000000..f01d9869 --- /dev/null +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackOrder/TrackPushRecordItem.cs @@ -0,0 +1,5 @@ +namespace SJZY.Track.Application.Contract.Dtos.TrackOrder; + +public class TrackPushRecordItem +{ +} \ No newline at end of file diff --git a/src/SJZY.Track.Application.Contract/Events/TrackPushEvent.cs b/src/SJZY.Track.Application.Contract/Events/TrackPushEvent.cs index b74281a9..8434072e 100644 --- a/src/SJZY.Track.Application.Contract/Events/TrackPushEvent.cs +++ b/src/SJZY.Track.Application.Contract/Events/TrackPushEvent.cs @@ -27,6 +27,21 @@ public class TrackPushEvent /// public int TrackContentId { get; set; } + /// + /// 轨迹状态 + /// + public string TrackStatus { get; set; } = null!; + + /// + /// 轨迹内容代码 + /// + public string TrackCode { get; set; } = null!; + + /// + /// 轨迹内容 + /// + public string TrackContent { get; set; } = null!; + /// /// 轨迹发生地 /// diff --git a/src/SJZY.Track.Application/EventHandlers/TrackPushEventHandler.cs b/src/SJZY.Track.Application/EventHandlers/TrackPushEventHandler.cs index 5aa94802..c1ca1b19 100644 --- a/src/SJZY.Track.Application/EventHandlers/TrackPushEventHandler.cs +++ b/src/SJZY.Track.Application/EventHandlers/TrackPushEventHandler.cs @@ -51,11 +51,18 @@ public class TrackPushEventHandler : ITransientDependency, ICapSubscribe RequestId = res.RequestId, Message = res.Msg, OptionType = @event.OptionType.ToString(), + TrackStatus = @event.TrackStatus, + TrackCode = @event.TrackCode, + TrackContent = @event.TrackContent, TrackPlace = @event.TrackPlace, TrackTime = @event.TrackTime, TrackTimeZone = @event.TrackTimeZone, + TrackContentCodeValue = @event.TrackContentCodeValue, + TrackContentValue = @event.TrackContentValue, + TrackEnContentValue = @event.TrackEnContentValue, + TrackStatusValue = @event.TrackStatusValue, + ExpandFieldsValue = @event.ExpandFieldsValue, IsSuccess = isSuccess, - IsAuto = @event.OperationMan == null, CreateUser = @event.OperationMan ?? "系统", CreateTime = DateTime.Now }); diff --git a/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs b/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs index a0733812..9d375716 100644 --- a/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs +++ b/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs @@ -2,6 +2,7 @@ using DotNetCore.CAP; using SJZY.Expand.ABP.Core.Logger; using SJZY.Expand.ABP.Core.PublicMethords; +using SJZY.Track.Application.Contract.Dtos.ProvideServices; using SJZY.Track.Application.Contract.Events; using SJZY.Track.Application.Contract.Services; using SJZY.Track.Domain.Aggregates.OrderAggregate; @@ -155,37 +156,50 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe /// private async Task HandleTrackPushAsync(TrackUpsertEvent @event, TrackDetailsIndex track) { - var config = await _trackPushCacheService.InferNextPushContentOrNullAsync( - @event.SubSystemId, @event.CustomId, @event.LatestPushTrackContentId); - - if (config == null || !config.IsAutoPush) return; - - // 当前发生的轨迹就是要推送的 - if (config.TrackContentId == track.TrackContentId && config.OrderType == @event.OrderType) + TrackPushContentConfigDto? config; + OptionType optionType = OptionType.修改; + // 推送更新 + if (!track.Id.IsNullOrWhiteSpace()) { - var trackPushEvent = new TrackPushEvent - { - ServiceProviderCode = config.ServiceProviderCode, - OrderNo = track.OrderNo, - TrackContentId = config.TrackContentId, - TrackPlace = track.TrackPlace, - TrackTime = track.TrackTime.AddHours(config.TrackTimeZone ?? track.TrackTimeZone - track.TrackTimeZone), - TrackTimeZone = (float)(config.TrackTimeZone ?? track.TrackTimeZone), - TrackContentCodeValue = config.TrackContentCodeValue, - TrackContentValue = config.TrackContentValue, - TrackEnContentValue = config.TrackEnContentValue, - TrackStatusValue = config.TrackStatusValue, - ExpandFieldsValue = config.ExpandFieldsValue - }; - - // 推送更新 - if (!track.Id.IsNullOrWhiteSpace()) - { - trackPushEvent.OptionType = OptionType.修改; - if (!config.IsCanUpdate) return; - } - - await _capPublisher.PublishAsync(GlobalConst.TrackPushSubscribe, trackPushEvent); + config = await _trackPushCacheService.GetPushContentConfigAsync( + @event.SubSystemId, @event.CustomId, track.TrackContentId); + if (!config.IsCanUpdate) return; } + else + { + // 推送新增，需要根据上一次的推送 推断 本次推送 是否可行 + config = await _trackPushCacheService.InferNextPushContentOrNullAsync( + @event.SubSystemId, @event.CustomId, @event.LatestPushTrackContentId); + + if (config == null || !config.IsAutoPush) return; + + // 当前发生的轨迹就是要推送的 + if (config.TrackContentId != track.TrackContentId) return; + + optionType = OptionType.新增; + } + + if (config.OrderType != @event.OrderType) return; + + var trackPushEvent = new TrackPushEvent + { + OptionType = optionType, + ServiceProviderCode = config.ServiceProviderCode, + OrderNo = track.OrderNo, + TrackContentId = config.TrackContentId, + TrackStatus = track.TrackStatus, + TrackCode = track.TrackCode, + TrackContent = track.TrackContent, + TrackPlace = track.TrackPlace, + TrackTime = track.TrackTime.AddHours(config.TrackTimeZone ?? track.TrackTimeZone - track.TrackTimeZone), + TrackTimeZone = (float)(config.TrackTimeZone ?? track.TrackTimeZone), + TrackContentCodeValue = config.TrackContentCodeValue, + TrackContentValue = config.TrackContentValue, + TrackEnContentValue = config.TrackEnContentValue, + TrackStatusValue = config.TrackStatusValue, + ExpandFieldsValue = config.ExpandFieldsValue + }; + + await _capPublisher.PublishAsync(GlobalConst.TrackPushSubscribe, trackPushEvent); } } \ No newline at end of file diff --git a/src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs b/src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs index 6ce154dd..2fee5408 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs +++ b/src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs @@ -78,6 +78,10 @@ public class TrackPushService : ApplicationService { ServiceProviderCode = config.ServiceProviderCode, OrderNo = order.OrderNo, + TrackContentId = config.TrackContentId, + TrackStatus = track.TrackStatus, + TrackCode = track.TrackCode, + TrackContent = track.TrackContent, TrackPlace = track.TrackPlace, TrackTime = track.TrackTime.AddHours(config.TrackTimeZone ?? track.TrackTimeZone - track.TrackTimeZone), diff --git a/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs b/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs index 4ca4b245..f25aad89 100644 --- a/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs +++ b/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs @@ -3,6 +3,7 @@ using SJZY.Track.Application.Contract.Dtos.ProvideServices; using SJZY.Track.Application.Contract.Dtos.TrackOrder; using SJZY.Track.Domain.Aggregates.TrackContentAggregate; using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate; +using SJZY.Track.Domain.Aggregates.TrackPushAggregate; using SJZY.Track.Domain.Dtos.Order; using SJZY.Track.Domain.Dtos.TrackTemplate; using SJZY.Track.Domain.Enums; @@ -17,16 +18,19 @@ public class TrackOrderService : ApplicationService private readonly ITrackOrderQueries _trackOrderQueries; private readonly ITrackDetailsRepository _trackDetailsRepository; private readonly ITrackContentRepository _trackContentRepository; + private readonly ITrackPushRecordsRepository _trackPushRecordsRepository; public TrackOrderService( ITrackOrderQueries trackOrderQueries, ITrackDetailsRepository trackDetailsRepository, - ITrackContentRepository trackContentRepository + ITrackContentRepository trackContentRepository, + ITrackPushRecordsRepository trackPushRecordsRepository ) { _trackOrderQueries = trackOrderQueries; _trackDetailsRepository = trackDetailsRepository; _trackContentRepository = trackContentRepository; + _trackPushRecordsRepository = trackPushRecordsRepository; } #region 轨迹订单明细 @@ -136,4 +140,15 @@ public class TrackOrderService : ApplicationService WarnCount = counts.FirstOrDefault(x => x.ProblemType == (int)TrackProblemType.Warn)?.Count ?? 0, }; } + + /// + /// 获取轨迹推送记录 + /// + /// + /// 订单id + [HttpGet] + public async Task> GetTrackPushRecordsAsync(int orderId) + { + return await _trackPushRecordsRepository.GetTrackPushRecordsAsync(orderId); + } } \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/ITrackDetailsRepository.cs b/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/ITrackDetailsRepository.cs index b0a1cf21..acd0ed4e 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/ITrackDetailsRepository.cs +++ b/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/ITrackDetailsRepository.cs @@ -23,8 +23,6 @@ public interface ITrackDetailsRepository /// Task DeleteTrackAsync(int orderId, List trackCodes); - Task?> GetListAsync(List orderIds); - /// /// 获取最近一条发生的轨迹 /// diff --git a/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/ITrackPushRecordsRepository.cs b/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/ITrackPushRecordsRepository.cs index c7ae38be..e8115b13 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/ITrackPushRecordsRepository.cs +++ b/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/ITrackPushRecordsRepository.cs @@ -8,4 +8,11 @@ public interface ITrackPushRecordsRepository /// /// Task AddAsync(TrackPushRecordIndex index); + + /// + /// 获取轨迹推送记录 + /// + /// + /// + Task> GetTrackPushRecordsAsync(int orderId); } \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushRecordIndex.cs b/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushRecordIndex.cs index ef9dfb74..0d178b45 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushRecordIndex.cs +++ b/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushRecordIndex.cs @@ -12,6 +12,11 @@ public class TrackPushRecordIndex : IdBaseIndex /// public string IndexName { get; set; } = null!; + /// + /// 订单Id + /// + public int OrderId { get; set; } + /// /// 接口通请求Id /// @@ -28,9 +33,19 @@ public class TrackPushRecordIndex : IdBaseIndex public string OptionType { get; set; } = null!; /// - /// 是否自动推送 + /// 轨迹状态 /// - public bool IsAuto { get; set; } + public string TrackStatus { get; set; } = null!; + + /// + /// 轨迹内容代码 + /// + public string TrackCode { get; set; } = null!; + + /// + /// 轨迹内容 + /// + public string TrackContent { get; set; } = null!; /// /// 轨迹发生地 @@ -52,6 +67,31 @@ public class TrackPushRecordIndex : IdBaseIndex /// public bool IsSuccess { get; set; } + /// + /// 轨迹代码参数值 + /// + public string? TrackContentCodeValue { get; set; } + + /// + /// 轨迹内容参数值 + /// + public string? TrackContentValue { get; set; } + + /// + /// 轨迹内容英文参数值 + /// + public string? TrackEnContentValue { get; set; } + + /// + /// 轨迹状态参数值 + /// + public string? TrackStatusValue { get; set; } + + /// + /// 扩展字段参数值 + /// + public string? ExpandFieldsValue { get; set; } + /// 创建人 public string? CreateUser { get; set; } diff --git a/src/SJZY.Track.Repository/Repositories/TrackPushRecordsRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackPushRecordsRepository.cs index 31adf93d..c1bb968f 100644 --- a/src/SJZY.Track.Repository/Repositories/TrackPushRecordsRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/TrackPushRecordsRepository.cs @@ -1,4 +1,5 @@ -using SJZY.Expand.ABP.Core.Logger; +using Nest; +using SJZY.Expand.ABP.Core.Logger; using SJZY.Expand.ElasticSearch.Services; using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate; using SJZY.Track.Domain.Aggregates.TrackPushAggregate; @@ -25,4 +26,16 @@ public class TrackPushRecordsRepository : ElasticSearchContextAbstract> GetTrackPushRecordsAsync(int orderId) + { + var data = await Context.SearchAsync(x => x + .Query(q => + q.Term(t => t.OrderId, orderId) + ) + .Size(1000) + .Sort(s => s.Field(f => f.CreateTime, SortOrder.Descending))); + + return data.Documents.ToList(); + } } \ No newline at end of file