转鹏军

src/SJZY.Track.Application.Contract/Dtos/ProvideServices/BatchUpsertTrackInput.cs

@@ -123,7 +123,7 @@ public class BatchUpsertTrackInput : OrderNosInfo
     /// <summary>
     /// 扩展信息字段，用与轨迹推送的附加字段
     /// </summary>
-    public Dictionary<string, object>? Extra { get; set; }
+    public string? Extra { get; set; }
 
     /// <summary>
     /// 是否强制推送

src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetTrackOutput.cs

@@ -105,5 +105,5 @@ public class TrackDetail
     /// <summary>
     /// 扩展信息字段，用与轨迹推送的附加字段
     /// </summary>
-    public Dictionary<string, object>? Extra { get; set; }
+    public string? Extra { get; set; }
 }

src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpsertTrackInput.cs

@@ -132,7 +132,7 @@ public class UpsertTrackInput : OrderNoInfo
     /// <summary>
     /// 扩展信息字段，用与轨迹推送的附加字段
     /// </summary>
-    public Dictionary<string, object>? Extra { get; set; }
+    public string? Extra { get; set; }
 
     /// <summary>
     /// 是否强制推送

src/SJZY.Track.Application.Contract/Dtos/TrackPush/TrackPushRecordDto.cs

@@ -85,5 +85,5 @@ public class TrackPushRecordDto
     /// <summary>
     /// 轨迹的额外新
     /// </summary>
-    public Dictionary<string, object>? Extra { get; set; }
+    public string? Extra { get; set; }
 }

src/SJZY.Track.Application.Contract/Events/TrackChangeEto.cs

@@ -132,5 +132,5 @@ public class TrackChangeEto
     /// <summary>
     /// 扩展信息字段，用与轨迹推送的附加字段
     /// </summary>
-    public Dictionary<string, object>? Extra { get; set; }
+    public string? Extra { get; set; }
 }

src/SJZY.Track.Application.Contract/Events/TrackPushCompletedEvent.cs

@@ -83,5 +83,5 @@ public class TrackPushCompletedEvent
     /// <summary>
     /// 轨迹的额外新
     /// </summary>
-    public Dictionary<string, object>? Extra { get; set; }
+    public string? Extra { get; set; }
 }

src/SJZY.Track.Application.Contract/Events/TrackPushEvent.cs

@@ -88,5 +88,5 @@ public struct SystemPushStruct
     /// <summary>
     /// 扩展信息字段，用与轨迹推送的附加字段
     /// </summary>
-    public Dictionary<string, object>? Extra { get; set; }
+    public string? Extra { get; set; }
 }

src/SJZY.Track.Application.Contract/Events/TrackUpsertEvent.cs

@@ -154,7 +154,7 @@ public class TrackUpsertEvent
     /// <summary>
     /// 扩展信息字段，用与轨迹推送的附加字段
     /// </summary>
-    public Dictionary<string, object>? Extra { get; set; }
+    public string? Extra { get; set; }
 
     /// <summary>
     /// 是否强制推送

src/SJZY.Track.Application/CAP/EventHandlers/TrackPushEventHandler.cs

@@ -265,7 +265,7 @@ public class TrackPushEventHandler : ITransientDependency, ICapSubscribe
             { "descriptionCn", config.TrackContentValue },
             { "code", config.TrackContentCodeValue },
             { "status", config.TrackStatusValue },
-            { "extra", log.Extra }
+            { "extra", DeserializeForTextJson<object>(log.Extra) }
         };
         body.Data.Add(dict);
         log.PushContent = body.ToJson();
@@ -293,7 +293,7 @@ public class TrackPushEventHandler : ITransientDependency, ICapSubscribe
             { "descriptionCn", config.TrackContentValue },
             { "code", config.TrackContentCodeValue },
             { "status", config.TrackStatusValue },
-            { "extra", log.Extra }
+            { "extra", DeserializeForTextJson<object>(log.Extra) }
         };
         body.Data.Add(cur);
 
@@ -380,4 +380,11 @@ public class TrackPushEventHandler : ITransientDependency, ICapSubscribe
     {
         return string.IsNullOrWhiteSpace(json) ? default : System.Text.Json.JsonSerializer.Deserialize<T>(json);
     }
+
+    private Dictionary<string, object>? GetExtraDictForTextJson(string? extraStr)
+    {
+        return string.IsNullOrWhiteSpace(extraStr)
+            ? null
+            : System.Text.Json.JsonSerializer.Deserialize<Dictionary<string, object>>(extraStr);
+    }
 }

src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs

@@ -1,4 +1,5 @@
 using DotNetCore.CAP;
+using NetTaste;
 using SJZY.Expand.ABP.Core.Logger;
 using SJZY.Expand.ABP.Core.PublicMethords;
 using SJZY.Track.Application.Contract.Events;
@@ -234,7 +235,7 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe
 
         // todo：条件命名写反了
         // important：轨迹code相同，时间、发生地不同的，可能存在多条！！
-        var tracks = await _trackDetailsEsRepository.GetListAsync(orderIds, @event.TrackCode, false);
+        var tracks = await _trackDetailsEsRepository.GetListAsync(orderIds, @event.TrackCode, true);
 
         var insertTracks = new List<TrackDetailsIndex>();
         var updateTracks = new List<TrackDetailsIndex>();
@@ -249,6 +250,7 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe
                 {
                     updateTracks.Add(BuiltUpdateTrack(@event, trackById, order, trackContent));
                 }
+
                 continue;
             }
 
@@ -260,8 +262,10 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe
             }
             else
             {
+                var extraDict = GetExtraDictForTextJson(@event.Extra);
                 if (@event.Extra == null ||
-                    @event.Extra.TryGetValue(@event.CompareFields, out var compareValue) == false)
+                    extraDict == null
+                    || extraDict.TryGetValue(@event.CompareFields, out var compareValue) == false)
                 {
                     throw new BusinessException(message: "轨迹比较字段不存在，请检查拓展字段");
                 }
@@ -269,7 +273,7 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe
                 existTracks = existTracks.Where(x =>
                 {
                     // tips：注意兼容性，历史轨迹的字段可能为空
-                    if (x.Extra == null || !x.Extra.TryGetValue(@event.CompareFields, out var oldValue))
+                    if (x.Extra == null || !extraDict.TryGetValue(@event.CompareFields, out var oldValue))
                     {
                         return false;
                     }
@@ -441,4 +445,11 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe
 
         return track;
     }
+
+    private Dictionary<string, object>? GetExtraDictForTextJson(string? extraStr)
+    {
+        return string.IsNullOrWhiteSpace(extraStr)
+            ? null
+            : System.Text.Json.JsonSerializer.Deserialize<Dictionary<string, object>>(extraStr);
+    }
 }

src/SJZY.Track.Application/Rabbit/TrackPushCompletedEventHandler.cs

@@ -4,7 +4,6 @@ using BSI.Stack.Rabbit.Handler;
 using Newtonsoft.Json;
 using RabbitMQ.Client.Events;
 using SJZY.Expand.ABP.Core.Logger;
-using SJZY.Expand.ABP.Core.PublicMethords;
 using SJZY.InterfaceRelay.Application.Contracts;
 using SJZY.Track.Application.Contract.Dtos.TrackPush;
 using SJZY.Track.Application.Contract.Services;

src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/TrackDetailsIndex.cs

@@ -190,5 +190,5 @@ public class TrackDetailsIndex : IdBaseIndex
     /// <summary>
     /// 扩展信息字段，用与轨迹推送的附加字段
     /// </summary>
-    public Dictionary<string, object>? Extra { get; set; }
+    public string? Extra { get; set; }
 }

src/SJZY.Track.Domain/Aggregates/TrackPushAggregate/TrackPushRecordIndex.cs

@@ -96,5 +96,5 @@ public class TrackPushRecordIndex : IdBaseIndex
     /// <summary>
     /// 轨迹额外信息
     /// </summary>
-    public Dictionary<string, object>? Extra { get; set; }
+    public string? Extra { get; set; }
 }

src/SJZY.Track.Repository/Repositories/TrackDetailsEsRepository.cs

@@ -19,7 +19,7 @@ public class TrackDetailsEsRepository : ElasticSearchContextAbstract<TrackDetail
     public async Task<List<TrackDetailsIndex>> GetListAsync(int[] orderIds, string trackCode,
         bool forUpsert = false)
     {
-        var r = !forUpsert
+        var r = forUpsert
             ? await Context.SearchAsync<TrackDetailsIndex>(s => s
                 .Index(GlobalConst.TrackDetailsIndex)
                 .Source()