From f3da66267faeb2503aa09b11ee9c79132b45cedd Mon Sep 17 00:00:00 2001 From: hardstylewyl <827778732@qq.com> Date: Mon, 24 Mar 2025 14:38:03 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E8=A7=84=E5=88=99?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=8F=8F=E8=BF=B0=E6=A0=BC=E5=BC=8F=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WarningAggregate/Transport/TransportWarningDetailsIndex.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SJZY.Track.Domain/Aggregates/WarningAggregate/Transport/TransportWarningDetailsIndex.cs b/src/SJZY.Track.Domain/Aggregates/WarningAggregate/Transport/TransportWarningDetailsIndex.cs index bd8f35ee..7a066991 100644 --- a/src/SJZY.Track.Domain/Aggregates/WarningAggregate/Transport/TransportWarningDetailsIndex.cs +++ b/src/SJZY.Track.Domain/Aggregates/WarningAggregate/Transport/TransportWarningDetailsIndex.cs @@ -133,7 +133,7 @@ public sealed class TransportWarningDetailsIndex : IdBaseIndex // 规则配置信息 res.Append($"，生成预警时间{ruleItem.StartTrackWarningTimeSpan}小时" + - $"，时效{ruleItem.TransportTimeSpan}}}小时"); + $"，时效{ruleItem.TransportTimeSpan}小时}}"); return res.ToString(); } From 13dc04b25288dd091af0e280208ba5f9bc6884a8 Mon Sep 17 00:00:00 2001 From: hardstylewyl <827778732@qq.com> Date: Mon, 24 Mar 2025 14:49:00 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E8=BF=90=E8=BE=93?= =?UTF-8?q?=E6=97=B6=E6=95=88=E9=A2=84=E8=AD=A6=E6=94=B6=E5=88=B0=E6=88=AA?= =?UTF-8?q?=E6=AD=A2=E8=BD=A8=E8=BF=B9=E6=97=B6=E7=9A=84=E7=B4=AF=E8=AE=A1?= =?UTF-8?q?=E8=BF=90=E8=BE=93=E8=AE=A1=E7=AE=97=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/Warning/Handlers/TransportWarningHandler.cs | 6 +++--- .../Transport/TransportWarningDetailsIndex.cs | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/SJZY.Track.Application/Services/Warning/Handlers/TransportWarningHandler.cs b/src/SJZY.Track.Application/Services/Warning/Handlers/TransportWarningHandler.cs index e8e68021..e89dad64 100644 --- a/src/SJZY.Track.Application/Services/Warning/Handlers/TransportWarningHandler.cs +++ b/src/SJZY.Track.Application/Services/Warning/Handlers/TransportWarningHandler.cs @@ -381,15 +381,15 @@ public class TransportWarningHandler : ITransportWarningHandler, ITransientDepen if (detail.CalcStatus() == TransportWarningStatus.已超时.GetHashCode()) detail.Status = TransportWarningStatus.超时完成.GetHashCode(); - // 维护累计运输时间（由于变更为终止态，此时为最后一次变更） - detail.CumulativeTimeSpan = detail.CalcCumulativeTimeSpan(); - // 填充终止状态轨迹信息 detail.EndTrackContentId = earliestTrack.TrackContentId; detail.EndTrackContent = earliestTrack.TrackContent; detail.EndTrackTime = earliestTrack.TrackTime; detail.EndTrackTimeZone = earliestTrack.TrackTimeZone; + // 维护累计运输时间（由于变更为终止态，此时为最后一次变更） + detail.CumulativeTimeSpan = detail.CalcCumulativeTimeSpan(); + updateDetails.Add(detail); closeNotifyDetailIds.Add(detail.Id); continue; diff --git a/src/SJZY.Track.Domain/Aggregates/WarningAggregate/Transport/TransportWarningDetailsIndex.cs b/src/SJZY.Track.Domain/Aggregates/WarningAggregate/Transport/TransportWarningDetailsIndex.cs index 7a066991..38d221c6 100644 --- a/src/SJZY.Track.Domain/Aggregates/WarningAggregate/Transport/TransportWarningDetailsIndex.cs +++ b/src/SJZY.Track.Domain/Aggregates/WarningAggregate/Transport/TransportWarningDetailsIndex.cs @@ -4,6 +4,7 @@ using Nest; using SJZY.Expand.ElasticSearch; using SJZY.Track.Domain.Aggregates.KPIAreaAggregate; using SJZY.Track.Domain.Consts; +using SJZY.Track.Domain.Enums; namespace SJZY.Track.Domain.Aggregates.WarningAggregate.Transport; @@ -76,6 +77,11 @@ public sealed class TransportWarningDetailsIndex : IdBaseIndex public long CalcCumulativeTimeSpan() { + // 已完成/超时完成，截止轨迹时间 - 起始轨迹时间 + if (Status is (int) TransportWarningStatus.已完成 or (int) TransportWarningStatus.超时完成) + return (long)EndTrackTime!.Value.Subtract(StartTrackTime).TotalMilliseconds; + + // 已关闭，当前时间 - 起始轨迹时间 return (long)DateTime.Now.Subtract(StartTrackTime).TotalMilliseconds; }