Merge branch 'S03-轨迹中台' into dev

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

@@ -12,12 +12,6 @@ public class TrackPushPullParamsConfigEntity : IFullAuditedBasicEntitys, IEntity
     [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)]
     public int Id { get; set; }
 
-    /// <summary>
-    /// 扩展字段参数名
-    /// </summary>
-    [SugarColumn(ColumnName = "ExpandFieldsName")]
-    public string ExpandFieldsName { get; set; }
-
     /// <summary>
     /// 推拉模式，0拉取，1推送
     /// </summary>
@@ -28,7 +22,7 @@ public class TrackPushPullParamsConfigEntity : IFullAuditedBasicEntitys, IEntity
     /// 单号参数名
     /// </summary>
     [SugarColumn(ColumnName = "OrderNoName")]
-    public string OrderNoName { get; set; }
+    public string OrderNoName { get; set; } = null!;
 
     /// <summary>
     /// 推拉配置id
@@ -40,53 +34,59 @@ public class TrackPushPullParamsConfigEntity : IFullAuditedBasicEntitys, IEntity
     /// 轨迹时区参数名
     /// </summary>
     [SugarColumn(ColumnName = "TrackTimeZoneName")]
-    public string TrackTimeZoneName { get; set; }
+    public string? TrackTimeZoneName { get; set; }
 
     /// <summary>
     /// 轨迹代码参数名
     /// </summary>
     [SugarColumn(ColumnName = "TrackContentCodeName")]
-    public string TrackContentCodeName { get; set; }
+    public string? TrackContentCodeName { get; set; }
 
     /// <summary>
     /// 轨迹内容参数名
     /// </summary>
     [SugarColumn(ColumnName = "TrackContentName")]
-    public string TrackContentName { get; set; }
+    public string? TrackContentName { get; set; }
 
     /// <summary>
     /// 轨迹内容英文参数名
     /// </summary>
     [SugarColumn(ColumnName = "TrackEnContentName")]
-    public string TrackEnContentName { get; set; }
+    public string? TrackEnContentName { get; set; }
 
     /// <summary>
     /// 轨迹发生地参数名
     /// </summary>
     [SugarColumn(ColumnName = "TrackPlaceName")]
-    public string TrackPlaceName { get; set; }
+    public string? TrackPlaceName { get; set; }
 
     /// <summary>
     /// 轨迹状态参数名
     /// </summary>
     [SugarColumn(ColumnName = "TrackStatusName")]
-    public string TrackStatusName { get; set; }
+    public string? TrackStatusName { get; set; }
 
     /// <summary>
     /// 轨迹发生时间参数名
     /// </summary>
     [SugarColumn(ColumnName = "TrackTimeName")]
-    public string TrackTimeName { get; set; }
+    public string? TrackTimeName { get; set; }
 
     /// <summary>
     /// 订单路径
     /// </summary>
     [SugarColumn(ColumnName = "OrderPath")]
-    public string OrderPath { get; set; }
+    public string? OrderPath { get; set; }
 
     /// <summary>
     /// 轨迹明细路径
     /// </summary>
     [SugarColumn(ColumnName = "TrackDetailsPath")]
-    public string TrackDetailsPath { get; set; }
+    public string? TrackDetailsPath { get; set; }
+
+    /// <summary>
+    /// 扩展字段参数名
+    /// </summary>
+    [SugarColumn(ColumnName = "ExpandFieldsName")]
+    public string? ExpandFieldsName { get; set; }
 }

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

@@ -5,14 +5,14 @@ public class GetTrackPullContentDetailOutputVO
     /// <summary>
     /// 轨迹内容代码
     /// </summary>
-    public string Code { get; set; }
+    public string Code { get; set; } = null!;
 
     public int Id { get; set; }
 
     /// <summary>
     /// 拉取轨迹内容代码
     /// </summary>
-    public string TrackContentCodeValue { get; set; }
+    public string? TrackContentCodeValue { get; set; }
 
     /// <summary>
     /// 轨迹内容id
@@ -22,12 +22,12 @@ public class GetTrackPullContentDetailOutputVO
     /// <summary>
     /// 拉取轨迹内容
     /// </summary>
-    public string TrackContentValue { get; set; }
+    public string? TrackContentValue { get; set; }
 
     /// <summary>
     /// 拉取轨迹关键字（正向）
     /// </summary>
-    public string TrackKeyword { get; set; }
+    public string? TrackKeyword { get; set; }
 
     /// <summary>
     /// 拉取轨迹关键字（正向）
@@ -37,7 +37,7 @@ public class GetTrackPullContentDetailOutputVO
     /// <summary>
     /// 拉取轨迹关键字（反向）
     /// </summary>
-    public string TrackKeywordReverse { get; set; }
+    public string? TrackKeywordReverse { get; set; }
 
     /// <summary>
     /// 拉取轨迹关键字（反向）
@@ -57,10 +57,15 @@ public class GetTrackPullContentDetailOutputVO
     /// <summary>
     /// 拉取轨迹状态
     /// </summary>
-    public string TrackStatusValue { get; set; }
+    public string? TrackStatusValue { get; set; }
 
     /// <summary>
     /// 拉取轨迹时区
     /// </summary>
     public double? TrackTimeZone { get; set; }
+
+    /// <summary>
+    /// 是否完结
+    /// </summary>
+    public bool IsCompleted { get; set; }
 }