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 960e3ae2..06867d52 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/ReturnWarningDetailsDto.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/ReturnWarningDetailsDto.cs @@ -119,19 +119,19 @@ public sealed class ReturnWarningDetailsDto // todo:计算属性 /// - /// 实际回传用时(单位毫秒) + /// 实际回传用时(单位毫秒)e.g 00天00小时00分钟 / -- /// - public long? ActualReturnTimeSpan { get; set; } + public string ActualReturnTimeSpan { get; set; } /// - /// 系统回传用时(单位毫秒) + /// 系统回传用时(单位毫秒)e.g 00天00小时00分钟 / -- /// - public long? SystemReturnTimeSpan { get; set; } + public string SystemReturnTimeSpan { get; set; } /// - /// 轨迹创建用时(单位毫秒) + /// 轨迹创建用时(单位毫秒)e.g 00天00小时00分钟 / -- /// - public long TrackCreateTimeSpan { get; set; } + public string TrackCreateTimeSpan { get; set; } /// /// 是否有KPI考核 diff --git a/src/SJZY.Track.Application/Services/Warning/ReturnWarningService.cs b/src/SJZY.Track.Application/Services/Warning/ReturnWarningService.cs index e502d63f..46f8d84e 100644 --- a/src/SJZY.Track.Application/Services/Warning/ReturnWarningService.cs +++ b/src/SJZY.Track.Application/Services/Warning/ReturnWarningService.cs @@ -145,9 +145,9 @@ public class ReturnWarningService : ApplicationService PushTrackStatus = x.PushTrackStatus, PushTrackContent = x.PushTrackContent, // todo:计算属性 - ActualReturnTimeSpan = x.ActualReturnTimeSpan, - SystemReturnTimeSpan = x.SystemReturnTimeSpan, - TrackCreateTimeSpan = x.TrackCreateTimeSpan, + ActualReturnTimeSpan = FormatTimeSpan(x.ActualReturnTimeSpan), + SystemReturnTimeSpan = FormatTimeSpan(x.SystemReturnTimeSpan), + TrackCreateTimeSpan = FormatTimeSpan(x.TrackCreateTimeSpan), // 具体描述 TrackReturnTime = x.TrackReturnTime, @@ -192,6 +192,14 @@ public class ReturnWarningService : ApplicationService var flag = timezone > 0f ? "+" : ""; return $"GMT {flag}{timeZoneStr.RemovePostFix(":00")}"; } + + // 时间 + string FormatTimeSpan(long? milliseconds) + { + if (!milliseconds.HasValue) return GlobalConst.EmptyString; + var timeSpan = TimeSpan.FromMilliseconds(milliseconds.Value); + return $"{timeSpan.Days:00}天{timeSpan.Hours:00}小时{timeSpan.Minutes:00}分钟"; + } } ///