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

option:指定RID尝试启用预警信号优化

Browse Source
This commit is contained in:
hardstylewyl 2025-05-13 14:25:22 +08:00
parent 4fb657ed13
commit 3d3fc151fa
4 changed files with 82 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/SJZY.Track.Api/SJZY.Track.Api.csproj
View File

@ -7,6 +7,7 @@
<GenerateDocumentationFile>True</GenerateDocumentationFile> <GenerateDocumentationFile>True</GenerateDocumentationFile>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS> <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
<DockerfileContext>..\..</DockerfileContext> <DockerfileContext>..\..</DockerfileContext>
<RuntimeIdentifier>linux-x64</RuntimeIdentifier>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

60
src/SJZY.Track.Application/CAP/EventHandlers/TrackDeleteEventHandler.cs
View File

@ -25,7 +25,7 @@ public class TrackDeleteEventHandler : ITransientDependency, ICapSubscribe
private readonly IProvideQueries _provideQueries; private readonly IProvideQueries _provideQueries;
private readonly ITrackDetailsEsRepository _trackDetailsEsRepository; private readonly ITrackDetailsEsRepository _trackDetailsEsRepository;
private readonly IBroadcastingService _broadcastingService; private readonly IBroadcastingService _broadcastingService;
// private readonly WarningSignalPublisher _warningSignalPublisher; private readonly WarningSignalPublisher _warningSignalPublisher;
private readonly IServiceProvider _serviceProvider; private readonly IServiceProvider _serviceProvider;
public TrackDeleteEventHandler( public TrackDeleteEventHandler(
@ -35,8 +35,8 @@ public class TrackDeleteEventHandler : ITransientDependency, ICapSubscribe
ITrackDetailsEsRepository trackDetailsEsRepository, ITrackDetailsEsRepository trackDetailsEsRepository,
IOrderOperationRecordEsRepository orderOperationRecordEsRepository, IOrderOperationRecordEsRepository orderOperationRecordEsRepository,
IBroadcastingService broadcastingService, IBroadcastingService broadcastingService,
IServiceProvider serviceProvider IServiceProvider serviceProvider,
//WarningSignalPublisher warningSignalPublisher WarningSignalPublisher warningSignalPublisher
) )
{ {
_provideQueries = provideQueries; _provideQueries = provideQueries;
@ -46,7 +46,7 @@ public class TrackDeleteEventHandler : ITransientDependency, ICapSubscribe
_orderOperationRecordEsRepository = orderOperationRecordEsRepository; _orderOperationRecordEsRepository = orderOperationRecordEsRepository;
_broadcastingService = broadcastingService; _broadcastingService = broadcastingService;
_serviceProvider = serviceProvider; _serviceProvider = serviceProvider;
//_warningSignalPublisher = warningSignalPublisher; _warningSignalPublisher = warningSignalPublisher;
} }
[CapSubscribe(GlobalConst.TrackDeleteSubscribe, Group = GlobalConst.TrackDeleteSubscribe)] [CapSubscribe(GlobalConst.TrackDeleteSubscribe, Group = GlobalConst.TrackDeleteSubscribe)]
@ -371,31 +371,31 @@ public class TrackDeleteEventHandler : ITransientDependency, ICapSubscribe
private void WarningCalc_DeletedTrack(List<TrackDetailsIndex> delTracks) private void WarningCalc_DeletedTrack(List<TrackDetailsIndex> delTracks)
{ {
//_warningSignalPublisher.PublishWarningSignal(WarningSignalType.轨迹删除, delTracks); _warningSignalPublisher.PublishWarningSignal(WarningSignalType.轨迹删除, delTracks);
var signals = WarningSignal.FromTrack(delTracks, WarningSignalType.轨迹删除); // var signals = WarningSignal.FromTrack(delTracks, WarningSignalType.轨迹删除);
//
_ = Task.Run(async () => // _ = Task.Run(async () =>
{ // {
var scope = _serviceProvider.CreateAsyncScope(); // var scope = _serviceProvider.CreateAsyncScope();
try // try
{ // {
var handler = scope.ServiceProvider.GetRequiredService<ICompleteWarningHandler>(); // var handler = scope.ServiceProvider.GetRequiredService<ICompleteWarningHandler>();
var handler2 = scope.ServiceProvider.GetRequiredService<ITransportWarningHandler>(); // var handler2 = scope.ServiceProvider.GetRequiredService<ITransportWarningHandler>();
var handler3 = scope.ServiceProvider.GetRequiredService<IReturnWarningHandler>(); // var handler3 = scope.ServiceProvider.GetRequiredService<IReturnWarningHandler>();
//
await Task.Delay(1500); //确保落盘 // await Task.Delay(1500); //确保落盘
await handler.TrackDeletedHandleAsync(signals); // await handler.TrackDeletedHandleAsync(signals);
await handler2.TrackDeletedHandleAsync(signals); // await handler2.TrackDeletedHandleAsync(signals);
await handler3.TrackUpdatedOrDeletedHandleAsync(signals); // await handler3.TrackUpdatedOrDeletedHandleAsync(signals);
} // }
catch (Exception ex) // catch (Exception ex)
{ // {
LogHelper.Error(ex); // LogHelper.Error(ex);
} // }
finally // finally
{ // {
await scope.DisposeAsync(); // await scope.DisposeAsync();
} // }
}); // });
} }
} }

101
src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs
View File

@ -27,7 +27,7 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe
private readonly IBroadcastingService _broadcastingService; private readonly IBroadcastingService _broadcastingService;
private readonly ILogger<TrackUpsertEventHandler> _logger; private readonly ILogger<TrackUpsertEventHandler> _logger;
private readonly IOrderOperationRecordEsRepository _orderOperationRecordEsRepository; private readonly IOrderOperationRecordEsRepository _orderOperationRecordEsRepository;
//private readonly WarningSignalPublisher _warningSignalPublisher; private readonly WarningSignalPublisher _warningSignalPublisher;
private readonly IServiceProvider _serviceProvider; private readonly IServiceProvider _serviceProvider;
public TrackUpsertEventHandler( public TrackUpsertEventHandler(
@ -38,8 +38,8 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe
IOrderOperationRecordEsRepository orderOperationRecordEsRepository, IOrderOperationRecordEsRepository orderOperationRecordEsRepository,
IBroadcastingService broadcastingService, IBroadcastingService broadcastingService,
ILogger<TrackUpsertEventHandler> logger, ILogger<TrackUpsertEventHandler> logger,
IServiceProvider serviceProvider IServiceProvider serviceProvider,
//WarningSignalPublisher warningSignalPublisher WarningSignalPublisher warningSignalPublisher
) )
{ {
_orderRepository = orderRepository; _orderRepository = orderRepository;
@ -50,7 +50,6 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe
_broadcastingService = broadcastingService; _broadcastingService = broadcastingService;
_logger = logger; _logger = logger;
_serviceProvider = serviceProvider; _serviceProvider = serviceProvider;
//_warningSignalPublisher = warningSignalPublisher;
} }
[CapSubscribe(GlobalConst.TrackUpsertSubscribe, Group = GlobalConst.TrackUpsertSubscribe)] [CapSubscribe(GlobalConst.TrackUpsertSubscribe, Group = GlobalConst.TrackUpsertSubscribe)]
@ -516,57 +515,57 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe
private void WarningCalc_AddedTrack(List<TrackDetailsIndex> tracks) private void WarningCalc_AddedTrack(List<TrackDetailsIndex> tracks)
{ {
//_warningSignalPublisher.PublishWarningSignal(WarningSignalType.轨迹新增, tracks); _warningSignalPublisher.PublishWarningSignal(WarningSignalType.轨迹新增, tracks);
var signals = WarningSignal.FromTrack(tracks, WarningSignalType.轨迹新增); // var signals = WarningSignal.FromTrack(tracks, WarningSignalType.轨迹新增);
_ = Task.Run(async () => // _ = Task.Run(async () =>
{ // {
var scope = _serviceProvider.CreateAsyncScope(); // var scope = _serviceProvider.CreateAsyncScope();
try // try
{ // {
var handler = scope.ServiceProvider.GetRequiredService<ICompleteWarningHandler>(); // var handler = scope.ServiceProvider.GetRequiredService<ICompleteWarningHandler>();
var handler2 = scope.ServiceProvider.GetRequiredService<ITransportWarningHandler>(); // var handler2 = scope.ServiceProvider.GetRequiredService<ITransportWarningHandler>();
//
await Task.Delay(1500); //确保落盘 // await Task.Delay(1500); //确保落盘
await handler.TrackAddedHandleAsync(signals); // await handler.TrackAddedHandleAsync(signals);
await handler2.TrackAddedOrUpdatedHandleAsync(signals); // await handler2.TrackAddedOrUpdatedHandleAsync(signals);
} // }
catch (Exception ex) // catch (Exception ex)
{ // {
LogHelper.Error(ex); // LogHelper.Error(ex);
} // }
finally // finally
{ // {
await scope.DisposeAsync(); // await scope.DisposeAsync();
} // }
}); // });
} }
private void WarningCalc_UpdatedTrack(List<TrackDetailsIndex> tracks) private void WarningCalc_UpdatedTrack(List<TrackDetailsIndex> tracks)
{ {
//_warningSignalPublisher.PublishWarningSignal(WarningSignalType.轨迹更新, tracks); _warningSignalPublisher.PublishWarningSignal(WarningSignalType.轨迹更新, tracks);
var signals = WarningSignal.FromTrack(tracks, WarningSignalType.轨迹更新); // var signals = WarningSignal.FromTrack(tracks, WarningSignalType.轨迹更新);
//
_ = Task.Run(async () => // _ = Task.Run(async () =>
{ // {
var scope = _serviceProvider.CreateAsyncScope(); // var scope = _serviceProvider.CreateAsyncScope();
try // try
{ // {
var handler = scope.ServiceProvider.GetRequiredService<ITransportWarningHandler>(); // var handler = scope.ServiceProvider.GetRequiredService<ITransportWarningHandler>();
var handler2 = scope.ServiceProvider.GetRequiredService<IReturnWarningHandler>(); // var handler2 = scope.ServiceProvider.GetRequiredService<IReturnWarningHandler>();
//
await Task.Delay(1500); //确保落盘 // await Task.Delay(1500); //确保落盘
await handler.TrackAddedOrUpdatedHandleAsync(signals); // await handler.TrackAddedOrUpdatedHandleAsync(signals);
await handler2.TrackUpdatedOrDeletedHandleAsync(signals); // await handler2.TrackUpdatedOrDeletedHandleAsync(signals);
} // }
catch (Exception ex) // catch (Exception ex)
{ // {
LogHelper.Error(ex); // LogHelper.Error(ex);
} // }
finally // finally
{ // {
await scope.DisposeAsync(); // await scope.DisposeAsync();
} // }
}); // });
} }
} }

2
src/SJZY.Track.Application/SjzyTrackApplicationModule.cs
View File

@ -200,7 +200,7 @@ public class SjzyTrackApplicationModule : AbpModule
$",abortConnect=false"; $",abortConnect=false";
// 注册预警计算服务 // 注册预警计算服务
//context.Services.AddWarningCalcServices(configuration); context.Services.AddWarningCalcServices(configuration);
// 注册预警任务后台服务 // 注册预警任务后台服务
context.Services.AddHostedService<WarningTaskComponentBackgroundService>(); context.Services.AddHostedService<WarningTaskComponentBackgroundService>();