change-name:轨迹信号更名为预警信号
- TrackSignal => WarningSignal
This commit is contained in:
parent
1a1f453073
commit
aed09e5347
@ -367,7 +367,7 @@ public class TrackDeleteEventHandler : ITransientDependency, ICapSubscribe
|
|||||||
|
|
||||||
private void WarningCalc_DeletedTrack(List<TrackDetailsIndex> delTracks)
|
private void WarningCalc_DeletedTrack(List<TrackDetailsIndex> delTracks)
|
||||||
{
|
{
|
||||||
var signals = TrackSignal.FromTrack(delTracks, WarningSignalType.轨迹删除);
|
var signals = WarningSignal.FromTrack(delTracks, WarningSignalType.轨迹删除);
|
||||||
|
|
||||||
_ = Task.Run(async () =>
|
_ = Task.Run(async () =>
|
||||||
{
|
{
|
||||||
|
|||||||
@ -511,7 +511,7 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe
|
|||||||
|
|
||||||
private void WarningCalc_AddedTrack(List<TrackDetailsIndex> tracks)
|
private void WarningCalc_AddedTrack(List<TrackDetailsIndex> tracks)
|
||||||
{
|
{
|
||||||
var signals = TrackSignal.FromTrack(tracks, WarningSignalType.轨迹新增);
|
var signals = WarningSignal.FromTrack(tracks, WarningSignalType.轨迹新增);
|
||||||
|
|
||||||
_ = Task.Run(async () =>
|
_ = Task.Run(async () =>
|
||||||
{
|
{
|
||||||
@ -539,7 +539,7 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe
|
|||||||
|
|
||||||
private void WarningCalc_UpdatedTrack(List<TrackDetailsIndex> tracks)
|
private void WarningCalc_UpdatedTrack(List<TrackDetailsIndex> tracks)
|
||||||
{
|
{
|
||||||
var signals = TrackSignal.FromTrack(tracks, WarningSignalType.轨迹更新);
|
var signals = WarningSignal.FromTrack(tracks, WarningSignalType.轨迹更新);
|
||||||
|
|
||||||
_ = Task.Run(async () =>
|
_ = Task.Run(async () =>
|
||||||
{
|
{
|
||||||
|
|||||||
@ -31,7 +31,7 @@ public sealed class CompleteWarningHandler : ICompleteWarningHandler, ITransient
|
|||||||
|
|
||||||
#region 预警信号批处理-删除轨迹
|
#region 预警信号批处理-删除轨迹
|
||||||
|
|
||||||
public async Task TrackDeletedHandleAsync(List<TrackSignal> deletedSignals)
|
public async Task TrackDeletedHandleAsync(List<WarningSignal> deletedSignals)
|
||||||
{
|
{
|
||||||
// 1.只处理未删除的订单
|
// 1.只处理未删除的订单
|
||||||
var orderIdSet = deletedSignals.Select(x => x.OrderId).ToHashSet();
|
var orderIdSet = deletedSignals.Select(x => x.OrderId).ToHashSet();
|
||||||
@ -118,7 +118,7 @@ public sealed class CompleteWarningHandler : ICompleteWarningHandler, ITransient
|
|||||||
|
|
||||||
#region todo: 预警信号批处理-新增轨迹
|
#region todo: 预警信号批处理-新增轨迹
|
||||||
|
|
||||||
public async Task TrackAddedHandleAsync(List<TrackSignal> addedSignals)
|
public async Task TrackAddedHandleAsync(List<WarningSignal> addedSignals)
|
||||||
{
|
{
|
||||||
// 1.只处理未删除的订单
|
// 1.只处理未删除的订单
|
||||||
var orderIdSet = addedSignals.Select(x => x.OrderId).ToHashSet();
|
var orderIdSet = addedSignals.Select(x => x.OrderId).ToHashSet();
|
||||||
|
|||||||
@ -7,10 +7,10 @@ namespace SJZY.Track.Application.Services.Warning.Handlers;
|
|||||||
public interface ICompleteWarningHandler
|
public interface ICompleteWarningHandler
|
||||||
{
|
{
|
||||||
// 批量处理轨迹 删除信号
|
// 批量处理轨迹 删除信号
|
||||||
Task TrackDeletedHandleAsync(List<TrackSignal> deletedSignals);
|
Task TrackDeletedHandleAsync(List<WarningSignal> deletedSignals);
|
||||||
|
|
||||||
// 批量处理轨迹 新增信号
|
// 批量处理轨迹 新增信号
|
||||||
Task TrackAddedHandleAsync(List<TrackSignal> addedSignals);
|
Task TrackAddedHandleAsync(List<WarningSignal> addedSignals);
|
||||||
|
|
||||||
// 完整预警主体禁用
|
// 完整预警主体禁用
|
||||||
Task WarningRuleToDisabledHandleAsync(WarningRuleEntity rule);
|
Task WarningRuleToDisabledHandleAsync(WarningRuleEntity rule);
|
||||||
|
|||||||
@ -9,7 +9,7 @@ namespace SJZY.Track.Application.Services.Warning.Handlers;
|
|||||||
public interface IReturnWarningHandler
|
public interface IReturnWarningHandler
|
||||||
{
|
{
|
||||||
// 批量处理轨迹 修改/删除
|
// 批量处理轨迹 修改/删除
|
||||||
Task TrackUpdatedOrDeletedHandleAsync(List<TrackSignal> updateOrDeleteSignals);
|
Task TrackUpdatedOrDeletedHandleAsync(List<WarningSignal> updateOrDeleteSignals);
|
||||||
|
|
||||||
// 收到轨迹推送记录(接口通回调)(人工介入/重试 阶段的回传)
|
// 收到轨迹推送记录(接口通回调)(人工介入/重试 阶段的回传)
|
||||||
Task ReceiveTrackPushRecordHandleAsync(bool isSuccess, string requestParams, List<TrackPushRecordIndex> records, List<TrackPushInput> pushInputs, List<TrackUpdateInput> updateInputs);
|
Task ReceiveTrackPushRecordHandleAsync(bool isSuccess, string requestParams, List<TrackPushRecordIndex> records, List<TrackPushInput> pushInputs, List<TrackUpdateInput> updateInputs);
|
||||||
|
|||||||
@ -11,10 +11,10 @@ namespace SJZY.Track.Application.Services.Warning.Handlers;
|
|||||||
public interface ITransportWarningHandler
|
public interface ITransportWarningHandler
|
||||||
{
|
{
|
||||||
// 批量处理轨迹删除信号
|
// 批量处理轨迹删除信号
|
||||||
Task TrackDeletedHandleAsync(List<TrackSignal> deletedSignals);
|
Task TrackDeletedHandleAsync(List<WarningSignal> deletedSignals);
|
||||||
|
|
||||||
// 批量处理轨迹新增/修改
|
// 批量处理轨迹新增/修改
|
||||||
Task TrackAddedOrUpdatedHandleAsync(List<TrackSignal> addOrUpdateSignals);
|
Task TrackAddedOrUpdatedHandleAsync(List<WarningSignal> addOrUpdateSignals);
|
||||||
|
|
||||||
// 运输预警主体禁用
|
// 运输预警主体禁用
|
||||||
Task WarningRuleToDisabledHandleAsync(WarningRuleEntity rule);
|
Task WarningRuleToDisabledHandleAsync(WarningRuleEntity rule);
|
||||||
|
|||||||
@ -384,7 +384,7 @@ public sealed class ReturnWarningHandler : IReturnWarningHandler, ITransientDepe
|
|||||||
|
|
||||||
#region todo-test: 预警信号批处理-修改或删除轨迹
|
#region todo-test: 预警信号批处理-修改或删除轨迹
|
||||||
|
|
||||||
public async Task TrackUpdatedOrDeletedHandleAsync(List<TrackSignal> updateOrDeleteSignals)
|
public async Task TrackUpdatedOrDeletedHandleAsync(List<WarningSignal> updateOrDeleteSignals)
|
||||||
{
|
{
|
||||||
// 1.查询订单
|
// 1.查询订单
|
||||||
var orderIdSet = updateOrDeleteSignals.Select(x => x.OrderId).ToHashSet();
|
var orderIdSet = updateOrDeleteSignals.Select(x => x.OrderId).ToHashSet();
|
||||||
|
|||||||
@ -42,7 +42,7 @@ public class TransportWarningHandler : ITransportWarningHandler, ITransientDepen
|
|||||||
|
|
||||||
// tips:删除轨迹信号在运输预警处理只关注被删除的轨迹的状态
|
// tips:删除轨迹信号在运输预警处理只关注被删除的轨迹的状态
|
||||||
// 可能影响【运输预警明细】【运输预警明细生成任务】
|
// 可能影响【运输预警明细】【运输预警明细生成任务】
|
||||||
public async Task TrackDeletedHandleAsync(List<TrackSignal> deletedSignals)
|
public async Task TrackDeletedHandleAsync(List<WarningSignal> deletedSignals)
|
||||||
{
|
{
|
||||||
// 1.查询订单
|
// 1.查询订单
|
||||||
var orderIdSet = deletedSignals.Select(x => x.OrderId).ToHashSet();
|
var orderIdSet = deletedSignals.Select(x => x.OrderId).ToHashSet();
|
||||||
@ -199,7 +199,7 @@ public class TransportWarningHandler : ITransportWarningHandler, ITransientDepen
|
|||||||
#region 预警信号批处理-新增修改轨迹
|
#region 预警信号批处理-新增修改轨迹
|
||||||
|
|
||||||
// tips:新增修改轨迹信号,在运输处理关注最新的轨迹
|
// tips:新增修改轨迹信号,在运输处理关注最新的轨迹
|
||||||
public async Task TrackAddedOrUpdatedHandleAsync(List<TrackSignal> addOrUpdateSignals)
|
public async Task TrackAddedOrUpdatedHandleAsync(List<WarningSignal> addOrUpdateSignals)
|
||||||
{
|
{
|
||||||
// 1.查询订单
|
// 1.查询订单
|
||||||
var orderIdSet = addOrUpdateSignals.Select(x => x.OrderId).ToHashSet();
|
var orderIdSet = addOrUpdateSignals.Select(x => x.OrderId).ToHashSet();
|
||||||
|
|||||||
@ -1,25 +1,27 @@
|
|||||||
|
using System.Text.Json.Serialization;
|
||||||
using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate;
|
using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate;
|
||||||
|
|
||||||
namespace SJZY.Track.Application.Services.Warning.Signals;
|
namespace SJZY.Track.Application.Services.Warning.Signals;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 轨迹信号,操作轨迹时产生
|
/// 预警信号,目前只是操作轨迹时产生
|
||||||
/// 用于进行预警计算
|
/// 未来可以通过扩展类型+扩展字段的形式增加更多种预警触发源
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public readonly struct TrackSignal
|
public readonly struct WarningSignal
|
||||||
{
|
{
|
||||||
public WarningSignalType Type { get; }
|
public WarningSignalType Type { get; }
|
||||||
|
|
||||||
public int OrderId { 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 string EsId { get; }
|
||||||
public int TrackStatusId { get; }
|
public int TrackStatusId { get; }
|
||||||
public int TrackContentId { 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;
|
Type = type;
|
||||||
OrderId = orderId;
|
OrderId = orderId;
|
||||||
@ -28,10 +30,10 @@ public readonly struct TrackSignal
|
|||||||
TrackContentId = trackContentId;
|
TrackContentId = trackContentId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static List<TrackSignal> FromTrack(List<TrackDetailsIndex> tracks, WarningSignalType type)
|
public static List<WarningSignal> FromTrack(List<TrackDetailsIndex> tracks, WarningSignalType type)
|
||||||
{
|
{
|
||||||
return tracks
|
return tracks
|
||||||
.Select(x => new TrackSignal(
|
.Select(x => new WarningSignal(
|
||||||
type,
|
type,
|
||||||
x.OrderId,
|
x.OrderId,
|
||||||
x.Id,
|
x.Id,
|
||||||
@ -1,10 +1,15 @@
|
|||||||
namespace SJZY.Track.Application.Services.Warning.Signals;
|
namespace SJZY.Track.Application.Services.Warning.Signals;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 预警信号类型
|
||||||
|
/// </summary>
|
||||||
public enum WarningSignalType
|
public enum WarningSignalType
|
||||||
{
|
{
|
||||||
轨迹新增 = 0,
|
未知的 = 0,
|
||||||
|
|
||||||
轨迹删除 = 1,
|
轨迹新增 = 1,
|
||||||
|
|
||||||
轨迹更新 = 2,
|
轨迹删除 = 2,
|
||||||
|
|
||||||
|
轨迹更新 = 3,
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user