com：对接轨迹推送，新增字段：是否全量推送

src/SJZY.Track.Domain/Aggregates/TrackContentAggregate/TrackContentEntity.cs

@@ -18,6 +18,12 @@ public class TrackContentEntity : IFullAuditedBasicEntitys, IAggregateRoot
     [SugarColumn(ColumnName = "Code")]
     public string Code { get; set; } = null!;
 
+    /// <summary>
+    /// 可交换顺序的轨迹内容id
+    /// </summary>
+    [SugarColumn(ColumnName = "SwapTrackContentId")]
+    public int? SwapTrackContentId { get; set; }
+
     /// <summary>
     /// 轨迹内容
     /// </summary>

src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushConfigDetailOutputVO.cs

@@ -1,9 +1,9 @@
-using SJZY.Expand.ABP.Core.PublicMethords;
+namespace SJZY.Track.Domain.Dtos.TrackPush;
-
-namespace SJZY.Track.Domain.Dtos.TrackPush;
 
 public class GetTrackPushConfigDetailOutputVO
 {
+    public int Id { get; set; }
+
     /// <summary>
     /// 客户id
     /// </summary>
@@ -14,23 +14,11 @@ public class GetTrackPushConfigDetailOutputVO
     /// </summary>
     public string CustomName { get; set; }
 
-    /// <summary>
-    /// 推送扩展字段
-    /// </summary>
-    public string ExpandFieldsName { get; set; }
-
-    public int Id { get; set; }
-
     /// <summary>
     /// 是否自动推送
     /// </summary>
     public bool IsAutoPush { get; set; }
 
-    /// <summary>
-    /// 推送轨迹订单号
-    /// </summary>
-    public string OrderNoName { get; set; }
-
     /// <summary>
     /// 服务商
     /// </summary>
@@ -51,41 +39,6 @@ public class GetTrackPushConfigDetailOutputVO
     /// </summary>
     public int SubSystemId { get; set; }
 
-    /// <summary>
-    /// 推送轨迹时区
-    /// </summary>
-    public string TrackTimeZoneName { get; set; }
-
-    /// <summary>
-    /// 推送轨迹内容代码
-    /// </summary>
-    public string TrackContentCodeName { get; set; }
-
-    /// <summary>
-    /// 推送轨迹内容
-    /// </summary>
-    public string TrackContentName { get; set; }
-
-    /// <summary>
-    /// 推送轨迹内容英文
-    /// </summary>
-    public string TrackEnContentName { get; set; }
-
-    /// <summary>
-    /// 推送轨迹发生地
-    /// </summary>
-    public string TrackPlaceName { get; set; }
-
-    /// <summary>
-    /// 推送轨迹状态
-    /// </summary>
-    public string TrackStatusName { get; set; }
-
-    /// <summary>
-    /// 推送轨迹发生时间
-    /// </summary>
-    public string TrackTimeName { get; set; }
-
     /// <summary>
     /// 是否支持更新
     /// </summary>
@@ -95,4 +48,9 @@ public class GetTrackPushConfigDetailOutputVO
     /// 是否支持删除
     /// </summary>
     public bool IsCanDelete { get; set; }
+
+    /// <summary>
+    /// 是否全量推送
+    /// </summary>
+    public bool IsAllPush { get; set; }
 }

src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushContentDetailOutputVO.cs

@@ -3,16 +3,14 @@
 public class GetTrackPushContentDetailOutputVO
 {
     /// <summary>
-    /// 轨迹内容代码
+    /// 轨迹内容id
     /// </summary>
-    public string Code { get; set; }
+    public int Id { get; set; }
 
     /// <summary>
-    /// 推送扩展字段
+    /// 可交换顺序的轨迹内容id
     /// </summary>
-    public string ExpandFieldsValue { get; set; }
+    public int? SwapTrackContentId { get; set; }
-
-    public int Id { get; set; }
 
     /// <summary>
     /// 推送单号类型
@@ -58,4 +56,9 @@ public class GetTrackPushContentDetailOutputVO
     /// 推送轨迹时区
     /// </summary>
     public double? TrackTimeZone { get; set; }
+
+    /// <summary>
+    /// 推送扩展字段
+    /// </summary>
+    public string ExpandFieldsValue { get; set; }
 }

src/SJZY.Track.Repository/Repositories/TrackPushConfigRepository.cs

@@ -1,7 +1,6 @@
 using System.Linq.Expressions;
 using SJZY.Expand.ABP.Core.PublicMethords;
 using SJZY.Track.Domain.Aggregates.TrackContentAggregate;
-using SJZY.Track.Domain.Aggregates.TrackPullAggregate;
 using SJZY.Track.Domain.Aggregates.TrackPushAggregate;
 using SJZY.Track.Domain.Dtos.Common;
 using SJZY.Track.Domain.Dtos.TrackPush;
@@ -65,11 +64,9 @@ public class TrackPushConfigRepository : BasicRepository<TrackPushConfigEntity>,
                 trackPush.CustomId == externalSubject.Id && !externalSubject.IsDeleted)
             .LeftJoin<VServiceProviderEntity>((trackPush, system, externalSubject, service) =>
                 trackPush.ServiceProviderId == service.Id && !service.IsDeleted)
-            .InnerJoin<TrackPushPullParamsConfigEntity>((trackPush, system, externalSubject, service, paramsConfig) =>
-                trackPush.Id == paramsConfig.PullOrPushConfigId && paramsConfig.IsPush && !paramsConfig.IsDeleted)
             .Filter(null, true)
             .Where(trackPush => trackPush.Id == id && !trackPush.IsDeleted)
-            .Select((trackPush, system, externalSubject, service, paramsConfig) => new GetTrackPushConfigDetailOutputVO
+            .Select((trackPush, system, externalSubject, service) => new GetTrackPushConfigDetailOutputVO
             {
                 Id = trackPush.Id,
                 SubSystem = system.CnName,
@@ -82,12 +79,10 @@ public class TrackPushConfigRepository : BasicRepository<TrackPushConfigEntity>,
     public async Task<GetTrackPushContentDetailOutputVO> GetContentDetailAsync(int id)
     {
         return await Context.Queryable<TrackPushContentConfigEntity>()
-            .InnerJoin<TrackContentEntity>((pushContent, trackContent) => pushContent.TrackContentId == trackContent.Id)
             .Where(pushContent => pushContent.Id == id)
-            .Select((pushContent, trackContent) => new GetTrackPushContentDetailOutputVO
+            .Select(pushContent => new GetTrackPushContentDetailOutputVO
             {
-                Id = pushContent.Id,
+                Id = pushContent.Id
-                Code = trackContent.Code + "-" + trackContent.Content,
             }, true)
             .SingleAsync();
     }