From 9281d7b482565bb6143124e85648fa06171af550 Mon Sep 17 00:00:00 2001
From: hardstylewyl <827778732@qq.com>
Date: Fri, 21 Mar 2025 18:03:39 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E6=94=B6=E5=88=B0?=
 =?UTF-8?q?=E6=88=AA=E6=AD=A2=E8=BD=A8=E8=BF=B9=E8=BF=90=E8=BE=93=E9=A2=84?=
 =?UTF-8?q?=E8=AD=A6=E6=98=8E=E7=BB=86=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=9C=89=E8=AF=AF=20=20-=20=E9=A2=84=E8=AD=A6=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E7=94=9F=E6=88=90=E5=88=9D=E5=A7=8B=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=9C=89=E8=AF=AF=EF=BC=8C=E5=8F=AF=E8=83=BD=E4=B8=80=E5=BC=80?=
 =?UTF-8?q?=E5=A7=8B=E5=B0=B1=E4=B8=BA=E5=B7=B2=E8=B6=85=E6=97=B6=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Services/Warning/Handlers/TransportWarningHandler.cs    | 6 +++++-
 .../Transport/TransportWarningDetailsIndex.cs               | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/SJZY.Track.Application/Services/Warning/Handlers/TransportWarningHandler.cs b/src/SJZY.Track.Application/Services/Warning/Handlers/TransportWarningHandler.cs
index c3eb28f9..cc167d95 100644
--- a/src/SJZY.Track.Application/Services/Warning/Handlers/TransportWarningHandler.cs
+++ b/src/SJZY.Track.Application/Services/Warning/Handlers/TransportWarningHandler.cs
@@ -1197,7 +1197,7 @@ public class TransportWarningHandler : ITransportWarningHandler, ITransientDepen
             .OrderBy(x => x.TrackTime)
             .First();
 
-        return new TransportWarningDetailsIndex
+        var detail = new TransportWarningDetailsIndex
         {
             WarningId = ruleItem.WarningId,
             WarningSceneId = ruleItem.TransportWarningSceneId,
@@ -1234,6 +1234,10 @@ public class TransportWarningHandler : ITransportWarningHandler, ITransientDepen
             //审计属性
             CreateTime = DateTime.Now,
         };
+
+        // 一开始创建预警就可能为已超时的状态
+        detail.Status = detail.CalcStatus();
+        return detail;
     }
 
     private List<WarningNotifyTaskEntity> BuildWarningNotifyTask(List<TransportWarningDetailsIndex> details)
diff --git a/src/SJZY.Track.Domain/Aggregates/WarningAggregate/Transport/TransportWarningDetailsIndex.cs b/src/SJZY.Track.Domain/Aggregates/WarningAggregate/Transport/TransportWarningDetailsIndex.cs
index c128cffa..5d2a0429 100644
--- a/src/SJZY.Track.Domain/Aggregates/WarningAggregate/Transport/TransportWarningDetailsIndex.cs
+++ b/src/SJZY.Track.Domain/Aggregates/WarningAggregate/Transport/TransportWarningDetailsIndex.cs
@@ -88,7 +88,7 @@ public sealed class TransportWarningDetailsIndex : IdBaseIndex
         //时效
         var transportTimeSpan = TimeSpan.FromHours(TransportTimeSpan); //小时
         //累计运输时间
-        var cumulativeTimeSpan = TimeSpan.FromMilliseconds(CumulativeTimeSpan); //毫秒
+        var cumulativeTimeSpan = DateTime.Now.Subtract(StartTrackTime); //毫秒
         //预警时效（预警发出的时间对比于最早轨迹状态时间的跨度）
         var startTrackWarningTimeSpan = TimeSpan.FromHours(StartTrackWarningTimeSpan); //小时