feat：移除推送内容配置的兜底时区和扩展字段

src/TrackCenter.Application/CAP/EventHandlers/TrackPushEventHandler.cs

@@ -379,8 +379,8 @@ public class TrackPushEventHandler : ITransientDependency, ICapSubscribe
     // 构建更新推送请求体
     private static TrackUpdateInput BuiltUpdateItem(TrackPushContentConfigDto config, TrackPushRecordIndex log)
     {
-        var trackDatetime = log.TrackTime.AddHours(config.TrackTimeZone ?? log.TrackTimeZone - log.TrackTimeZone);
+        var trackDatetime = log.TrackTime.AddHours(log.TrackTimeZone - log.TrackTimeZone);
-        var trackDateStr = DateTimeFormat(trackDatetime, config.TrackTimeZone ?? log.TrackTimeZone, config);
+        var trackDateStr = DateTimeFormat(trackDatetime, log.TrackTimeZone, config);
 
         var body = new TrackUpdateInput
         {
@@ -394,7 +394,7 @@ public class TrackPushEventHandler : ITransientDependency, ICapSubscribe
             // 推真实的发生地和发生时间（时间是计算后的）
             { "location", log.TrackPlace },
             { "date", trackDateStr },
-            { "timeZone", config.TrackTimeZone ?? log.TrackTimeZone },
+            { "timeZone", log.TrackTimeZone },
             { "description", config.TrackEnContentValue },
             { "descriptionCn", config.TrackContentValue },
             { "code", config.TrackContentCodeValue },
@@ -410,8 +410,8 @@ public class TrackPushEventHandler : ITransientDependency, ICapSubscribe
     // 构建新增推送请求体
     private async Task<TrackPushInput> BuiltPushItem(TrackPushContentConfigDto config, TrackPushRecordIndex log, string? compareFields)
     {
-        var trackDatetime = log.TrackTime.AddHours(config.TrackTimeZone ?? log.TrackTimeZone - log.TrackTimeZone);
+        var trackDatetime = log.TrackTime.AddHours(log.TrackTimeZone - log.TrackTimeZone);
-        var trackDateStr = DateTimeFormat(trackDatetime, config.TrackTimeZone ?? log.TrackTimeZone, config);
+        var trackDateStr = DateTimeFormat(trackDatetime, log.TrackTimeZone, config);
 
         var body = new TrackPushInput
         {
@@ -424,7 +424,7 @@ public class TrackPushEventHandler : ITransientDependency, ICapSubscribe
             { GlobalConst.TrackPushTrackVersionDictKey, log.TrackVersion },
             // 推真实的发生地和发生时间（时间是计算后的）
             { "date", trackDateStr },
-            { "timeZone", config.TrackTimeZone ?? log.TrackTimeZone },
+            { "timeZone", log.TrackTimeZone },
             { "location", log.TrackPlace },
             { "description", config.TrackEnContentValue },
             { "descriptionCn", config.TrackContentValue },
@@ -452,7 +452,7 @@ public class TrackPushEventHandler : ITransientDependency, ICapSubscribe
                             : null;
                         if (matchConfig == null) return null;
                         var code = matchConfig.TrackContentCodeValue;
-                        var timeStr = DateTimeFormat(x.TrackTime, config.TrackTimeZone ?? log.TrackTimeZone, config);
+                        var timeStr = DateTimeFormat(x.TrackTime, log.TrackTimeZone, config);
                         return string.IsNullOrWhiteSpace(compareFields)
                             ? $"{code}{timeStr}"
                             : $"{code}{TextJsonHelper.ExtractValue(x.Extra, compareFields)}";

src/TrackCenter.Application/Dtos/TrackPush/EditTrackPushContentInput.cs

@@ -2,11 +2,6 @@ namespace TrackCenter.Application.Dtos.TrackPush;
 
 public class EditTrackPushContentInput
 {
-    /// <summary>
-    /// 扩展字段参数值
-    /// </summary>
-    public string? ExpandFieldsValue { get; set; }
-
     public int? Id { get; set; }
 
     /// <summary>
@@ -58,9 +53,4 @@ public class EditTrackPushContentInput
     /// 轨迹状态参数值
     /// </summary>
     public string? TrackStatusValue { get; set; }
-
-    /// <summary>
-    /// 轨迹时区GMT
-    /// </summary>
-    public double? TrackTimeZone { get; set; }
 }

src/TrackCenter.Application/Dtos/TrackPush/TrackPushContentConfigDto.cs

@@ -88,17 +88,6 @@ public class TrackPushContentConfigDto
     /// </summary>
     public string? TrackStatusValue { get; set; }
 
-    /// <summary>
-    /// 轨迹时区GMT
-    /// </summary>
-    public double? TrackTimeZone { get; set; }
-
-    /// <summary>
-    /// 扩展字段参数值
-    /// </summary>
-    [Obsolete("废弃属性，调整为从轨迹明细扩展中获取扩展值填入")]
-    public string? ExpandFieldsValue { get; set; }
-
     /// <summary>
     /// 时间格式枚举
     /// </summary>

src/TrackCenter.Application/Services/TrackPush/TrackPushCacheService.cs

@@ -90,10 +90,7 @@ public class TrackPushCacheService : ITransientDependency
             TrackStatusValue = item.TrackStatusValue,
             TrackContentCodeValue = item.TrackContentCodeValue,
             TrackContentValue = item.TrackContentValue,
-            TrackEnContentValue = item.TrackEnContentValue,
+            TrackEnContentValue = item.TrackEnContentValue
-            TrackTimeZone = item.TrackTimeZone,
-            // todo：废弃字段如果没有外部应用依赖，可以逐步删除
-            ExpandFieldsValue = item.ExpandFieldsValue,
         }).ToList();
 
         return res;

src/TrackCenter.Domain/Aggregates/TrackPushAggregate/TrackPushContentConfigEntity.cs

@@ -68,16 +68,4 @@ public class TrackPushContentConfigEntity : FullAuditedEntity<int, int>
     /// </summary>
     [SugarColumn(ColumnName = "TrackStatusValue")]
     public string TrackStatusValue { get; set; }
-
-    /// <summary>
-    /// 轨迹时区GMT
-    /// </summary>
-    [SugarColumn(ColumnName = "TrackTimeZone")]
-    public double? TrackTimeZone { get; set; }
-
-    /// <summary>
-    /// 扩展字段参数值
-    /// </summary>
-    [SugarColumn(ColumnName = "ExpandFieldsValue")]
-    public string ExpandFieldsValue { get; set; }
 }

src/TrackCenter.Domain/Dtos/TrackPull/GetTrackPullConfigDetailOutputVO.cs

@@ -36,6 +36,11 @@ public class GetTrackPullConfigDetailOutputVO
     /// </summary>
     public string AppKey { get; set; }
 
+    /// <summary>
+    /// 轨迹扩展信息参数名集合（逗号分割）
+    /// </summary>
+    public string? TrackExtraNames { get; set; }
+
     /// <summary>
     /// 轨迹发生ISO时间参数名
     /// </summary>

src/TrackCenter.Domain/Dtos/TrackPush/GetTrackPushContentDetailOutputVO.cs

@@ -51,14 +51,4 @@ public class GetTrackPushContentDetailOutputVO
     /// 推送轨迹状态
     /// </summary>
     public string TrackStatusValue { get; set; }
-
-    /// <summary>
-    /// 推送轨迹时区
-    /// </summary>
-    public double? TrackTimeZone { get; set; }
-
-    /// <summary>
-    /// 推送扩展字段
-    /// </summary>
-    public string ExpandFieldsValue { get; set; }
 }

src/TrackCenter.Domain/Dtos/TrackPush/GetTrackPushContentPageOutputVO.cs

@@ -4,6 +4,11 @@ namespace TrackCenter.Domain.Dtos.TrackPush;
 
 public class GetTrackPushContentPageOutputVO
 {
+    /// <summary>
+    /// 推送内容配置唯一id
+    /// </summary>
+    public int Id { get; set; }
+
     /// <summary>
     /// 轨迹内容代码
     /// </summary>
@@ -24,13 +29,6 @@ public class GetTrackPushContentPageOutputVO
     /// </summary>
     public string EnContent { get; set; }
 
-    /// <summary>
-    /// 推送扩展字段
-    /// </summary>
-    public string ExpandFieldsValue { get; set; }
-
-    public int Id { get; set; }
-
     /// <summary>
     /// 推送单号类型
     /// </summary>

src/TrackCenter.Domain/Dtos/TrackPush/TrackPushContentConfigVO.cs

@@ -76,14 +76,4 @@ public class TrackPushContentConfigVO
     /// 轨迹状态参数值
     /// </summary>
     public string? TrackStatusValue { get; set; }
-
-    /// <summary>
-    /// 轨迹时区GMT
-    /// </summary>
-    public double? TrackTimeZone { get; set; }
-
-    /// <summary>
-    /// 扩展字段参数值
-    /// </summary>
-    public string? ExpandFieldsValue { get; set; }
 }

src/TrackCenter.Repository/Repositories/TrackPullConfigRepository.cs

@@ -94,18 +94,6 @@ public class TrackPullConfigRepository : BasicRepository<TrackPullConfigEntity>,
                     OrderNoName = trackPull.OrderNoName,
                     ParseMethod = (int)trackPull.ParseMethod,
                     TrackIsoTimeName = trackPull.TrackIsoTimeName,
-                    TrackTimeName = trackPull.TrackTimeName,
-                    TrackTimeZoneName = trackPull.TrackTimeZoneName,
-                    TrackContentCodeName = trackPull.TrackContentCodeName,
-                    TrackContentName = trackPull.TrackContentName,
-                    TrackPlaceName = trackPull.TrackPlaceName,
-                    TrackStatusName = trackPull.TrackStatusName,
-                    OrderPath = trackPull.OrderPath,
-                    TrackDetailsPath = trackPull.TrackDetailsPath,
-                    StartTrackCode = trackPull.StartTrackCode,
-                    EndTrackCode = trackPull.EndTrackCode,
-                    SilenceBeforeStart = trackPull.SilenceBeforeStart,
-                    SilenceAfterEnd = trackPull.SilenceAfterEnd
                 }, true)
             .FirstAsync();
     }

src/TrackCenter.Repository/Repositories/TrackPushConfigRepository.cs

@@ -140,9 +140,7 @@ public class TrackPushConfigRepository : BasicRepository<TrackPushConfigEntity>,
                 TrackContentCodeValue = b.TrackContentCodeValue,
                 TrackContentValue = b.TrackContentValue,
                 TrackEnContentValue = b.TrackEnContentValue,
-                TrackStatusValue = b.TrackStatusValue,
+                TrackStatusValue = b.TrackStatusValue
-                TrackTimeZone = b.TrackTimeZone,
-                ExpandFieldsValue = b.ExpandFieldsValue,
             })
             .ToListAsync();
     }