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

Merge branch 'S07' into test

Browse Source
This commit is contained in:
hardstylewyl 2025-03-25 14:16:46 +08:00
commit f744a28c77
8 changed files with 115 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

156
src/SJZY.Track.Application.Contract/Dtos/Warning/Complete/CompleteWarningDetailsDto.cs
View File

@ -7,102 +7,102 @@ namespace SJZY.Track.Application.Contract.Dtos.Warning.Complete;
/// </summary>
public class CompleteWarningDetailsDto
{
/// <summary>
/// 预警明细唯一id
/// </summary>
public string EsId { get; set; }
/// <summary>
/// 预警明细唯一id
/// </summary>
public string EsId { get; set; }
/// <summary>
/// 子系统id
/// </summary>
public int SubSystemId { get; set; }
/// <summary>
/// 子系统id
/// </summary>
public int SubSystemId { get; set; }
/// <summary>
/// 子系统名称
/// </summary>
public string SubSystemName { get; set; } // todo:id换名称
/// <summary>
/// 子系统名称
/// </summary>
public string SubSystemName { get; set; }
/// <summary>
/// 订单类型
/// </summary>
public int OrderType { get; set; }
/// <summary>
/// 订单类型
/// </summary>
public int OrderType { get; set; }
/// <summary>
/// 订单类型名称
/// </summary>
public string OrderTypeName { get; set; } // todo:type换名称
/// <summary>
/// 订单类型名称
/// </summary>
public string OrderTypeName { get; set; }
/// <summary>
/// 订单id
/// </summary>
public int OrderId { get; set; }
/// <summary>
/// 订单id
/// </summary>
public int OrderId { get; set; }
/// <summary>
/// 订单号
/// </summary>
public string OrderNo { get; set; }
/// <summary>
/// 订单号
/// </summary>
public string OrderNo { get; set; }
/// <summary>
/// 状态 （待处理样式标红）
/// 1：待处理，2：已处理，3：已关闭
/// </summary>
public int Status { get; set; }
/// <summary>
/// 状态 （待处理样式标红）
/// 1：待处理，2：已处理，3：已关闭
/// </summary>
public int Status { get; set; }
/// <summary>
/// 客户id
/// </summary>
public int CustomId { get; set; }
/// <summary>
/// 客户id
/// </summary>
public int CustomId { get; set; }
/// <summary>
/// 客户简称
/// </summary>
public string CustomName { get; set; }
/// <summary>
/// 客户简称
/// </summary>
public string CustomName { get; set; }
/// <summary>
/// 缺失轨迹状态
/// </summary>
public List<TrackStatusDto> MissingTrackStatus { get; set; }
/// <summary>
/// 缺失轨迹状态
/// </summary>
public List<TrackStatusDto> MissingTrackStatus { get; set; }
//视图属性 tips:从es即时拿取
//视图属性 tips:从es即时拿取
/// <summary>
/// 最新轨迹状态
/// </summary>
public string? LatestTrackStatus { get; set; }
/// <summary>
/// 最新轨迹状态
/// </summary>
public string? LatestTrackStatus { get; set; }
/// <summary>
/// 最新轨迹内容
/// </summary>
public string? LatestTrackContent { get; set; }
/// <summary>
/// 最新轨迹内容
/// </summary>
public string? LatestTrackContent { get; set; }
/// <summary>
/// 最新轨迹发生地
/// </summary>
public string? LatestTrackPlace { get; set; }
/// <summary>
/// 最新轨迹发生地
/// </summary>
public string? LatestTrackPlace { get; set; }
/// <summary>
/// 最新轨迹发生时间
/// </summary>
public DateTime? LatestTrackTime { get; set; }
/// <summary>
/// 最新轨迹发生时间
/// </summary>
public DateTime? LatestTrackTime { get; set; }
/// <summary>
/// 最新轨迹发生时区 e.g GMT +8:00 / --
/// </summary>
public string? LatestTrackTimeZone { get; set; }
/// <summary>
/// 最新轨迹发生时区 e.g GMT +8:00 / --
/// </summary>
public string? LatestTrackTimeZone { get; set; }
/// <summary>
/// 通知对象
/// </summary>
public string NotifyUserNames { get; set; }
/// <summary>
/// 通知对象
/// </summary>
public string NotifyUserNames { get; set; }
/// <summary>
/// 预警创建时间
/// </summary>
public DateTime CreateTime { get; set; }
/// <summary>
/// 预警创建时间
/// </summary>
public DateTime CreateTime { get; set; }
/// <summary>
/// 预警处理时间
/// </summary>
public DateTime? ProcessedTime { get; set; }
/// <summary>
/// 预警处理时间
/// </summary>
public DateTime? ProcessedTime { get; set; }
}

56
src/SJZY.Track.Application.Contract/Dtos/Warning/Return/EditReturnWarningRuleItemInput.cs
View File

@ -8,16 +8,16 @@ namespace SJZY.Track.Application.Contract.Dtos.Warning.Return;
/// </summary>
public class EditReturnWarningRuleItemInput
{
/// <summary>
/// 预警规主体id
/// </summary>
[IdRequired]
public int WarningId { get; set; }
/// <summary>
/// 预警规主体id
/// </summary>
[IdRequired]
public int WarningId { get; set; }
/// <summary>
/// 预警规则配置项目（列表内容传递）
/// </summary>
public List<EditReturnWarningRuleItemDto> Items { get; set; } = new();
/// <summary>
/// 预警规则配置项目（列表内容传递）
/// </summary>
public List<EditReturnWarningRuleItemDto> Items { get; set; } = new();
}
/// <summary>
@ -25,26 +25,26 @@ public class EditReturnWarningRuleItemInput
/// </summary>
public class EditReturnWarningRuleItemDto
{
/// <summary>
/// 唯一id(传0视为新增)
/// </summary>
public int Id { get; set; }
/// <summary>
/// 唯一id(传0视为新增)
/// </summary>
public int Id { get; set; }
/// <summary>
/// 轨迹状态Id集合(,分割)
/// </summary>
[Required]
public string TrackStatusIds { get; set; }
/// <summary>
/// 轨迹状态Id集合(,分割)
/// </summary>
[Required]
public string TrackStatusIds { get; set; }
/// <summary>
/// 时效（单位h）
/// </summary>
[Range(0.1, float.MaxValue, ErrorMessage = "时效必须大于0.1")]
public float ReturnTimeSpan { get; set; }
/// <summary>
/// 时效（单位h）
/// </summary>
[Range(0.1, 99, ErrorMessage = "回传时效范围0.1-99")]
public float ReturnTimeSpan { get; set; }
/// <summary>
/// 通知对象用户集合
/// </summary>
[MinLength(1, ErrorMessage = "通知对象用户集合不能为空")]
public List<NotifyUserDto> NotifyUsers { get; set; } = new();
/// <summary>
/// 通知对象用户集合
/// </summary>
[MinLength(1, ErrorMessage = "通知对象用户集合不能为空")]
public List<NotifyUserDto> NotifyUsers { get; set; } = new();
}

8
src/SJZY.Track.Application.Contract/Dtos/Warning/Return/ReturnWarningDetailsDto.cs
View File

@ -18,7 +18,7 @@ public sealed class ReturnWarningDetailsDto
/// <summary>
/// 子系统名称
/// </summary>
public string SubSystemName { get; set; } // todo:id换名称
public string SubSystemName { get; set; }
/// <summary>
/// 订单类型
@ -28,7 +28,7 @@ public sealed class ReturnWarningDetailsDto
/// <summary>
/// 订单类型名称
/// </summary>
public string OrderTypeName { get; set; } // todo:type换名称
public string OrderTypeName { get; set; }
/// <summary>
/// 订单id
@ -53,7 +53,7 @@ public sealed class ReturnWarningDetailsDto
/// <summary>
/// 客户简称
/// </summary>
public string CustomName { get; set; } // todo:id换名称
public string CustomName { get; set; }
/// <summary>
/// 轨迹状态
@ -116,7 +116,7 @@ public sealed class ReturnWarningDetailsDto
public float? ReturnTimeSpan { get; set; }
// todo:计算属性
// tips:计算属性
/// <summary>
/// 实际回传用时（单位毫秒）e.g 00天00小时00分钟 / --

2
src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/TransportWarningSceneDto.cs
View File

@ -18,7 +18,7 @@ public class TransportWarningSceneDto
/// <summary>
/// 场景摘要（用于展示场景tabs）
/// </summary>
public string Summary { get; set; } // todo：将规则场景一些列因素转换为一段描述
public string Summary { get; set; }
/// <summary>
/// 是否中转（单一）

2
src/SJZY.Track.Application/Services/Warning/Handlers/ReturnWarningHandler.cs
View File

@ -343,7 +343,7 @@ public sealed class ReturnWarningHandler : IReturnWarningHandler, ITransientDepe
OrderNo = order.OrderNo,
OrderType = order.OrderType,
// 轨迹信息 todo:考虑直接将esid冗余record上？
// 轨迹信息
TrackEsId = record.TrackEsId,
TrackVersion = record.TrackVersion,
CompareFields = record.CompareFields,

2
src/SJZY.Track.Application/Services/Warning/Handlers/TransportWarningHandler.cs
View File

@ -444,7 +444,7 @@ public class TransportWarningHandler : ITransportWarningHandler, ITransientDepen
// 存在任务，根据条件判断，更新任务根据最早轨迹
// 任务起始轨迹时间变更，起始轨迹生成时间变更
if (task.StartTrackTime != earliestTrack.TrackTime
|| (Math.Abs(task.StartTrackWarningTimeSpan - ruleItem.StartTrackWarningTimeSpan) > 1.0f))
|| (Math.Abs(task.StartTrackWarningTimeSpan - ruleItem.StartTrackWarningTimeSpan) > 0.01f))
{
task.StartTrackTime = earliestTrack.TrackTime;
task.StartTrackWarningTimeSpan = ruleItem.StartTrackWarningTimeSpan;

2
src/SJZY.Track.Application/Services/Warning/ReturnWarningService.cs
View File

@ -152,7 +152,7 @@ public class ReturnWarningService : ApplicationService
PushTrackCode = x.PushTrackCode,
PushTrackStatus = x.PushTrackStatus,
PushTrackContent = x.PushTrackContent,
// todo:计算属性
// 计算属性
ActualReturnTimeSpan = FormatTimeSpan(x.ActualReturnTimeSpan),
SystemReturnTimeSpan = FormatTimeSpan(x.SystemReturnTimeSpan),
TrackCreateTimeSpan = FormatTimeSpan(x.TrackCreateTimeSpan),

2
src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/TrackDetailsIndex.cs
View File

@ -199,7 +199,7 @@ public class TrackDetailsIndex : IdVersionIndex
public DateTime GetUtc0TrackTime()
{
return Math.Abs(TrackTimeZone - GlobalConst.NoneTrackTimeZone) < 1f
return Math.Abs(TrackTimeZone - GlobalConst.NoneTrackTimeZone) < 0.01f
? TrackTime
: TrackTime.AddHours(-TrackTimeZone);
}