Merge branch 'S07' into test

This commit is contained in:
hardstylewyl 2025-03-21 18:03:52 +08:00
commit 021952d98c
2 changed files with 6 additions and 2 deletions

View File

@ -1197,7 +1197,7 @@ public class TransportWarningHandler : ITransportWarningHandler, ITransientDepen
.OrderBy(x => x.TrackTime) .OrderBy(x => x.TrackTime)
.First(); .First();
return new TransportWarningDetailsIndex var detail = new TransportWarningDetailsIndex
{ {
WarningId = ruleItem.WarningId, WarningId = ruleItem.WarningId,
WarningSceneId = ruleItem.TransportWarningSceneId, WarningSceneId = ruleItem.TransportWarningSceneId,
@ -1234,6 +1234,10 @@ public class TransportWarningHandler : ITransportWarningHandler, ITransientDepen
//审计属性 //审计属性
CreateTime = DateTime.Now, CreateTime = DateTime.Now,
}; };
// 一开始创建预警就可能为已超时的状态
detail.Status = detail.CalcStatus();
return detail;
} }
private List<WarningNotifyTaskEntity> BuildWarningNotifyTask(List<TransportWarningDetailsIndex> details) private List<WarningNotifyTaskEntity> BuildWarningNotifyTask(List<TransportWarningDetailsIndex> details)

View File

@ -88,7 +88,7 @@ public sealed class TransportWarningDetailsIndex : IdBaseIndex
//时效 //时效
var transportTimeSpan = TimeSpan.FromHours(TransportTimeSpan); //小时 var transportTimeSpan = TimeSpan.FromHours(TransportTimeSpan); //小时
//累计运输时间 //累计运输时间
var cumulativeTimeSpan = TimeSpan.FromMilliseconds(CumulativeTimeSpan); //毫秒 var cumulativeTimeSpan = DateTime.Now.Subtract(StartTrackTime); //毫秒
//预警时效(预警发出的时间对比于最早轨迹状态时间的跨度) //预警时效(预警发出的时间对比于最早轨迹状态时间的跨度)
var startTrackWarningTimeSpan = TimeSpan.FromHours(StartTrackWarningTimeSpan); //小时 var startTrackWarningTimeSpan = TimeSpan.FromHours(StartTrackWarningTimeSpan); //小时