From 362ea52f2e5f89f3959489bb9375d10418ddd9a9 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, 5 Mar 2024 15:07:08 +0800
Subject: [PATCH] =?UTF-8?q?change=20=E4=BF=AE=E6=94=B9=E7=B4=A2=E5=BC=95?=
 =?UTF-8?q?=E7=AD=96=E7=95=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EventHandlers/TrackUpsertEventHandler.cs  |  1 +
 .../TrackDetailsIndex.cs                      |  5 +++
 .../Repositories/TrackDetailsRepository.cs    | 42 ++++++++++---------
 3 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs b/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs
index 7b0901e1..08969864 100644
--- a/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs
+++ b/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs
@@ -71,6 +71,7 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe
 
             track = new TrackDetailsIndex
             {
+                IndexName = $"{GlobalConst.TrackIndex}-{DateTime.Now:yyyy.MM.dd}",
                 OrderId = @event.OrderId,
                 OrderNo = @event.OrderNo,
                 OrderType = @event.OrderType,
diff --git a/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/TrackDetailsIndex.cs b/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/TrackDetailsIndex.cs
index 0004343c..b885e11b 100644
--- a/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/TrackDetailsIndex.cs
+++ b/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/TrackDetailsIndex.cs
@@ -16,6 +16,11 @@ public class TrackDetailsIndex : IdBaseIndex
     /// </summary>
     public string OrderNo { get; set; } = null!;
 
+    /// <summary>
+    /// 索引名称
+    /// </summary>
+    public string IndexName { get; set; } = null!;
+
     /// <summary>
     /// 订单类型（主数据枚举TrackOrderType）
     /// </summary>
diff --git a/src/SJZY.Track.Repository/Repositories/TrackDetailsRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackDetailsRepository.cs
index 71779e5d..a0e6cead 100644
--- a/src/SJZY.Track.Repository/Repositories/TrackDetailsRepository.cs
+++ b/src/SJZY.Track.Repository/Repositories/TrackDetailsRepository.cs
@@ -1,8 +1,6 @@
 using Nest;
 using SJZY.Expand.ABP.Core.Logger;
-using SJZY.Expand.ABP.Core.PublicMethords;
 using SJZY.Expand.ElasticSearch.Services;
-using SJZY.Track.Domain;
 using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate;
 using SJZY.Track.Domain.Dtos.TrackDetails;
 
@@ -25,9 +23,9 @@ internal class TrackDetailsRepository : ElasticSearchContextAbstract<TrackDetail
                 && q.Term(f => f.IsDeleted, false)
             )
         );
-        
-        var res= r.Documents.FirstOrDefault();
-        if (r.Hits.FirstOrDefault() != default && res != default)
+
+        var res = r.Documents.FirstOrDefault();
+        if (res != default && r.Hits.FirstOrDefault() != default)
         {
             res.Id = r.Hits.FirstOrDefault()!.Id;
         }
@@ -37,26 +35,30 @@ internal class TrackDetailsRepository : ElasticSearchContextAbstract<TrackDetail
 
     public async Task UpsertAsync(TrackDetailsIndex index)
     {
-        try
+        if (index.Id.IsNullOrWhiteSpace())
         {
-            if (index.Id.IsNullOrWhiteSpace())
+            // 按天写入es
+            var r = await Context.IndexAsync(index, request => request
+                .Index(index.IndexName)
+            );
+
+            if (!r.IsValid)
             {
-                // 按天写入es
-                await Context.IndexAsync(index, request => request
-                    .Index($"{GlobalConst.TrackIndex}-{DateTime.Now:yyyy.MM.dd}")
-                );
-            }
-            else
-            {
-                await Context.UpdateAsync<TrackDetailsIndex>(index.Id, u => u
-                        .Doc(index)
-                    //.Refresh(Refresh.True) // 可选：立即刷新索引使更改立即可见
-                );
+                LogHelper.Error($"轨迹数据新增失败，原因：{r.DebugInformation}。");
             }
         }
-        catch (Exception ex)
+        else
         {
-            LogHelper.Error($"轨迹数据新增/修改失败，原因：{ex.Message}。\n{index.ToJson()}");
+            var r = await Context.UpdateAsync<TrackDetailsIndex>(index.Id, u => u
+                    .Index(index.IndexName)
+                    .Doc(index)
+                //.Refresh(Refresh.True) // 可选：立即刷新索引使更改立即可见
+            );
+
+            if (!r.IsValid)
+            {
+                LogHelper.Error($"轨迹数据更新失败，原因：{r.DebugInformation}。");
+            }
         }
     }