From cecc28af71e0c4ccee0aa5eab97eb9a9a501d4af Mon Sep 17 00:00:00 2001 From: hardstylewyl <827778732@qq.com> Date: Tue, 13 May 2025 11:24:51 +0800 Subject: [PATCH] =?UTF-8?q?option:=E5=90=AF=E7=94=A8NewtonsoftJson?= =?UTF-8?q?=E5=BA=8F=E5=88=97=E5=8C=96=E7=9A=84=E6=96=B9=E5=BC=8F=E9=A2=84?= =?UTF-8?q?=E8=AD=A6=E4=BF=A1=E5=8F=B7=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EventHandlers/TrackDeleteEventHandler.cs | 60 +++++------ .../EventHandlers/TrackUpsertEventHandler.cs | 102 +++++++++--------- .../SjzyTrackApplicationModule.cs | 2 +- 3 files changed, 82 insertions(+), 82 deletions(-) diff --git a/src/SJZY.Track.Application/CAP/EventHandlers/TrackDeleteEventHandler.cs b/src/SJZY.Track.Application/CAP/EventHandlers/TrackDeleteEventHandler.cs index 7d4305b1..646096a3 100644 --- a/src/SJZY.Track.Application/CAP/EventHandlers/TrackDeleteEventHandler.cs +++ b/src/SJZY.Track.Application/CAP/EventHandlers/TrackDeleteEventHandler.cs @@ -25,7 +25,7 @@ public class TrackDeleteEventHandler : ITransientDependency, ICapSubscribe private readonly IProvideQueries _provideQueries; private readonly ITrackDetailsEsRepository _trackDetailsEsRepository; private readonly IBroadcastingService _broadcastingService; - //private readonly WarningSignalPublisher _warningSignalPublisher; + private readonly WarningSignalPublisher _warningSignalPublisher; private readonly IServiceProvider _serviceProvider; public TrackDeleteEventHandler( @@ -35,8 +35,8 @@ public class TrackDeleteEventHandler : ITransientDependency, ICapSubscribe ITrackDetailsEsRepository trackDetailsEsRepository, IOrderOperationRecordEsRepository orderOperationRecordEsRepository, IBroadcastingService broadcastingService, - IServiceProvider serviceProvider - //WarningSignalPublisher warningSignalPublisher + IServiceProvider serviceProvider, + WarningSignalPublisher warningSignalPublisher ) { _provideQueries = provideQueries; @@ -46,7 +46,7 @@ public class TrackDeleteEventHandler : ITransientDependency, ICapSubscribe _orderOperationRecordEsRepository = orderOperationRecordEsRepository; _broadcastingService = broadcastingService; _serviceProvider = serviceProvider; - //_warningSignalPublisher = warningSignalPublisher; + _warningSignalPublisher = warningSignalPublisher; } [CapSubscribe(GlobalConst.TrackDeleteSubscribe, Group = GlobalConst.TrackDeleteSubscribe)] @@ -371,31 +371,31 @@ public class TrackDeleteEventHandler : ITransientDependency, ICapSubscribe private void WarningCalc_DeletedTrack(List delTracks) { - //_warningSignalPublisher.PublishWarningSignal(WarningSignalType.轨迹删除, delTracks); - var signals = WarningSignal.FromTrack(delTracks, WarningSignalType.轨迹删除); - - _ = Task.Run(async () => - { - var scope = _serviceProvider.CreateAsyncScope(); - try - { - var handler = scope.ServiceProvider.GetRequiredService(); - var handler2 = scope.ServiceProvider.GetRequiredService(); - var handler3 = scope.ServiceProvider.GetRequiredService(); - - await Task.Delay(1500); //确保落盘 - await handler.TrackDeletedHandleAsync(signals); - await handler2.TrackDeletedHandleAsync(signals); - await handler3.TrackUpdatedOrDeletedHandleAsync(signals); - } - catch (Exception ex) - { - LogHelper.Error(ex); - } - finally - { - await scope.DisposeAsync(); - } - }); + _warningSignalPublisher.PublishWarningSignal(WarningSignalType.轨迹删除, delTracks); + // var signals = WarningSignal.FromTrack(delTracks, WarningSignalType.轨迹删除); + // + // _ = Task.Run(async () => + // { + // var scope = _serviceProvider.CreateAsyncScope(); + // try + // { + // var handler = scope.ServiceProvider.GetRequiredService(); + // var handler2 = scope.ServiceProvider.GetRequiredService(); + // var handler3 = scope.ServiceProvider.GetRequiredService(); + // + // await Task.Delay(1500); //确保落盘 + // await handler.TrackDeletedHandleAsync(signals); + // await handler2.TrackDeletedHandleAsync(signals); + // await handler3.TrackUpdatedOrDeletedHandleAsync(signals); + // } + // catch (Exception ex) + // { + // LogHelper.Error(ex); + // } + // finally + // { + // await scope.DisposeAsync(); + // } + // }); } } diff --git a/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs b/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs index 387d77ca..ec670528 100644 --- a/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs +++ b/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs @@ -27,7 +27,7 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe private readonly IBroadcastingService _broadcastingService; private readonly ILogger _logger; private readonly IOrderOperationRecordEsRepository _orderOperationRecordEsRepository; - //private readonly WarningSignalPublisher _warningSignalPublisher; + private readonly WarningSignalPublisher _warningSignalPublisher; private readonly IServiceProvider _serviceProvider; public TrackUpsertEventHandler( @@ -38,8 +38,8 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe IOrderOperationRecordEsRepository orderOperationRecordEsRepository, IBroadcastingService broadcastingService, ILogger logger, - IServiceProvider serviceProvider - //WarningSignalPublisher warningSignalPublisher + IServiceProvider serviceProvider, + WarningSignalPublisher warningSignalPublisher ) { _orderRepository = orderRepository; @@ -50,7 +50,7 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe _broadcastingService = broadcastingService; _logger = logger; _serviceProvider = serviceProvider; - // _warningSignalPublisher = warningSignalPublisher; + _warningSignalPublisher = warningSignalPublisher; } [CapSubscribe(GlobalConst.TrackUpsertSubscribe, Group = GlobalConst.TrackUpsertSubscribe)] @@ -516,57 +516,57 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe private void WarningCalc_AddedTrack(List tracks) { - //_warningSignalPublisher.PublishWarningSignal(WarningSignalType.轨迹新增, tracks); - var signals = WarningSignal.FromTrack(tracks, WarningSignalType.轨迹新增); - _ = Task.Run(async () => - { - var scope = _serviceProvider.CreateAsyncScope(); - try - { - var handler = scope.ServiceProvider.GetRequiredService(); - var handler2 = scope.ServiceProvider.GetRequiredService(); - - await Task.Delay(1500); //确保落盘 - await handler.TrackAddedHandleAsync(signals); - await handler2.TrackAddedOrUpdatedHandleAsync(signals); - } - catch (Exception ex) - { - LogHelper.Error(ex); - } - finally - { - await scope.DisposeAsync(); - } - }); + _warningSignalPublisher.PublishWarningSignal(WarningSignalType.轨迹新增, tracks); + // var signals = WarningSignal.FromTrack(tracks, WarningSignalType.轨迹新增); + // _ = Task.Run(async () => + // { + // var scope = _serviceProvider.CreateAsyncScope(); + // try + // { + // var handler = scope.ServiceProvider.GetRequiredService(); + // var handler2 = scope.ServiceProvider.GetRequiredService(); + // + // await Task.Delay(1500); //确保落盘 + // await handler.TrackAddedHandleAsync(signals); + // await handler2.TrackAddedOrUpdatedHandleAsync(signals); + // } + // catch (Exception ex) + // { + // LogHelper.Error(ex); + // } + // finally + // { + // await scope.DisposeAsync(); + // } + // }); } private void WarningCalc_UpdatedTrack(List tracks) { - //_warningSignalPublisher.PublishWarningSignal(WarningSignalType.轨迹更新, tracks); - var signals = WarningSignal.FromTrack(tracks, WarningSignalType.轨迹更新); - - _ = Task.Run(async () => - { - var scope = _serviceProvider.CreateAsyncScope(); - try - { - var handler = scope.ServiceProvider.GetRequiredService(); - var handler2 = scope.ServiceProvider.GetRequiredService(); - - await Task.Delay(1500); //确保落盘 - await handler.TrackAddedOrUpdatedHandleAsync(signals); - await handler2.TrackUpdatedOrDeletedHandleAsync(signals); - } - catch (Exception ex) - { - LogHelper.Error(ex); - } - finally - { - await scope.DisposeAsync(); - } - }); + _warningSignalPublisher.PublishWarningSignal(WarningSignalType.轨迹更新, tracks); + // var signals = WarningSignal.FromTrack(tracks, WarningSignalType.轨迹更新); + // + // _ = Task.Run(async () => + // { + // var scope = _serviceProvider.CreateAsyncScope(); + // try + // { + // var handler = scope.ServiceProvider.GetRequiredService(); + // var handler2 = scope.ServiceProvider.GetRequiredService(); + // + // await Task.Delay(1500); //确保落盘 + // await handler.TrackAddedOrUpdatedHandleAsync(signals); + // await handler2.TrackUpdatedOrDeletedHandleAsync(signals); + // } + // catch (Exception ex) + // { + // LogHelper.Error(ex); + // } + // finally + // { + // await scope.DisposeAsync(); + // } + // }); } } diff --git a/src/SJZY.Track.Application/SjzyTrackApplicationModule.cs b/src/SJZY.Track.Application/SjzyTrackApplicationModule.cs index f946830b..b24448c9 100644 --- a/src/SJZY.Track.Application/SjzyTrackApplicationModule.cs +++ b/src/SJZY.Track.Application/SjzyTrackApplicationModule.cs @@ -200,7 +200,7 @@ public class SjzyTrackApplicationModule : AbpModule $",abortConnect=false"; // 注册预警计算服务 - //context.Services.AddWarningCalcServices(configuration); + context.Services.AddWarningCalcServices(configuration); // 注册预警任务后台服务 context.Services.AddHostedService();