diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/EditTrackPullConfigInput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackPull/EditTrackPullConfigInput.cs index 1e4b08ee..b8512f4c 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/EditTrackPullConfigInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackPull/EditTrackPullConfigInput.cs @@ -64,6 +64,11 @@ public class EditTrackPullConfigInput /// public string? TrackPlaceName { get; set; } + /// + /// 轨迹发生ISO时间参数名 + /// + public string? TrackIsoTimeName { get; set; } + /// /// 轨迹发生时间参数名 /// diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullParamConfigDto.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullParamConfigDto.cs index f64cdead..014c80dc 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullParamConfigDto.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackPullParamConfigDto.cs @@ -7,11 +7,6 @@ public class TrackPullParamConfigDto /// public string OrderNoName { get; set; } = null!; - /// - /// 轨迹时区参数名 - /// - public string? TrackTimeZoneName { get; set; } - /// /// 轨迹代码参数名 /// @@ -32,11 +27,21 @@ public class TrackPullParamConfigDto /// public string? TrackStatusName { get; set; } + /// + /// 轨迹发生ISO时间参数名 + /// + public string? TrackIsoTimeName { get; set; } + /// /// 轨迹发生时间参数名 /// public string? TrackTimeName { get; set; } + /// + /// 轨迹时区参数名 + /// + public string? TrackTimeZoneName { get; set; } + /// /// 订单数组路径 /// diff --git a/src/SJZY.Track.Application/Options/InterfaceRelayParamsConfigOptions.cs b/src/SJZY.Track.Application/Options/InterfaceRelayParamsConfigOptions.cs index 59a6ab9c..2058b23a 100644 --- a/src/SJZY.Track.Application/Options/InterfaceRelayParamsConfigOptions.cs +++ b/src/SJZY.Track.Application/Options/InterfaceRelayParamsConfigOptions.cs @@ -37,6 +37,11 @@ public class InterfaceRelayParamsConfigOptions /// public string TrackPlaceName { get; set; } + /// + /// 轨迹发生ISO时间参数名 + /// + public string TrackIsoTimeName { get; set; } + /// /// 轨迹发生时间参数名 /// diff --git a/src/SJZY.Track.Application/Rabbit/TrackRefreshEventHandler.cs b/src/SJZY.Track.Application/Rabbit/TrackRefreshEventHandler.cs index 5e0e0b82..afc223ec 100644 --- a/src/SJZY.Track.Application/Rabbit/TrackRefreshEventHandler.cs +++ b/src/SJZY.Track.Application/Rabbit/TrackRefreshEventHandler.cs @@ -211,18 +211,22 @@ public class TrackRefreshEventHandler : ITransientDependency, IRabbitHandler } } + // 轨迹发生ISO时间 + var trackIsoTime = paramConfig.TrackIsoTimeName == null + ? null + : trackToken[paramConfig.TrackIsoTimeName]?.ToObject(); // 轨迹发生时间 - var trackTime = paramConfig.TrackTimeName == null + var trackTime = trackIsoTime?.DateTime ?? (paramConfig.TrackTimeName == null ? null - : trackToken[paramConfig.TrackTimeName]?.Value(); + : trackToken[paramConfig.TrackTimeName]?.ToObject()); // 轨迹发生时区 - var trackTimeZone = paramConfig.TrackTimeZoneName == null + var trackTimeZone = (float?) trackIsoTime?.Offset.TotalHours ?? (paramConfig.TrackTimeZoneName == null ? null - : trackToken[paramConfig.TrackTimeZoneName]?.Value(); + : trackToken[paramConfig.TrackTimeZoneName]?.ToObject()); // 轨迹发生地 var trackPlace = paramConfig.TrackPlaceName == null ? null - : trackToken[paramConfig.TrackPlaceName]?.Value(); + : trackToken[paramConfig.TrackPlaceName]?.ToObject(); if (matchedContentConfig is null) diff --git a/src/SJZY.Track.Application/Services/TrackPull/TrackPullService.cs b/src/SJZY.Track.Application/Services/TrackPull/TrackPullService.cs index a72916e9..eff53648 100644 --- a/src/SJZY.Track.Application/Services/TrackPull/TrackPullService.cs +++ b/src/SJZY.Track.Application/Services/TrackPull/TrackPullService.cs @@ -130,6 +130,7 @@ public class TrackPullService : ApplicationService trackPullEntity.TrackStatusName = paramsConfig.TrackStatusName; trackPullEntity.TrackContentName = paramsConfig.TrackContentName; trackPullEntity.TrackPlaceName = paramsConfig.TrackPlaceName; + trackPullEntity.TrackIsoTimeName = paramsConfig.TrackIsoTimeName; trackPullEntity.TrackTimeName = paramsConfig.TrackTimeName; trackPullEntity.TrackTimeZoneName = paramsConfig.TrackTimeZoneName; } @@ -161,6 +162,7 @@ public class TrackPullService : ApplicationService oldTrackPullEntity.TrackStatusName = paramsConfig.TrackStatusName; oldTrackPullEntity.TrackContentName = paramsConfig.TrackContentName; oldTrackPullEntity.TrackPlaceName = paramsConfig.TrackPlaceName; + oldTrackPullEntity.TrackIsoTimeName = paramsConfig.TrackIsoTimeName; oldTrackPullEntity.TrackTimeName = paramsConfig.TrackTimeName; oldTrackPullEntity.TrackTimeZoneName = paramsConfig.TrackTimeZoneName; } diff --git a/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPullConfigEntity.cs b/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPullConfigEntity.cs index 5862d0f7..17f48688 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPullConfigEntity.cs +++ b/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPullConfigEntity.cs @@ -78,6 +78,12 @@ public class TrackPullConfigEntity : IFullAuditedBasicEntitys, IAggregateRoot [SugarColumn(ColumnName = "TrackPlaceName")] public string? TrackPlaceName { get; set; } + /// + /// 轨迹发生ISO时间参数名 + /// + [SugarColumn(ColumnName = "TrackIsoTimeName")] + public string? TrackIsoTimeName { get; set; } + /// /// 轨迹发生时间参数名 /// diff --git a/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullConfigDetailOutputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullConfigDetailOutputVO.cs index cccf0c49..57e1f3f9 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullConfigDetailOutputVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullConfigDetailOutputVO.cs @@ -39,6 +39,16 @@ public class GetTrackPullConfigDetailOutputVO /// public int SubSystemId { get; set; } + /// + /// 轨迹发生ISO时间参数名 + /// + public string? TrackIsoTimeName { get; set; } + + /// + /// 拉取轨迹发生时间 + /// + public string TrackTimeName { get; set; } + /// /// 拉取轨迹时区 /// @@ -64,11 +74,6 @@ public class GetTrackPullConfigDetailOutputVO /// public string TrackStatusName { get; set; } - /// - /// 拉取轨迹发生时间 - /// - public string TrackTimeName { get; set; } - /// /// 订单路径 ///