From aed09e534744fc65f47cf5ad338ea91727f0ee1a Mon Sep 17 00:00:00 2001 From: hardstylewyl <827778732@qq.com> Date: Fri, 9 May 2025 17:41:30 +0800 Subject: [PATCH] =?UTF-8?q?change-name:=E8=BD=A8=E8=BF=B9=E4=BF=A1?= =?UTF-8?q?=E5=8F=B7=E6=9B=B4=E5=90=8D=E4=B8=BA=E9=A2=84=E8=AD=A6=E4=BF=A1?= =?UTF-8?q?=E5=8F=B7=20=20-=20TrackSignal=20=3D>=20WarningSignal?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EventHandlers/TrackDeleteEventHandler.cs | 2 +- .../EventHandlers/TrackUpsertEventHandler.cs | 4 ++-- .../Handlers/CompleteWarningHandler.cs | 4 ++-- .../Handlers/ICompleteWarningHandler.cs | 4 ++-- .../Warning/Handlers/IReturnWarningHandler.cs | 2 +- .../Handlers/ITransportWarningHandler.cs | 4 ++-- .../Warning/Handlers/ReturnWarningHandler.cs | 2 +- .../Handlers/TransportWarningHandler.cs | 4 ++-- .../{TrackSignal.cs => WarningSignal.cs} | 22 ++++++++++--------- .../Warning/Signals/WarningSignalType.cs | 11 +++++++--- 10 files changed, 33 insertions(+), 26 deletions(-) rename src/SJZY.Track.Application/Services/Warning/Signals/{TrackSignal.cs => WarningSignal.cs} (62%) diff --git a/src/SJZY.Track.Application/CAP/EventHandlers/TrackDeleteEventHandler.cs b/src/SJZY.Track.Application/CAP/EventHandlers/TrackDeleteEventHandler.cs index 06780be1..5b2fc8fc 100644 --- a/src/SJZY.Track.Application/CAP/EventHandlers/TrackDeleteEventHandler.cs +++ b/src/SJZY.Track.Application/CAP/EventHandlers/TrackDeleteEventHandler.cs @@ -367,7 +367,7 @@ public class TrackDeleteEventHandler : ITransientDependency, ICapSubscribe private void WarningCalc_DeletedTrack(List delTracks) { - var signals = TrackSignal.FromTrack(delTracks, WarningSignalType.轨迹删除); + var signals = WarningSignal.FromTrack(delTracks, WarningSignalType.轨迹删除); _ = Task.Run(async () => { diff --git a/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs b/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs index bef93816..81d0c79c 100644 --- a/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs +++ b/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs @@ -511,7 +511,7 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe private void WarningCalc_AddedTrack(List tracks) { - var signals = TrackSignal.FromTrack(tracks, WarningSignalType.轨迹新增); + var signals = WarningSignal.FromTrack(tracks, WarningSignalType.轨迹新增); _ = Task.Run(async () => { @@ -539,7 +539,7 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe private void WarningCalc_UpdatedTrack(List tracks) { - var signals = TrackSignal.FromTrack(tracks, WarningSignalType.轨迹更新); + var signals = WarningSignal.FromTrack(tracks, WarningSignalType.轨迹更新); _ = Task.Run(async () => { diff --git a/src/SJZY.Track.Application/Services/Warning/Handlers/CompleteWarningHandler.cs b/src/SJZY.Track.Application/Services/Warning/Handlers/CompleteWarningHandler.cs index 1df85522..edc087ff 100644 --- a/src/SJZY.Track.Application/Services/Warning/Handlers/CompleteWarningHandler.cs +++ b/src/SJZY.Track.Application/Services/Warning/Handlers/CompleteWarningHandler.cs @@ -31,7 +31,7 @@ public sealed class CompleteWarningHandler : ICompleteWarningHandler, ITransient #region 预警信号批处理-删除轨迹 - public async Task TrackDeletedHandleAsync(List deletedSignals) + public async Task TrackDeletedHandleAsync(List deletedSignals) { // 1.只处理未删除的订单 var orderIdSet = deletedSignals.Select(x => x.OrderId).ToHashSet(); @@ -118,7 +118,7 @@ public sealed class CompleteWarningHandler : ICompleteWarningHandler, ITransient #region todo: 预警信号批处理-新增轨迹 - public async Task TrackAddedHandleAsync(List addedSignals) + public async Task TrackAddedHandleAsync(List addedSignals) { // 1.只处理未删除的订单 var orderIdSet = addedSignals.Select(x => x.OrderId).ToHashSet(); diff --git a/src/SJZY.Track.Application/Services/Warning/Handlers/ICompleteWarningHandler.cs b/src/SJZY.Track.Application/Services/Warning/Handlers/ICompleteWarningHandler.cs index 02088265..3756c523 100644 --- a/src/SJZY.Track.Application/Services/Warning/Handlers/ICompleteWarningHandler.cs +++ b/src/SJZY.Track.Application/Services/Warning/Handlers/ICompleteWarningHandler.cs @@ -7,10 +7,10 @@ namespace SJZY.Track.Application.Services.Warning.Handlers; public interface ICompleteWarningHandler { // 批量处理轨迹 删除信号 - Task TrackDeletedHandleAsync(List deletedSignals); + Task TrackDeletedHandleAsync(List deletedSignals); // 批量处理轨迹 新增信号 - Task TrackAddedHandleAsync(List addedSignals); + Task TrackAddedHandleAsync(List addedSignals); // 完整预警主体禁用 Task WarningRuleToDisabledHandleAsync(WarningRuleEntity rule); diff --git a/src/SJZY.Track.Application/Services/Warning/Handlers/IReturnWarningHandler.cs b/src/SJZY.Track.Application/Services/Warning/Handlers/IReturnWarningHandler.cs index 87eb6ad9..69843a6e 100644 --- a/src/SJZY.Track.Application/Services/Warning/Handlers/IReturnWarningHandler.cs +++ b/src/SJZY.Track.Application/Services/Warning/Handlers/IReturnWarningHandler.cs @@ -9,7 +9,7 @@ namespace SJZY.Track.Application.Services.Warning.Handlers; public interface IReturnWarningHandler { // 批量处理轨迹 修改/删除 - Task TrackUpdatedOrDeletedHandleAsync(List updateOrDeleteSignals); + Task TrackUpdatedOrDeletedHandleAsync(List updateOrDeleteSignals); // 收到轨迹推送记录（接口通回调）（人工介入/重试 阶段的回传） Task ReceiveTrackPushRecordHandleAsync(bool isSuccess, string requestParams, List records, List pushInputs, List updateInputs); diff --git a/src/SJZY.Track.Application/Services/Warning/Handlers/ITransportWarningHandler.cs b/src/SJZY.Track.Application/Services/Warning/Handlers/ITransportWarningHandler.cs index ad0cdae7..16a035a7 100644 --- a/src/SJZY.Track.Application/Services/Warning/Handlers/ITransportWarningHandler.cs +++ b/src/SJZY.Track.Application/Services/Warning/Handlers/ITransportWarningHandler.cs @@ -11,10 +11,10 @@ namespace SJZY.Track.Application.Services.Warning.Handlers; public interface ITransportWarningHandler { // 批量处理轨迹删除信号 - Task TrackDeletedHandleAsync(List deletedSignals); + Task TrackDeletedHandleAsync(List deletedSignals); // 批量处理轨迹新增/修改 - Task TrackAddedOrUpdatedHandleAsync(List addOrUpdateSignals); + Task TrackAddedOrUpdatedHandleAsync(List addOrUpdateSignals); // 运输预警主体禁用 Task WarningRuleToDisabledHandleAsync(WarningRuleEntity rule); diff --git a/src/SJZY.Track.Application/Services/Warning/Handlers/ReturnWarningHandler.cs b/src/SJZY.Track.Application/Services/Warning/Handlers/ReturnWarningHandler.cs index 0d237bb5..e8f2db19 100644 --- a/src/SJZY.Track.Application/Services/Warning/Handlers/ReturnWarningHandler.cs +++ b/src/SJZY.Track.Application/Services/Warning/Handlers/ReturnWarningHandler.cs @@ -384,7 +384,7 @@ public sealed class ReturnWarningHandler : IReturnWarningHandler, ITransientDepe #region todo-test: 预警信号批处理-修改或删除轨迹 - public async Task TrackUpdatedOrDeletedHandleAsync(List updateOrDeleteSignals) + public async Task TrackUpdatedOrDeletedHandleAsync(List updateOrDeleteSignals) { // 1.查询订单 var orderIdSet = updateOrDeleteSignals.Select(x => x.OrderId).ToHashSet(); diff --git a/src/SJZY.Track.Application/Services/Warning/Handlers/TransportWarningHandler.cs b/src/SJZY.Track.Application/Services/Warning/Handlers/TransportWarningHandler.cs index b58b2df0..a472f129 100644 --- a/src/SJZY.Track.Application/Services/Warning/Handlers/TransportWarningHandler.cs +++ b/src/SJZY.Track.Application/Services/Warning/Handlers/TransportWarningHandler.cs @@ -42,7 +42,7 @@ public class TransportWarningHandler : ITransportWarningHandler, ITransientDepen // tips:删除轨迹信号在运输预警处理只关注被删除的轨迹的状态 // 可能影响【运输预警明细】【运输预警明细生成任务】 - public async Task TrackDeletedHandleAsync(List deletedSignals) + public async Task TrackDeletedHandleAsync(List deletedSignals) { // 1.查询订单 var orderIdSet = deletedSignals.Select(x => x.OrderId).ToHashSet(); @@ -199,7 +199,7 @@ public class TransportWarningHandler : ITransportWarningHandler, ITransientDepen #region 预警信号批处理-新增修改轨迹 // tips:新增修改轨迹信号，在运输处理关注最新的轨迹 - public async Task TrackAddedOrUpdatedHandleAsync(List addOrUpdateSignals) + public async Task TrackAddedOrUpdatedHandleAsync(List addOrUpdateSignals) { // 1.查询订单 var orderIdSet = addOrUpdateSignals.Select(x => x.OrderId).ToHashSet(); diff --git a/src/SJZY.Track.Application/Services/Warning/Signals/TrackSignal.cs b/src/SJZY.Track.Application/Services/Warning/Signals/WarningSignal.cs similarity index 62% rename from src/SJZY.Track.Application/Services/Warning/Signals/TrackSignal.cs rename to src/SJZY.Track.Application/Services/Warning/Signals/WarningSignal.cs index 0a672a46..f7e8b2b2 100644 --- a/src/SJZY.Track.Application/Services/Warning/Signals/TrackSignal.cs +++ b/src/SJZY.Track.Application/Services/Warning/Signals/WarningSignal.cs @@ -1,25 +1,27 @@ +using System.Text.Json.Serialization; using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate; namespace SJZY.Track.Application.Services.Warning.Signals; /// -/// 轨迹信号，操作轨迹时产生 -/// 用于进行预警计算 +/// 预警信号，目前只是操作轨迹时产生 +/// 未来可以通过扩展类型+扩展字段的形式增加更多种预警触发源 /// -public readonly struct TrackSignal +public readonly struct WarningSignal { public WarningSignalType Type { get; } public int OrderId { get; } - // public string OrderNo { get; set; } - // public int OrderType { get; set; } - // public int SubSystemId { get; set; } - public string EsId { get; } public int TrackStatusId { get; } public int TrackContentId { get; } - public TrackSignal(WarningSignalType type, int orderId, string esId, int trackStatusId, int trackContentId) + // public string OrderNo { get; set; } + // public int OrderType { get; set; } + // public int SubSystemId { get; set; } + + [JsonConstructor] + public WarningSignal(WarningSignalType type, int orderId, string esId, int trackStatusId, int trackContentId) { Type = type; OrderId = orderId; @@ -28,10 +30,10 @@ public readonly struct TrackSignal TrackContentId = trackContentId; } - public static List FromTrack(List tracks, WarningSignalType type) + public static List FromTrack(List tracks, WarningSignalType type) { return tracks - .Select(x => new TrackSignal( + .Select(x => new WarningSignal( type, x.OrderId, x.Id, diff --git a/src/SJZY.Track.Application/Services/Warning/Signals/WarningSignalType.cs b/src/SJZY.Track.Application/Services/Warning/Signals/WarningSignalType.cs index 50365922..5e93398d 100644 --- a/src/SJZY.Track.Application/Services/Warning/Signals/WarningSignalType.cs +++ b/src/SJZY.Track.Application/Services/Warning/Signals/WarningSignalType.cs @@ -1,10 +1,15 @@ namespace SJZY.Track.Application.Services.Warning.Signals; +/// +/// 预警信号类型 +/// public enum WarningSignalType { - 轨迹新增 = 0, + 未知的 = 0, - 轨迹删除 = 1, + 轨迹新增 = 1, - 轨迹更新 = 2, + 轨迹删除 = 2, + + 轨迹更新 = 3, }