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

rollback:暂时回退5.9的更改

Browse Source
This commit is contained in:
hardstylewyl 2025-05-12 16:38:09 +08:00
parent 16d425d2e3
commit 9bbefafcda
3 changed files with 82 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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 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<TrackDetailsIndex> delTracks)
{
_warningSignalPublisher.PublishWarningSignal(WarningSignalType.轨迹删除, delTracks);
// var signals = WarningSignal.FromTrack(delTracks, WarningSignalType.轨迹删除);
//
// _ = Task.Run(async () =>
// {
// var scope = _serviceProvider.CreateAsyncScope();
// try
// {
// var handler = scope.ServiceProvider.GetRequiredService<ICompleteWarningHandler>();
// var handler2 = scope.ServiceProvider.GetRequiredService<ITransportWarningHandler>();
// var handler3 = scope.ServiceProvider.GetRequiredService<IReturnWarningHandler>();
//
// 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<ICompleteWarningHandler>();
var handler2 = scope.ServiceProvider.GetRequiredService<ITransportWarningHandler>();
var handler3 = scope.ServiceProvider.GetRequiredService<IReturnWarningHandler>();
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();
}
});
}
}

102
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 ILogger<TrackUpsertEventHandler> _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<TrackUpsertEventHandler> 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<TrackDetailsIndex> tracks)
{
_warningSignalPublisher.PublishWarningSignal(WarningSignalType.轨迹新增, tracks);
// var signals = WarningSignal.FromTrack(tracks, WarningSignalType.轨迹新增);
// _ = Task.Run(async () =>
// {
// var scope = _serviceProvider.CreateAsyncScope();
// try
// {
// var handler = scope.ServiceProvider.GetRequiredService<ICompleteWarningHandler>();
// var handler2 = scope.ServiceProvider.GetRequiredService<ITransportWarningHandler>();
//
// 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<ICompleteWarningHandler>();
var handler2 = scope.ServiceProvider.GetRequiredService<ITransportWarningHandler>();
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<TrackDetailsIndex> tracks)
{
_warningSignalPublisher.PublishWarningSignal(WarningSignalType.轨迹更新, tracks);
// var signals = WarningSignal.FromTrack(tracks, WarningSignalType.轨迹更新);
//
// _ = Task.Run(async () =>
// {
// var scope = _serviceProvider.CreateAsyncScope();
// try
// {
// var handler = scope.ServiceProvider.GetRequiredService<ITransportWarningHandler>();
// var handler2 = scope.ServiceProvider.GetRequiredService<IReturnWarningHandler>();
//
// 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<ITransportWarningHandler>();
var handler2 = scope.ServiceProvider.GetRequiredService<IReturnWarningHandler>();
await Task.Delay(1500); //确保落盘
await handler.TrackAddedOrUpdatedHandleAsync(signals);
await handler2.TrackUpdatedOrDeletedHandleAsync(signals);
}
catch (Exception ex)
{
LogHelper.Error(ex);
}
finally
{
await scope.DisposeAsync();
}
});
}
}

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

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