diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPush/EditTrackPushConfigInput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackPush/EditTrackPushConfigInput.cs
index 745cdf56..e0331cb9 100644
--- a/src/SJZY.Track.Application.Contract/Dtos/TrackPush/EditTrackPushConfigInput.cs
+++ b/src/SJZY.Track.Application.Contract/Dtos/TrackPush/EditTrackPushConfigInput.cs
@@ -44,6 +44,11 @@ public class EditTrackPushConfigInput
///
public bool? IsAllPush { get; set; }
+ ///
+ /// 是否全量推送
+ ///
+ public bool? IsAllPushWithLatest { get; set; }
+
///
/// 时间格式枚举
///
diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPush/TrackPushContentConfigDto.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackPush/TrackPushContentConfigDto.cs
index 345bec99..7c1c1568 100644
--- a/src/SJZY.Track.Application.Contract/Dtos/TrackPush/TrackPushContentConfigDto.cs
+++ b/src/SJZY.Track.Application.Contract/Dtos/TrackPush/TrackPushContentConfigDto.cs
@@ -17,6 +17,11 @@ public class TrackPushContentConfigDto
///
public bool IsAllPush { get; set; }
+ ///
+ /// 是否全量推送(最新轨迹)
+ ///
+ public bool IsAllPushWithLatest { get; set; }
+
///
/// 是否支持删除
///
diff --git a/src/SJZY.Track.Application/CAP/EventHandlers/TrackPushEventHandler.cs b/src/SJZY.Track.Application/CAP/EventHandlers/TrackPushEventHandler.cs
index 14d063bc..59a4a215 100644
--- a/src/SJZY.Track.Application/CAP/EventHandlers/TrackPushEventHandler.cs
+++ b/src/SJZY.Track.Application/CAP/EventHandlers/TrackPushEventHandler.cs
@@ -23,7 +23,6 @@ public class TrackPushEventHandler : ITransientDependency, ICapSubscribe
private readonly IHttpClientProxy _httpClientProxy;
private readonly IOptionsMonitor _options;
private readonly IOrderRepository _orderRepository;
- private readonly ITrackDetailsEsRepository _trackDetailsEsRepository;
private readonly ITrackPushCacheService _trackPushCacheService;
private readonly ITrackPushRecordEsRepository _trackPushRecordEsRepository;
private List _orders = null!;
@@ -31,13 +30,12 @@ public class TrackPushEventHandler : ITransientDependency, ICapSubscribe
public TrackPushEventHandler(IHttpClientProxy httpClientProxy,
IOrderRepository orderRepository, ITrackPushCacheService trackPushCacheService,
- ITrackDetailsEsRepository trackDetailsEsRepository, ITrackPushRecordEsRepository trackPushRecordEsRepository,
+ ITrackPushRecordEsRepository trackPushRecordEsRepository,
IOptionsMonitor options)
{
_httpClientProxy = httpClientProxy;
_orderRepository = orderRepository;
_trackPushCacheService = trackPushCacheService;
- _trackDetailsEsRepository = trackDetailsEsRepository;
_trackPushRecordEsRepository = trackPushRecordEsRepository;
_options = options;
}
@@ -285,7 +283,7 @@ public class TrackPushEventHandler : ITransientDependency, ICapSubscribe
{
OrderNo = log.OrderNo,
};
- var dict = new Dictionary()
+ var cur = new Dictionary()
{
// 推真实的发生地和发生时间(时间是计算后的)
{ "location", log.TrackPlace },
@@ -297,7 +295,7 @@ public class TrackPushEventHandler : ITransientDependency, ICapSubscribe
{ "status", config.TrackStatusValue },
{ "extra", DeserializeForTextJson