update-validation:调整回传预警时效配置入参范围
This commit is contained in:
parent
e61d225140
commit
8ae7e40421
@ -20,7 +20,7 @@ public class CompleteWarningDetailsDto
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 子系统名称
|
/// 子系统名称
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string SubSystemName { get; set; } // todo:id换名称
|
public string SubSystemName { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 订单类型
|
/// 订单类型
|
||||||
@ -30,7 +30,7 @@ public class CompleteWarningDetailsDto
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 订单类型名称
|
/// 订单类型名称
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string OrderTypeName { get; set; } // todo:type换名称
|
public string OrderTypeName { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 订单id
|
/// 订单id
|
||||||
|
|||||||
@ -39,7 +39,7 @@ public class EditReturnWarningRuleItemDto
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 时效(单位h)
|
/// 时效(单位h)
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[Range(0.1, float.MaxValue, ErrorMessage = "时效必须大于0.1")]
|
[Range(0.1, 99, ErrorMessage = "回传时效范围0.1-99")]
|
||||||
public float ReturnTimeSpan { get; set; }
|
public float ReturnTimeSpan { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
@ -18,7 +18,7 @@ public sealed class ReturnWarningDetailsDto
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 子系统名称
|
/// 子系统名称
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string SubSystemName { get; set; } // todo:id换名称
|
public string SubSystemName { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 订单类型
|
/// 订单类型
|
||||||
@ -28,7 +28,7 @@ public sealed class ReturnWarningDetailsDto
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 订单类型名称
|
/// 订单类型名称
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string OrderTypeName { get; set; } // todo:type换名称
|
public string OrderTypeName { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 订单id
|
/// 订单id
|
||||||
@ -53,7 +53,7 @@ public sealed class ReturnWarningDetailsDto
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 客户简称
|
/// 客户简称
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string CustomName { get; set; } // todo:id换名称
|
public string CustomName { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 轨迹状态
|
/// 轨迹状态
|
||||||
@ -116,7 +116,7 @@ public sealed class ReturnWarningDetailsDto
|
|||||||
public float? ReturnTimeSpan { get; set; }
|
public float? ReturnTimeSpan { get; set; }
|
||||||
|
|
||||||
|
|
||||||
// todo:计算属性
|
// tips:计算属性
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 实际回传用时(单位毫秒)e.g 00天00小时00分钟 / --
|
/// 实际回传用时(单位毫秒)e.g 00天00小时00分钟 / --
|
||||||
|
|||||||
@ -18,7 +18,7 @@ public class TransportWarningSceneDto
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 场景摘要(用于展示场景tabs)
|
/// 场景摘要(用于展示场景tabs)
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string Summary { get; set; } // todo:将规则场景一些列因素转换为一段描述
|
public string Summary { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 是否中转(单一)
|
/// 是否中转(单一)
|
||||||
|
|||||||
@ -343,7 +343,7 @@ public sealed class ReturnWarningHandler : IReturnWarningHandler, ITransientDepe
|
|||||||
OrderNo = order.OrderNo,
|
OrderNo = order.OrderNo,
|
||||||
OrderType = order.OrderType,
|
OrderType = order.OrderType,
|
||||||
|
|
||||||
// 轨迹信息 todo:考虑直接将esid冗余record上?
|
// 轨迹信息
|
||||||
TrackEsId = record.TrackEsId,
|
TrackEsId = record.TrackEsId,
|
||||||
TrackVersion = record.TrackVersion,
|
TrackVersion = record.TrackVersion,
|
||||||
CompareFields = record.CompareFields,
|
CompareFields = record.CompareFields,
|
||||||
|
|||||||
@ -444,7 +444,7 @@ public class TransportWarningHandler : ITransportWarningHandler, ITransientDepen
|
|||||||
// 存在任务,根据条件判断,更新任务根据最早轨迹
|
// 存在任务,根据条件判断,更新任务根据最早轨迹
|
||||||
// 任务起始轨迹时间变更,起始轨迹生成时间变更
|
// 任务起始轨迹时间变更,起始轨迹生成时间变更
|
||||||
if (task.StartTrackTime != earliestTrack.TrackTime
|
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.StartTrackTime = earliestTrack.TrackTime;
|
||||||
task.StartTrackWarningTimeSpan = ruleItem.StartTrackWarningTimeSpan;
|
task.StartTrackWarningTimeSpan = ruleItem.StartTrackWarningTimeSpan;
|
||||||
|
|||||||
@ -152,7 +152,7 @@ public class ReturnWarningService : ApplicationService
|
|||||||
PushTrackCode = x.PushTrackCode,
|
PushTrackCode = x.PushTrackCode,
|
||||||
PushTrackStatus = x.PushTrackStatus,
|
PushTrackStatus = x.PushTrackStatus,
|
||||||
PushTrackContent = x.PushTrackContent,
|
PushTrackContent = x.PushTrackContent,
|
||||||
// todo:计算属性
|
// 计算属性
|
||||||
ActualReturnTimeSpan = FormatTimeSpan(x.ActualReturnTimeSpan),
|
ActualReturnTimeSpan = FormatTimeSpan(x.ActualReturnTimeSpan),
|
||||||
SystemReturnTimeSpan = FormatTimeSpan(x.SystemReturnTimeSpan),
|
SystemReturnTimeSpan = FormatTimeSpan(x.SystemReturnTimeSpan),
|
||||||
TrackCreateTimeSpan = FormatTimeSpan(x.TrackCreateTimeSpan),
|
TrackCreateTimeSpan = FormatTimeSpan(x.TrackCreateTimeSpan),
|
||||||
|
|||||||
@ -199,7 +199,7 @@ public class TrackDetailsIndex : IdVersionIndex
|
|||||||
|
|
||||||
public DateTime GetUtc0TrackTime()
|
public DateTime GetUtc0TrackTime()
|
||||||
{
|
{
|
||||||
return Math.Abs(TrackTimeZone - GlobalConst.NoneTrackTimeZone) < 1f
|
return Math.Abs(TrackTimeZone - GlobalConst.NoneTrackTimeZone) < 0.01f
|
||||||
? TrackTime
|
? TrackTime
|
||||||
: TrackTime.AddHours(-TrackTimeZone);
|
: TrackTime.AddHours(-TrackTimeZone);
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user