Merge branch 'S07' into test

src/SJZY.Track.Application.Contract/Dtos/TrackPull/EditTrackPullConfigInput.cs

@@ -64,6 +64,11 @@ public class EditTrackPullConfigInput
     /// </summary>
     public string? TrackPlaceName { get; set; }
 
+    /// <summary>
+    /// 轨迹发生ISO时间参数名
+    /// </summary>
+    public string? TrackIsoTimeName { get; set; }
+
     /// <summary>
     /// 轨迹发生时间参数名
     /// </summary>

src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullParamConfigDto.cs

@@ -7,11 +7,6 @@ public class TrackPullParamConfigDto
     /// </summary>
     public string OrderNoName { get; set; } = null!;
 
-    /// <summary>
-    /// 轨迹时区参数名
-    /// </summary>
-    public string? TrackTimeZoneName { get; set; }
-
     /// <summary>
     /// 轨迹代码参数名
     /// </summary>
@@ -32,11 +27,21 @@ public class TrackPullParamConfigDto
     /// </summary>
     public string? TrackStatusName { get; set; }
 
+    /// <summary>
+    /// 轨迹发生ISO时间参数名
+    /// </summary>
+    public string? TrackIsoTimeName { get; set; }
+
     /// <summary>
     /// 轨迹发生时间参数名
     /// </summary>
     public string? TrackTimeName { get; set; }
 
+    /// <summary>
+    /// 轨迹时区参数名
+    /// </summary>
+    public string? TrackTimeZoneName { get; set; }
+
     /// <summary>
     /// 订单数组路径
     /// </summary>

src/SJZY.Track.Application/Options/InterfaceRelayParamsConfigOptions.cs

@@ -37,6 +37,11 @@ public class InterfaceRelayParamsConfigOptions
     /// </summary>
     public string TrackPlaceName { get; set; }
 
+    /// <summary>
+    /// 轨迹发生ISO时间参数名
+    /// </summary>
+    public string TrackIsoTimeName { get; set; }
+
     /// <summary>
     /// 轨迹发生时间参数名
     /// </summary>

src/SJZY.Track.Application/Rabbit/TrackRefreshEventHandler.cs

@@ -211,18 +211,22 @@ public class TrackRefreshEventHandler : ITransientDependency, IRabbitHandler
             }
         }
 
+        // 轨迹发生ISO时间
+        var trackIsoTime = paramConfig.TrackIsoTimeName == null
+            ? null
+            : trackToken[paramConfig.TrackIsoTimeName]?.ToObject<DateTimeOffset>();
         // 轨迹发生时间
-        var trackTime = paramConfig.TrackTimeName == null
+        var trackTime = trackIsoTime?.DateTime ?? (paramConfig.TrackTimeName == null
             ? null
-            : trackToken[paramConfig.TrackTimeName]?.Value<DateTime>();
+            : trackToken[paramConfig.TrackTimeName]?.ToObject<DateTime>());
         // 轨迹发生时区
-        var trackTimeZone = paramConfig.TrackTimeZoneName == null
+        var trackTimeZone = (float?) trackIsoTime?.Offset.TotalHours ?? (paramConfig.TrackTimeZoneName == null
             ? null
-            : trackToken[paramConfig.TrackTimeZoneName]?.Value<float>();
+            : trackToken[paramConfig.TrackTimeZoneName]?.ToObject<float>());
         // 轨迹发生地
         var trackPlace = paramConfig.TrackPlaceName == null
             ? null
-            : trackToken[paramConfig.TrackPlaceName]?.Value<string>();
+            : trackToken[paramConfig.TrackPlaceName]?.ToObject<string>();
 
 
         if (matchedContentConfig is null)

src/SJZY.Track.Application/Services/TrackPull/TrackPullService.cs

@@ -130,6 +130,7 @@ public class TrackPullService : ApplicationService
                         trackPullEntity.TrackStatusName = paramsConfig.TrackStatusName;
                         trackPullEntity.TrackContentName = paramsConfig.TrackContentName;
                         trackPullEntity.TrackPlaceName = paramsConfig.TrackPlaceName;
+                        trackPullEntity.TrackIsoTimeName = paramsConfig.TrackIsoTimeName;
                         trackPullEntity.TrackTimeName = paramsConfig.TrackTimeName;
                         trackPullEntity.TrackTimeZoneName = paramsConfig.TrackTimeZoneName;
                     }
@@ -161,6 +162,7 @@ public class TrackPullService : ApplicationService
                         oldTrackPullEntity.TrackStatusName = paramsConfig.TrackStatusName;
                         oldTrackPullEntity.TrackContentName = paramsConfig.TrackContentName;
                         oldTrackPullEntity.TrackPlaceName = paramsConfig.TrackPlaceName;
+                        oldTrackPullEntity.TrackIsoTimeName = paramsConfig.TrackIsoTimeName;
                         oldTrackPullEntity.TrackTimeName = paramsConfig.TrackTimeName;
                         oldTrackPullEntity.TrackTimeZoneName = paramsConfig.TrackTimeZoneName;
                     }

src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPullConfigEntity.cs

@@ -78,6 +78,12 @@ public class TrackPullConfigEntity : IFullAuditedBasicEntitys, IAggregateRoot
     [SugarColumn(ColumnName = "TrackPlaceName")]
     public string? TrackPlaceName { get; set; }
 
+    /// <summary>
+    /// 轨迹发生ISO时间参数名
+    /// </summary>
+    [SugarColumn(ColumnName = "TrackIsoTimeName")]
+    public string? TrackIsoTimeName { get; set; }
+
     /// <summary>
     /// 轨迹发生时间参数名
     /// </summary>

src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullConfigDetailOutputVO.cs

@@ -39,6 +39,16 @@ public class GetTrackPullConfigDetailOutputVO
     /// </summary>
     public int SubSystemId { get; set; }
 
+    /// <summary>
+    /// 轨迹发生ISO时间参数名
+    /// </summary>
+    public string? TrackIsoTimeName { get; set; }
+
+    /// <summary>
+    /// 拉取轨迹发生时间
+    /// </summary>
+    public string TrackTimeName { get; set; }
+
     /// <summary>
     /// 拉取轨迹时区
     /// </summary>
@@ -64,11 +74,6 @@ public class GetTrackPullConfigDetailOutputVO
     /// </summary>
     public string TrackStatusName { get; set; }
 
-    /// <summary>
-    /// 拉取轨迹发生时间
-    /// </summary>
-    public string TrackTimeName { get; set; }
-
     /// <summary>
     /// 订单路径
     /// </summary>