diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/Complete/CompleteWarningDetailsDto.cs b/src/SJZY.Track.Application.Contract/Dtos/Warning/Complete/CompleteWarningDetailsDto.cs index e785f1e1..f4e14d89 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/Complete/CompleteWarningDetailsDto.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/Warning/Complete/CompleteWarningDetailsDto.cs @@ -7,102 +7,102 @@ namespace SJZY.Track.Application.Contract.Dtos.Warning.Complete; /// public class CompleteWarningDetailsDto { - /// - /// 预警明细唯一id - /// - public string EsId { get; set; } + /// + /// 预警明细唯一id + /// + public string EsId { get; set; } - /// - /// 子系统id - /// - public int SubSystemId { get; set; } + /// + /// 子系统id + /// + public int SubSystemId { get; set; } - /// - /// 子系统名称 - /// - public string SubSystemName { get; set; } // todo:id换名称 + /// + /// 子系统名称 + /// + public string SubSystemName { get; set; } - /// - /// 订单类型 - /// - public int OrderType { get; set; } + /// + /// 订单类型 + /// + public int OrderType { get; set; } - /// - /// 订单类型名称 - /// - public string OrderTypeName { get; set; } // todo:type换名称 + /// + /// 订单类型名称 + /// + public string OrderTypeName { get; set; } - /// - /// 订单id - /// - public int OrderId { get; set; } + /// + /// 订单id + /// + public int OrderId { get; set; } - /// - /// 订单号 - /// - public string OrderNo { get; set; } + /// + /// 订单号 + /// + public string OrderNo { get; set; } - /// - /// 状态 （待处理样式标红） - /// 1：待处理，2：已处理，3：已关闭 - /// - public int Status { get; set; } + /// + /// 状态 （待处理样式标红） + /// 1：待处理，2：已处理，3：已关闭 + /// + public int Status { get; set; } - /// - /// 客户id - /// - public int CustomId { get; set; } + /// + /// 客户id + /// + public int CustomId { get; set; } - /// - /// 客户简称 - /// - public string CustomName { get; set; } + /// + /// 客户简称 + /// + public string CustomName { get; set; } - /// - /// 缺失轨迹状态 - /// - public List MissingTrackStatus { get; set; } + /// + /// 缺失轨迹状态 + /// + public List MissingTrackStatus { get; set; } - //视图属性 tips:从es即时拿取 + //视图属性 tips:从es即时拿取 - /// - /// 最新轨迹状态 - /// - public string? LatestTrackStatus { get; set; } + /// + /// 最新轨迹状态 + /// + public string? LatestTrackStatus { get; set; } - /// - /// 最新轨迹内容 - /// - public string? LatestTrackContent { get; set; } + /// + /// 最新轨迹内容 + /// + public string? LatestTrackContent { get; set; } - /// - /// 最新轨迹发生地 - /// - public string? LatestTrackPlace { get; set; } + /// + /// 最新轨迹发生地 + /// + public string? LatestTrackPlace { get; set; } - /// - /// 最新轨迹发生时间 - /// - public DateTime? LatestTrackTime { get; set; } + /// + /// 最新轨迹发生时间 + /// + public DateTime? LatestTrackTime { get; set; } - /// - /// 最新轨迹发生时区 e.g GMT +8:00 / -- - /// - public string? LatestTrackTimeZone { get; set; } + /// + /// 最新轨迹发生时区 e.g GMT +8:00 / -- + /// + public string? LatestTrackTimeZone { get; set; } - /// - /// 通知对象 - /// - public string NotifyUserNames { get; set; } + /// + /// 通知对象 + /// + public string NotifyUserNames { get; set; } - /// - /// 预警创建时间 - /// - public DateTime CreateTime { get; set; } + /// + /// 预警创建时间 + /// + public DateTime CreateTime { get; set; } - /// - /// 预警处理时间 - /// - public DateTime? ProcessedTime { get; set; } + /// + /// 预警处理时间 + /// + public DateTime? ProcessedTime { get; set; } } diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/EditReturnWarningRuleItemInput.cs b/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/EditReturnWarningRuleItemInput.cs index 3af60ebe..e8ee6562 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/EditReturnWarningRuleItemInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/EditReturnWarningRuleItemInput.cs @@ -8,16 +8,16 @@ namespace SJZY.Track.Application.Contract.Dtos.Warning.Return; /// public class EditReturnWarningRuleItemInput { - /// - /// 预警规主体id - /// - [IdRequired] - public int WarningId { get; set; } + /// + /// 预警规主体id + /// + [IdRequired] + public int WarningId { get; set; } - /// - /// 预警规则配置项目（列表内容传递） - /// - public List Items { get; set; } = new(); + /// + /// 预警规则配置项目（列表内容传递） + /// + public List Items { get; set; } = new(); } /// @@ -25,26 +25,26 @@ public class EditReturnWarningRuleItemInput /// public class EditReturnWarningRuleItemDto { - /// - /// 唯一id(传0视为新增) - /// - public int Id { get; set; } + /// + /// 唯一id(传0视为新增) + /// + public int Id { get; set; } - /// - /// 轨迹状态Id集合(,分割) - /// - [Required] - public string TrackStatusIds { get; set; } + /// + /// 轨迹状态Id集合(,分割) + /// + [Required] + public string TrackStatusIds { get; set; } - /// - /// 时效（单位h） - /// - [Range(0.1, float.MaxValue, ErrorMessage = "时效必须大于0.1")] - public float ReturnTimeSpan { get; set; } + /// + /// 时效（单位h） + /// + [Range(0.1, 99, ErrorMessage = "回传时效范围0.1-99")] + public float ReturnTimeSpan { get; set; } - /// - /// 通知对象用户集合 - /// - [MinLength(1, ErrorMessage = "通知对象用户集合不能为空")] - public List NotifyUsers { get; set; } = new(); + /// + /// 通知对象用户集合 + /// + [MinLength(1, ErrorMessage = "通知对象用户集合不能为空")] + public List NotifyUsers { get; set; } = new(); } diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/ReturnWarningDetailsDto.cs b/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/ReturnWarningDetailsDto.cs index 06867d52..efd2b9be 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/ReturnWarningDetailsDto.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/ReturnWarningDetailsDto.cs @@ -18,7 +18,7 @@ public sealed class ReturnWarningDetailsDto /// /// 子系统名称 /// - public string SubSystemName { get; set; } // todo:id换名称 + public string SubSystemName { get; set; } /// /// 订单类型 @@ -28,7 +28,7 @@ public sealed class ReturnWarningDetailsDto /// /// 订单类型名称 /// - public string OrderTypeName { get; set; } // todo:type换名称 + public string OrderTypeName { get; set; } /// /// 订单id @@ -53,7 +53,7 @@ public sealed class ReturnWarningDetailsDto /// /// 客户简称 /// - public string CustomName { get; set; } // todo:id换名称 + public string CustomName { get; set; } /// /// 轨迹状态 @@ -116,7 +116,7 @@ public sealed class ReturnWarningDetailsDto public float? ReturnTimeSpan { get; set; } - // todo:计算属性 + // tips:计算属性 /// /// 实际回传用时（单位毫秒）e.g 00天00小时00分钟 / -- diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/TransportWarningSceneDto.cs b/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/TransportWarningSceneDto.cs index d6315e6f..3b485485 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/TransportWarningSceneDto.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/Warning/Transport/TransportWarningSceneDto.cs @@ -18,7 +18,7 @@ public class TransportWarningSceneDto /// /// 场景摘要（用于展示场景tabs） /// - public string Summary { get; set; } // todo：将规则场景一些列因素转换为一段描述 + public string Summary { get; set; } /// /// 是否中转（单一） diff --git a/src/SJZY.Track.Application/Services/Warning/Handlers/ReturnWarningHandler.cs b/src/SJZY.Track.Application/Services/Warning/Handlers/ReturnWarningHandler.cs index f21895cd..4e06decd 100644 --- a/src/SJZY.Track.Application/Services/Warning/Handlers/ReturnWarningHandler.cs +++ b/src/SJZY.Track.Application/Services/Warning/Handlers/ReturnWarningHandler.cs @@ -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, diff --git a/src/SJZY.Track.Application/Services/Warning/Handlers/TransportWarningHandler.cs b/src/SJZY.Track.Application/Services/Warning/Handlers/TransportWarningHandler.cs index 58a73efa..14e1c6eb 100644 --- a/src/SJZY.Track.Application/Services/Warning/Handlers/TransportWarningHandler.cs +++ b/src/SJZY.Track.Application/Services/Warning/Handlers/TransportWarningHandler.cs @@ -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; diff --git a/src/SJZY.Track.Application/Services/Warning/ReturnWarningService.cs b/src/SJZY.Track.Application/Services/Warning/ReturnWarningService.cs index 1437fe24..2154092c 100644 --- a/src/SJZY.Track.Application/Services/Warning/ReturnWarningService.cs +++ b/src/SJZY.Track.Application/Services/Warning/ReturnWarningService.cs @@ -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), diff --git a/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/TrackDetailsIndex.cs b/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/TrackDetailsIndex.cs index a36191b6..ef7b9e43 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/TrackDetailsIndex.cs +++ b/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/TrackDetailsIndex.cs @@ -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); }