From e73d08309626cb1705b32cf982e35dda9cbb67d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=86=9B?= <2357729423@qq.com> Date: Tue, 2 Apr 2024 09:41:36 +0800 Subject: [PATCH] =?UTF-8?q?com=EF=BC=9A=E5=AF=B9=E6=8E=A5=E8=BD=A8?= =?UTF-8?q?=E8=BF=B9=E6=8E=A8=E9=80=81=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=EF=BC=9A=E6=98=AF=E5=90=A6=E5=85=A8=E9=87=8F=E6=8E=A8?= =?UTF-8?q?=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TrackContentEntity.cs | 6 ++ .../GetTrackPushConfigDetailOutputVO.cs | 58 +++---------------- .../GetTrackPushContentDetailOutputVO.cs | 15 +++-- .../Repositories/TrackPushConfigRepository.cs | 11 +--- 4 files changed, 26 insertions(+), 64 deletions(-) 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(); }