From b1ee25ec067488367cd3765d4f30485702964736 Mon Sep 17 00:00:00 2001 From: hardstylewyl <827778732@qq.com> Date: Fri, 6 Jun 2025 09:17:32 +0800 Subject: [PATCH] =?UTF-8?q?add-param:=E6=8E=A8=E9=80=81=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E5=B9=BF=E6=92=AD=E5=A2=9E=E5=8A=A0=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E9=80=9A=E8=AF=B7=E6=B1=82=E6=9C=8D=E5=8A=A1=E5=95=86?= =?UTF-8?q?=E5=90=8E=E7=BB=93=E6=9E=9C=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Dtos/TrackPush/TrackPushRecordDto.cs | 5 +++++ .../Events/TrackPushCompletedEvent.cs | 5 +++++ .../Rabbit/TrackPushCompletedEventHandler.cs | 7 ++++--- .../Services/Broadcasting/BroadcastingService.cs | 3 ++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPush/TrackPushRecordDto.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackPush/TrackPushRecordDto.cs index a2d88e3b..cee51033 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackPush/TrackPushRecordDto.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackPush/TrackPushRecordDto.cs @@ -87,4 +87,9 @@ public class TrackPushRecordDto /// 轨迹的额外新 /// public string? Extra { get; set; } + + /// + /// 接口通请求服务商后拿到的数据,和日志记录中的一样 + /// + public string? InterfaceRelayData { get; set; } } diff --git a/src/SJZY.Track.Application.Contract/Events/TrackPushCompletedEvent.cs b/src/SJZY.Track.Application.Contract/Events/TrackPushCompletedEvent.cs index c7f4801d..44eb1d52 100644 --- a/src/SJZY.Track.Application.Contract/Events/TrackPushCompletedEvent.cs +++ b/src/SJZY.Track.Application.Contract/Events/TrackPushCompletedEvent.cs @@ -85,4 +85,9 @@ public class TrackPushCompletedEvent /// 轨迹的额外新 /// public string? Extra { get; set; } + + /// + /// 接口通请求服务商后拿到的数据,和日志记录中的一样 + /// + public string? InterfaceRelayData { get; set; } } diff --git a/src/SJZY.Track.Application/Rabbit/TrackPushCompletedEventHandler.cs b/src/SJZY.Track.Application/Rabbit/TrackPushCompletedEventHandler.cs index 1ba4da4b..322334e7 100644 --- a/src/SJZY.Track.Application/Rabbit/TrackPushCompletedEventHandler.cs +++ b/src/SJZY.Track.Application/Rabbit/TrackPushCompletedEventHandler.cs @@ -84,7 +84,7 @@ public class TrackPushCompletedEventHandler : ITransientDependency, IRabbitHandl // 推送广播 if (logs.First().IsToMq) - _broadcastingService.TrackPushCompletedPublicTopic(logs.Select(BuildDto).ToList()); + _broadcastingService.TrackPushCompletedPublicTopic(logs.Select(log => BuildDto(log, @event.Data)).ToList()); // 写入推送日志 await _trackPushRecordEsRepository.AddManyAsync(logs); @@ -190,7 +190,7 @@ public class TrackPushCompletedEventHandler : ITransientDependency, IRabbitHandl } } - private TrackPushRecordDto BuildDto(TrackPushRecordIndex log) + private static TrackPushRecordDto BuildDto(TrackPushRecordIndex log, string interfaceRelayData) { return new TrackPushRecordDto { @@ -210,7 +210,8 @@ public class TrackPushCompletedEventHandler : ITransientDependency, IRabbitHandl TrackTime = log.TrackTime, TrackPlace = log.TrackPlace, TrackCode = log.TrackCode, - Extra = log.Extra + Extra = log.Extra, + InterfaceRelayData = interfaceRelayData }; } } diff --git a/src/SJZY.Track.Application/Services/Broadcasting/BroadcastingService.cs b/src/SJZY.Track.Application/Services/Broadcasting/BroadcastingService.cs index 1723a226..049f9ba0 100644 --- a/src/SJZY.Track.Application/Services/Broadcasting/BroadcastingService.cs +++ b/src/SJZY.Track.Application/Services/Broadcasting/BroadcastingService.cs @@ -130,7 +130,8 @@ public class BroadcastingService : IBroadcastingService TrackTime = log.TrackTime, TrackPlace = log.TrackPlace, TrackCode = log.TrackCode, - Extra = log.Extra + Extra = log.Extra, + InterfaceRelayData = log.InterfaceRelayData }; } }