diff --git a/src/SJZY.Track.Domain/Aggregates/TrackContentAggregate/TrackContentEntity.cs b/src/SJZY.Track.Domain/Aggregates/TrackContentAggregate/TrackContentEntity.cs
index 02fac985..1aa78c87 100644
--- a/src/SJZY.Track.Domain/Aggregates/TrackContentAggregate/TrackContentEntity.cs
+++ b/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!;
+ ///
+ /// 可交换顺序的轨迹内容id
+ ///
+ [SugarColumn(ColumnName = "SwapTrackContentId")]
+ public int? SwapTrackContentId { get; set; }
+
///
/// 轨迹内容
///
diff --git a/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushConfigDetailOutputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushConfigDetailOutputVO.cs
index 9b3255ab..ef8ea329 100644
--- a/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushConfigDetailOutputVO.cs
+++ b/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; }
+
///
/// 客户id
///
@@ -14,23 +14,11 @@ public class GetTrackPushConfigDetailOutputVO
///
public string CustomName { get; set; }
- ///
- /// 推送扩展字段
- ///
- public string ExpandFieldsName { get; set; }
-
- public int Id { get; set; }
-
///
/// 是否自动推送
///
public bool IsAutoPush { get; set; }
- ///
- /// 推送轨迹订单号
- ///
- public string OrderNoName { get; set; }
-
///
/// 服务商
///
@@ -51,41 +39,6 @@ public class GetTrackPushConfigDetailOutputVO
///
public int SubSystemId { get; set; }
- ///
- /// 推送轨迹时区
- ///
- public string TrackTimeZoneName { get; set; }
-
- ///
- /// 推送轨迹内容代码
- ///
- public string TrackContentCodeName { get; set; }
-
- ///
- /// 推送轨迹内容
- ///
- public string TrackContentName { get; set; }
-
- ///
- /// 推送轨迹内容英文
- ///
- public string TrackEnContentName { get; set; }
-
- ///
- /// 推送轨迹发生地
- ///
- public string TrackPlaceName { get; set; }
-
- ///
- /// 推送轨迹状态
- ///
- public string TrackStatusName { get; set; }
-
- ///
- /// 推送轨迹发生时间
- ///
- public string TrackTimeName { get; set; }
-
///
/// 是否支持更新
///
@@ -95,4 +48,9 @@ public class GetTrackPushConfigDetailOutputVO
/// 是否支持删除
///
public bool IsCanDelete { get; set; }
+
+ ///
+ /// 是否全量推送
+ ///
+ public bool IsAllPush { get; set; }
}
\ No newline at end of file
diff --git a/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushContentDetailOutputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushContentDetailOutputVO.cs
index ace2b3df..3656b6f6 100644
--- a/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushContentDetailOutputVO.cs
+++ b/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushContentDetailOutputVO.cs
@@ -3,16 +3,14 @@
public class GetTrackPushContentDetailOutputVO
{
///
- /// 轨迹内容代码
+ /// 轨迹内容id
///
- public string Code { get; set; }
+ public int Id { get; set; }
///
- /// 推送扩展字段
+ /// 可交换顺序的轨迹内容id
///
- public string ExpandFieldsValue { get; set; }
-
- public int Id { get; set; }
+ public int? SwapTrackContentId { get; set; }
///
/// 推送单号类型
@@ -58,4 +56,9 @@ public class GetTrackPushContentDetailOutputVO
/// 推送轨迹时区
///
public double? TrackTimeZone { get; set; }
+
+ ///
+ /// 推送扩展字段
+ ///
+ public string ExpandFieldsValue { get; set; }
}
\ No newline at end of file
diff --git a/src/SJZY.Track.Repository/Repositories/TrackPushConfigRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackPushConfigRepository.cs
index 41f4e708..43bbae70 100644
--- a/src/SJZY.Track.Repository/Repositories/TrackPushConfigRepository.cs
+++ b/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,
trackPush.CustomId == externalSubject.Id && !externalSubject.IsDeleted)
.LeftJoin((trackPush, system, externalSubject, service) =>
trackPush.ServiceProviderId == service.Id && !service.IsDeleted)
- .InnerJoin((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,
public async Task GetContentDetailAsync(int id)
{
return await Context.Queryable()
- .InnerJoin((pushContent, trackContent) => pushContent.TrackContentId == trackContent.Id)
.Where(pushContent => pushContent.Id == id)
- .Select((pushContent, trackContent) => new GetTrackPushContentDetailOutputVO
+ .Select(pushContent => new GetTrackPushContentDetailOutputVO
{
- Id = pushContent.Id,
- Code = trackContent.Code + "-" + trackContent.Content,
+ Id = pushContent.Id
}, true)
.SingleAsync();
}