From 891e01ceca169c4e4395bc0ee09f32759067720d Mon Sep 17 00:00:00 2001 From: hardstylewyl <827778732@qq.com> Date: Fri, 27 Dec 2024 09:59:42 +0800 Subject: [PATCH] =?UTF-8?q?update:=20=E6=96=B0=E5=A2=9E/=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=BD=A8=E8=BF=B9=EF=BC=88=E5=8D=95=E4=B8=AA=EF=BC=89=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E8=8E=B7=E5=8F=96=E4=BF=A1=E6=81=AF=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=85=88=E9=80=89=E6=8B=A9=E7=94=A8=E6=88=B7?= =?UTF-8?q?token=E8=A7=A3=E6=9E=90=EF=BC=8C=E5=A4=87=E9=80=89=E4=BC=A0?= =?UTF-8?q?=E5=85=A5=E7=9A=84OptionUserId=E8=A7=A3=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit update: 轨迹推送完成广播增加，轨迹明细扩展参数Extra --- .../Events/TrackPushCompletedEvent.cs | 5 +++++ .../CAP/EventHandlers/TrackPushEventHandler.cs | 9 ++++++--- .../Services/Broadcasting/BroadcastingService.cs | 3 ++- .../Services/ProvideServices/TrackService.cs | 9 ++++++--- .../TrackPushAggregate/TrackPushRecordIndex.cs | 5 +++++ .../Repositories/OrderRepository.cs | 1 - 6 files changed, 24 insertions(+), 8 deletions(-) diff --git a/src/SJZY.Track.Application.Contract/Events/TrackPushCompletedEvent.cs b/src/SJZY.Track.Application.Contract/Events/TrackPushCompletedEvent.cs index 6d8646ef..6e3d3987 100644 --- a/src/SJZY.Track.Application.Contract/Events/TrackPushCompletedEvent.cs +++ b/src/SJZY.Track.Application.Contract/Events/TrackPushCompletedEvent.cs @@ -79,4 +79,9 @@ public class TrackPushCompletedEvent /// 推送内容（json） /// public string PushContent { get; set; } = null!; + + /// + /// 轨迹的额外新 + /// + public string? Extra { get; set; } } diff --git a/src/SJZY.Track.Application/CAP/EventHandlers/TrackPushEventHandler.cs b/src/SJZY.Track.Application/CAP/EventHandlers/TrackPushEventHandler.cs index a4e74aeb..e98c7cde 100644 --- a/src/SJZY.Track.Application/CAP/EventHandlers/TrackPushEventHandler.cs +++ b/src/SJZY.Track.Application/CAP/EventHandlers/TrackPushEventHandler.cs @@ -125,7 +125,8 @@ public class TrackPushEventHandler : ITransientDependency, ICapSubscribe TrackTimeZone = @event.SystemPushInfo.TrackTimeZone, CreateUser = GlobalConst.SystemUser, SubSystemCode = @event.SubSystemCode, - IsToMq = @event.IsToMq + IsToMq = @event.IsToMq, + Extra = @event.SystemPushInfo.Extra }; var item = await BuiltPushItem(config, log, @event.SystemPushInfo.Extra); item.Log = JsonConvert.SerializeObject(log); @@ -173,7 +174,8 @@ public class TrackPushEventHandler : ITransientDependency, ICapSubscribe TrackTimeZone = track.TrackTimeZone, CreateUser = @event.OperationMan, SubSystemCode = @event.SubSystemCode, - IsToMq = @event.IsToMq + IsToMq = @event.IsToMq, + Extra = track.Extra }; var item = await BuiltPushItem(config, log, track.Extra); item.Log = JsonConvert.SerializeObject(log); @@ -223,7 +225,8 @@ public class TrackPushEventHandler : ITransientDependency, ICapSubscribe TrackTimeZone = @event.SystemPushInfo.TrackTimeZone, CreateUser = GlobalConst.SystemUser, SubSystemCode = @event.SubSystemCode, - IsToMq = @event.IsToMq + IsToMq = @event.IsToMq, + Extra = @event.SystemPushInfo.Extra }; var item = BuiltUpdateItem(config, log, @event.SystemPushInfo.Extra); item.Log = JsonConvert.SerializeObject(log); diff --git a/src/SJZY.Track.Application/Services/Broadcasting/BroadcastingService.cs b/src/SJZY.Track.Application/Services/Broadcasting/BroadcastingService.cs index 68b3ddea..ad52c841 100644 --- a/src/SJZY.Track.Application/Services/Broadcasting/BroadcastingService.cs +++ b/src/SJZY.Track.Application/Services/Broadcasting/BroadcastingService.cs @@ -93,7 +93,8 @@ public class BroadcastingService : ITransientDependency TrackTimeZone = log.TrackTimeZone, TrackTime = log.TrackTime, TrackPlace = log.TrackPlace, - TrackCode = log.TrackCode + TrackCode = log.TrackCode, + Extra = log.Extra }; _rabbitClientBus.Publish(GlobalConst.TrackPushExchange, $"TrackPush.{log.SubSystemCode}", Encoding.UTF8.GetBytes(data.ToJson())); diff --git a/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs b/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs index f124ce46..5e4b7865 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs +++ b/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs @@ -140,11 +140,14 @@ public partial class TrackService : ApplicationService, ITrackService throw new BusinessException(message: $"订单：{input.OrderNo}，轨迹代码：{input.TrackCode}存在多条记录，不允许修改"); } - var userInfo = await _requestCurrentUserService.Service.GetCurrentUserBasicInfoAsync(input.OptionUserId); + var userInfo = await _requestCurrentUserService.Service.GetCurrentUserBasicInfoAsync(); if (userInfo.Code != GlobalConst.SuccessCode || userInfo.Data is null) { - //TODO: log || ex - throw new BusinessException(message: $"调用用户中心，获取用户信息失败:{userInfo.Msg}"); + //todo:保留之前的方式 后续可去除 + userInfo = await _requestCurrentUserService.Service.GetCurrentUserBasicInfoAsync(input.OptionUserId); + if (userInfo.Code != GlobalConst.SuccessCode || userInfo.Data is null) + //TODO: log || ex + throw new BusinessException(message: $"调用用户中心，获取用户信息失败:{userInfo.Msg}"); } var name = userInfo.Data.UserName; diff --git a/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushRecordIndex.cs b/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushRecordIndex.cs index c8731039..d127b5c4 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushRecordIndex.cs +++ b/src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushRecordIndex.cs @@ -92,4 +92,9 @@ public class TrackPushRecordIndex : IdBaseIndex /// 是否广播 /// public bool IsToMq { get; set; } + + /// + /// 轨迹额外信息 + /// + public string? Extra { get; set; } } diff --git a/src/SJZY.Track.Repository/Repositories/OrderRepository.cs b/src/SJZY.Track.Repository/Repositories/OrderRepository.cs index 413097c8..90e6c5bf 100644 --- a/src/SJZY.Track.Repository/Repositories/OrderRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/OrderRepository.cs @@ -1,4 +1,3 @@ -using NUglify.Helpers; using SJZY.Expand.ABP.Core.Logger; using SJZY.Track.Domain; using SJZY.Track.Domain.Aggregates.OrderAggregate;