Merge branch 'S07' into test

src/SJZY.Track.Application.Contract/Dtos/Warning/Return/ReturnWarningDetailsDto.cs

@@ -119,19 +119,19 @@ public sealed class ReturnWarningDetailsDto
     // todo:计算属性
 
     /// <summary>
-    /// 实际回传用时（单位毫秒）
+    /// 实际回传用时（单位毫秒）e.g 00天00小时00分钟 / --
     /// </summary>
-    public long? ActualReturnTimeSpan { get; set; }
+    public string ActualReturnTimeSpan { get; set; }
 
     /// <summary>
-    /// 系统回传用时（单位毫秒）
+    /// 系统回传用时（单位毫秒）e.g 00天00小时00分钟 / --
     /// </summary>
-    public long? SystemReturnTimeSpan { get; set; }
+    public string SystemReturnTimeSpan { get; set; }
 
     /// <summary>
-    /// 轨迹创建用时（单位毫秒）
+    /// 轨迹创建用时（单位毫秒）e.g 00天00小时00分钟 / --
     /// </summary>
-    public long TrackCreateTimeSpan { get; set; }
+    public string TrackCreateTimeSpan { get; set; }
 
     /// <summary>
     /// 是否有KPI考核

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,
+            ActualReturnTimeSpan = FormatTimeSpan(x.ActualReturnTimeSpan),
-            SystemReturnTimeSpan = x.SystemReturnTimeSpan,
+            SystemReturnTimeSpan = FormatTimeSpan(x.SystemReturnTimeSpan),
-            TrackCreateTimeSpan = x.TrackCreateTimeSpan,
+            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}分钟";
+        }
     }
 
     /// <summary>