From ecfcf8b5fb7d4320de401dee8722c15007063a5b Mon Sep 17 00:00:00 2001 From: xiaolipro <2357729423@qq.com> Date: Wed, 28 Jan 2026 16:20:07 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E7=A7=BB=E9=99=A4=E6=8E=A8?= =?UTF-8?q?=E9=80=81=E5=86=85=E5=AE=B9=E9=85=8D=E7=BD=AE=E7=9A=84=E5=85=9C?= =?UTF-8?q?=E5=BA=95=E6=97=B6=E5=8C=BA=E5=92=8C=E6=89=A9=E5=B1=95=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CAP/EventHandlers/TrackPushEventHandler.cs | 14 +++++++------- .../Dtos/TrackPush/EditTrackPushContentInput.cs | 10 ---------- .../Dtos/TrackPush/TrackPushContentConfigDto.cs | 11 ----------- .../Services/TrackPush/TrackPushCacheService.cs | 5 +---- .../TrackPushContentConfigEntity.cs | 12 ------------ .../TrackPull/GetTrackPullConfigDetailOutputVO.cs | 5 +++++ .../TrackPush/GetTrackPushContentDetailOutputVO.cs | 10 ---------- .../TrackPush/GetTrackPushContentPageOutputVO.cs | 12 +++++------- .../Dtos/TrackPush/TrackPushContentConfigVO.cs | 10 ---------- .../Repositories/TrackPullConfigRepository.cs | 12 ------------ .../Repositories/TrackPushConfigRepository.cs | 4 +--- 11 files changed, 19 insertions(+), 86 deletions(-) diff --git a/src/TrackCenter.Application/CAP/EventHandlers/TrackPushEventHandler.cs b/src/TrackCenter.Application/CAP/EventHandlers/TrackPushEventHandler.cs index 65245152..ffaa9ec2 100644 --- a/src/TrackCenter.Application/CAP/EventHandlers/TrackPushEventHandler.cs +++ b/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 trackDateStr = DateTimeFormat(trackDatetime, config.TrackTimeZone ?? log.TrackTimeZone, config); + var trackDatetime = log.TrackTime.AddHours(log.TrackTimeZone - log.TrackTimeZone); + 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 BuiltPushItem(TrackPushContentConfigDto config, TrackPushRecordIndex log, string? compareFields) { - var trackDatetime = log.TrackTime.AddHours(config.TrackTimeZone ?? log.TrackTimeZone - log.TrackTimeZone); - var trackDateStr = DateTimeFormat(trackDatetime, config.TrackTimeZone ?? log.TrackTimeZone, config); + var trackDatetime = log.TrackTime.AddHours(log.TrackTimeZone - log.TrackTimeZone); + 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)}"; diff --git a/src/TrackCenter.Application/Dtos/TrackPush/EditTrackPushContentInput.cs b/src/TrackCenter.Application/Dtos/TrackPush/EditTrackPushContentInput.cs index 39e19fb1..0d848535 100644 --- a/src/TrackCenter.Application/Dtos/TrackPush/EditTrackPushContentInput.cs +++ b/src/TrackCenter.Application/Dtos/TrackPush/EditTrackPushContentInput.cs @@ -2,11 +2,6 @@ namespace TrackCenter.Application.Dtos.TrackPush; public class EditTrackPushContentInput { - /// - /// 扩展字段参数值 - /// - public string? ExpandFieldsValue { get; set; } - public int? Id { get; set; } /// @@ -58,9 +53,4 @@ public class EditTrackPushContentInput /// 轨迹状态参数值 /// public string? TrackStatusValue { get; set; } - - /// - /// 轨迹时区GMT - /// - public double? TrackTimeZone { get; set; } } diff --git a/src/TrackCenter.Application/Dtos/TrackPush/TrackPushContentConfigDto.cs b/src/TrackCenter.Application/Dtos/TrackPush/TrackPushContentConfigDto.cs index e382b424..fefd534c 100644 --- a/src/TrackCenter.Application/Dtos/TrackPush/TrackPushContentConfigDto.cs +++ b/src/TrackCenter.Application/Dtos/TrackPush/TrackPushContentConfigDto.cs @@ -88,17 +88,6 @@ public class TrackPushContentConfigDto /// public string? TrackStatusValue { get; set; } - /// - /// 轨迹时区GMT - /// - public double? TrackTimeZone { get; set; } - - /// - /// 扩展字段参数值 - /// - [Obsolete("废弃属性，调整为从轨迹明细扩展中获取扩展值填入")] - public string? ExpandFieldsValue { get; set; } - /// /// 时间格式枚举 /// diff --git a/src/TrackCenter.Application/Services/TrackPush/TrackPushCacheService.cs b/src/TrackCenter.Application/Services/TrackPush/TrackPushCacheService.cs index 3d6ef021..c94eb41a 100644 --- a/src/TrackCenter.Application/Services/TrackPush/TrackPushCacheService.cs +++ b/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, - TrackTimeZone = item.TrackTimeZone, - // todo：废弃字段如果没有外部应用依赖，可以逐步删除 - ExpandFieldsValue = item.ExpandFieldsValue, + TrackEnContentValue = item.TrackEnContentValue }).ToList(); return res; diff --git a/src/TrackCenter.Domain/Aggregates/TrackPushAggregate/TrackPushContentConfigEntity.cs b/src/TrackCenter.Domain/Aggregates/TrackPushAggregate/TrackPushContentConfigEntity.cs index 462860e4..90e72f77 100644 --- a/src/TrackCenter.Domain/Aggregates/TrackPushAggregate/TrackPushContentConfigEntity.cs +++ b/src/TrackCenter.Domain/Aggregates/TrackPushAggregate/TrackPushContentConfigEntity.cs @@ -68,16 +68,4 @@ public class TrackPushContentConfigEntity : FullAuditedEntity /// [SugarColumn(ColumnName = "TrackStatusValue")] public string TrackStatusValue { get; set; } - - /// - /// 轨迹时区GMT - /// - [SugarColumn(ColumnName = "TrackTimeZone")] - public double? TrackTimeZone { get; set; } - - /// - /// 扩展字段参数值 - /// - [SugarColumn(ColumnName = "ExpandFieldsValue")] - public string ExpandFieldsValue { get; set; } } diff --git a/src/TrackCenter.Domain/Dtos/TrackPull/GetTrackPullConfigDetailOutputVO.cs b/src/TrackCenter.Domain/Dtos/TrackPull/GetTrackPullConfigDetailOutputVO.cs index 0a5411b4..94584607 100644 --- a/src/TrackCenter.Domain/Dtos/TrackPull/GetTrackPullConfigDetailOutputVO.cs +++ b/src/TrackCenter.Domain/Dtos/TrackPull/GetTrackPullConfigDetailOutputVO.cs @@ -36,6 +36,11 @@ public class GetTrackPullConfigDetailOutputVO /// public string AppKey { get; set; } + /// + /// 轨迹扩展信息参数名集合（逗号分割） + /// + public string? TrackExtraNames { get; set; } + /// /// 轨迹发生ISO时间参数名 /// diff --git a/src/TrackCenter.Domain/Dtos/TrackPush/GetTrackPushContentDetailOutputVO.cs b/src/TrackCenter.Domain/Dtos/TrackPush/GetTrackPushContentDetailOutputVO.cs index 0dff6496..026adfc0 100644 --- a/src/TrackCenter.Domain/Dtos/TrackPush/GetTrackPushContentDetailOutputVO.cs +++ b/src/TrackCenter.Domain/Dtos/TrackPush/GetTrackPushContentDetailOutputVO.cs @@ -51,14 +51,4 @@ public class GetTrackPushContentDetailOutputVO /// 推送轨迹状态 /// public string TrackStatusValue { get; set; } - - /// - /// 推送轨迹时区 - /// - public double? TrackTimeZone { get; set; } - - /// - /// 推送扩展字段 - /// - public string ExpandFieldsValue { get; set; } } diff --git a/src/TrackCenter.Domain/Dtos/TrackPush/GetTrackPushContentPageOutputVO.cs b/src/TrackCenter.Domain/Dtos/TrackPush/GetTrackPushContentPageOutputVO.cs index c9908640..6cd96a41 100644 --- a/src/TrackCenter.Domain/Dtos/TrackPush/GetTrackPushContentPageOutputVO.cs +++ b/src/TrackCenter.Domain/Dtos/TrackPush/GetTrackPushContentPageOutputVO.cs @@ -4,6 +4,11 @@ namespace TrackCenter.Domain.Dtos.TrackPush; public class GetTrackPushContentPageOutputVO { + /// + /// 推送内容配置唯一id + /// + public int Id { get; set; } + /// /// 轨迹内容代码 /// @@ -24,13 +29,6 @@ public class GetTrackPushContentPageOutputVO /// public string EnContent { get; set; } - /// - /// 推送扩展字段 - /// - public string ExpandFieldsValue { get; set; } - - public int Id { get; set; } - /// /// 推送单号类型 /// diff --git a/src/TrackCenter.Domain/Dtos/TrackPush/TrackPushContentConfigVO.cs b/src/TrackCenter.Domain/Dtos/TrackPush/TrackPushContentConfigVO.cs index d6779064..bb9f3cd4 100644 --- a/src/TrackCenter.Domain/Dtos/TrackPush/TrackPushContentConfigVO.cs +++ b/src/TrackCenter.Domain/Dtos/TrackPush/TrackPushContentConfigVO.cs @@ -76,14 +76,4 @@ public class TrackPushContentConfigVO /// 轨迹状态参数值 /// public string? TrackStatusValue { get; set; } - - /// - /// 轨迹时区GMT - /// - public double? TrackTimeZone { get; set; } - - /// - /// 扩展字段参数值 - /// - public string? ExpandFieldsValue { get; set; } } diff --git a/src/TrackCenter.Repository/Repositories/TrackPullConfigRepository.cs b/src/TrackCenter.Repository/Repositories/TrackPullConfigRepository.cs index 20304d93..634a3cad 100644 --- a/src/TrackCenter.Repository/Repositories/TrackPullConfigRepository.cs +++ b/src/TrackCenter.Repository/Repositories/TrackPullConfigRepository.cs @@ -94,18 +94,6 @@ public class TrackPullConfigRepository : BasicRepository, 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(); } diff --git a/src/TrackCenter.Repository/Repositories/TrackPushConfigRepository.cs b/src/TrackCenter.Repository/Repositories/TrackPushConfigRepository.cs index da51e968..0c01d66d 100644 --- a/src/TrackCenter.Repository/Repositories/TrackPushConfigRepository.cs +++ b/src/TrackCenter.Repository/Repositories/TrackPushConfigRepository.cs @@ -140,9 +140,7 @@ public class TrackPushConfigRepository : BasicRepository, TrackContentCodeValue = b.TrackContentCodeValue, TrackContentValue = b.TrackContentValue, TrackEnContentValue = b.TrackEnContentValue, - TrackStatusValue = b.TrackStatusValue, - TrackTimeZone = b.TrackTimeZone, - ExpandFieldsValue = b.ExpandFieldsValue, + TrackStatusValue = b.TrackStatusValue }) .ToListAsync(); }