From 7e26d3fe0820169ae5321db2c60175b358442a1b Mon Sep 17 00:00:00 2001 From: hardstylewyl <827778732@qq.com> Date: Thu, 26 Jun 2025 11:31:42 +0800 Subject: [PATCH] =?UTF-8?q?update:=E8=B0=83=E6=95=B4ES=E7=B4=A2=E5=BC=95?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=8C=89=E6=9C=88=EF=BC=8C=E5=9B=A0=E8=BF=90?= =?UTF-8?q?=E7=BB=B4=E7=AE=A1=E7=90=86=E9=9C=80=E8=A6=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Rabbit/TrackRefreshEventHandler.cs | 2 +- .../Consts/GlobalConst.ES.cs | 16 ++++++------- .../OrderOperationRecordEsRepository.cs | 4 ++-- .../Repositories/TrackDetailsEsRepository.cs | 10 ++++---- .../TrackPushRecordEsRepository.cs | 4 ++-- .../WarningDetailsEsRepository.cs | 24 +++++++++---------- .../Repositories/WarningRecordEsRepository.cs | 4 ++-- 7 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/SJZY.Track.Application/Rabbit/TrackRefreshEventHandler.cs b/src/SJZY.Track.Application/Rabbit/TrackRefreshEventHandler.cs index afc223ec..664846fe 100644 --- a/src/SJZY.Track.Application/Rabbit/TrackRefreshEventHandler.cs +++ b/src/SJZY.Track.Application/Rabbit/TrackRefreshEventHandler.cs @@ -292,7 +292,7 @@ public class TrackRefreshEventHandler : ITransientDependency, IRabbitHandler // 新增服务商轨迹到es var track = new TrackDetailsIndex { - IndexName = $"{GlobalConst.TrackDetailsIndex}-{DateTime.Now:yyyy.MM.dd}", + IndexName = $"{GlobalConst.TrackDetailsIndex}-{DateTime.Now:yyyy.MM}", SubSystemId = context.SubSystemId, OrderId = context.OrderId, OrderType = context.OrderType, diff --git a/src/SJZY.Track.Domain/Consts/GlobalConst.ES.cs b/src/SJZY.Track.Domain/Consts/GlobalConst.ES.cs index 3a9578be..b9492f33 100644 --- a/src/SJZY.Track.Domain/Consts/GlobalConst.ES.cs +++ b/src/SJZY.Track.Domain/Consts/GlobalConst.ES.cs @@ -3,43 +3,43 @@ namespace SJZY.Track.Domain.Consts; public partial class GlobalConst { /// - /// 轨迹明细 es索引名称（模板按天） + /// 轨迹明细 es索引名称（模板按月） /// public const string TrackDetailsIndex = "sjzy_track_details"; /// - /// 轨迹推送记录 es索引名称（模板按天） + /// 轨迹推送记录 es索引名称（模板按月） /// public const string TrackPushRecordIndex = "sjzy_track_push_records"; /// - /// 运输时效预警记录 es索引名称（模板按天） + /// 运输时效预警记录 es索引名称（模板按月） todo:可以删除 /// public const string TrackWarningRecordIndex = "sjzy_track_warning_records"; /// - /// 订单操作记录 es索引名称（模板按天） + /// 订单操作记录 es索引名称（模板按月） /// public const string OrderOperationRecordIndex = "sjzy_track_order_operation_records"; // todo：以下为新增需要配置索引模板(prod) 生产环境还需要建立索引！！ /// - /// 运输时效预警明细 es索引名称（模板按天） + /// 运输时效预警明细 es索引名称（模板按月） /// public const string TransportWarningDetailsIndex = "sjzy_track_transport_warning_details"; /// - /// 回传时效预警明细 es索引名称（模板按天） + /// 回传时效预警明细 es索引名称（模板按月） /// public const string ReturnWarningDetailsIndex = "sjzy_track_return_warning_details"; /// - /// 回传报文日志 es索引名称（模板按天） + /// 回传报文日志 es索引名称（模板按月） /// public const string ReturnMessageRecordIndex = "sjzy_track_return_message_records"; /// - /// 完整预警明细 es索引名称（模板按天） + /// 完整预警明细 es索引名称（模板按月） /// public const string CompleteWarningDetailsIndex = "sjzy_track_complete_warning_details"; } diff --git a/src/SJZY.Track.Repository/Repositories/OrderOperationRecordEsRepository.cs b/src/SJZY.Track.Repository/Repositories/OrderOperationRecordEsRepository.cs index 7230d375..f3efa1fa 100644 --- a/src/SJZY.Track.Repository/Repositories/OrderOperationRecordEsRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/OrderOperationRecordEsRepository.cs @@ -16,7 +16,7 @@ public class OrderOperationRecordEsRepository : ElasticSearchContextAbstract request @@ -32,7 +32,7 @@ public class OrderOperationRecordEsRepository : ElasticSearchContextAbstract indexes) { // 按天写入es - var indexName = $"{GlobalConst.OrderOperationRecordIndex}-{DateTime.Now:yyyy.MM.dd}"; + var indexName = $"{GlobalConst.OrderOperationRecordIndex}-{DateTime.Now:yyyy.MM}"; indexes.ForEach(x => { x.IndexName = indexName; diff --git a/src/SJZY.Track.Repository/Repositories/TrackDetailsEsRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackDetailsEsRepository.cs index 588a3bd7..495c0621 100644 --- a/src/SJZY.Track.Repository/Repositories/TrackDetailsEsRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/TrackDetailsEsRepository.cs @@ -568,7 +568,7 @@ public class TrackDetailsEsRepository : ElasticSearchContextAbstract tracks) { // 按天写入es - var indexName = $"{GlobalConst.TrackDetailsIndex}-{DateTime.Now:yyyy.MM.dd}"; + var indexName = $"{GlobalConst.TrackDetailsIndex}-{DateTime.Now:yyyy.MM}"; tracks.ForEach(x => x.IndexName = indexName); var r = await Context.IndexManyAsync(tracks, indexName); @@ -585,7 +585,7 @@ public class TrackDetailsEsRepository : ElasticSearchContextAbstract s.Index(indexName)); @@ -853,9 +853,9 @@ public class TrackDetailsEsRepository : ElasticSearchContextAbstract request @@ -35,7 +35,7 @@ public class TrackPushRecordEsRepository : ElasticSearchContextAbstract { x.IndexName = indexName; diff --git a/src/SJZY.Track.Repository/Repositories/WarningDetailsEsRepository.cs b/src/SJZY.Track.Repository/Repositories/WarningDetailsEsRepository.cs index 8843d4b4..0c28646a 100644 --- a/src/SJZY.Track.Repository/Repositories/WarningDetailsEsRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/WarningDetailsEsRepository.cs @@ -304,7 +304,7 @@ public class WarningDetailsEsRepository : IWarningDetailsEsRepository, ITransien public async Task InsertTransportWarningDetailsAsync(TransportWarningDetailsIndex detail) { - var indexName = $"{GlobalConst.TransportWarningDetailsIndex}-{DateTime.Now:yyyy.MM.dd}"; + var indexName = $"{GlobalConst.TransportWarningDetailsIndex}-{DateTime.Now:yyyy.MM}"; detail.IndexName = indexName; var r = await _client.IndexAsync(detail, s => s.Index(indexName)); @@ -317,7 +317,7 @@ public class WarningDetailsEsRepository : IWarningDetailsEsRepository, ITransien public async Task BulkInsertTransportWarningDetailsAsync(List details, int maxRetries = 3) { // 按天写入es - var indexName = $"{GlobalConst.TransportWarningDetailsIndex}-{DateTime.Now:yyyy.MM.dd}"; + var indexName = $"{GlobalConst.TransportWarningDetailsIndex}-{DateTime.Now:yyyy.MM}"; details.ForEach(x => x.IndexName = indexName); var r = await _client.IndexManyAsync(details, indexName); @@ -645,7 +645,7 @@ public class WarningDetailsEsRepository : IWarningDetailsEsRepository, ITransien public async Task InsertReturnWarningDetailsAsync(ReturnWarningDetailsIndex detail) { - var indexName = $"{GlobalConst.ReturnWarningDetailsIndex}-{DateTime.Now:yyyy.MM.dd}"; + var indexName = $"{GlobalConst.ReturnWarningDetailsIndex}-{DateTime.Now:yyyy.MM}"; detail.IndexName = indexName; var r = await _client.IndexAsync(detail, s => s.Index(indexName)); @@ -658,7 +658,7 @@ public class WarningDetailsEsRepository : IWarningDetailsEsRepository, ITransien public async Task BulkInsertReturnWarningDetailsAsync(List details, int maxRetries = 3) { // 按天写入es - var indexName = $"{GlobalConst.ReturnWarningDetailsIndex}-{DateTime.Now:yyyy.MM.dd}"; + var indexName = $"{GlobalConst.ReturnWarningDetailsIndex}-{DateTime.Now:yyyy.MM}"; details.ForEach(x => x.IndexName = indexName); var r = await _client.IndexManyAsync(details, indexName); @@ -671,7 +671,7 @@ public class WarningDetailsEsRepository : IWarningDetailsEsRepository, ITransien public async Task InsertReturnMessageRecordAsync(ReturnMessageRecordIndex detail) { - var indexName = $"{GlobalConst.ReturnMessageRecordIndex}-{DateTime.Now:yyyy.MM.dd}"; + var indexName = $"{GlobalConst.ReturnMessageRecordIndex}-{DateTime.Now:yyyy.MM}"; detail.IndexName = indexName; var r = await _client.IndexAsync(detail, s => s.Index(indexName)); @@ -684,7 +684,7 @@ public class WarningDetailsEsRepository : IWarningDetailsEsRepository, ITransien public async Task BulkInsertReturnMessageRecordAsync(List details, int maxRetries = 3) { // 按天写入es - var indexName = $"{GlobalConst.ReturnMessageRecordIndex}-{DateTime.Now:yyyy.MM.dd}"; + var indexName = $"{GlobalConst.ReturnMessageRecordIndex}-{DateTime.Now:yyyy.MM}"; details.ForEach(x => x.IndexName = indexName); var r = await _client.IndexManyAsync(details, indexName); @@ -930,7 +930,7 @@ public class WarningDetailsEsRepository : IWarningDetailsEsRepository, ITransien public async Task InsertCompleteWarningDetailsAsync(CompleteWarningDetailsIndex detail) { - var indexName = $"{GlobalConst.CompleteWarningDetailsIndex}-{DateTime.Now:yyyy.MM.dd}"; + var indexName = $"{GlobalConst.CompleteWarningDetailsIndex}-{DateTime.Now:yyyy.MM}"; detail.IndexName = indexName; var r = await _client.IndexAsync(detail, s => s.Index(indexName)); @@ -943,7 +943,7 @@ public class WarningDetailsEsRepository : IWarningDetailsEsRepository, ITransien public async Task BulkInsertCompleteWarningDetailsAsync(List details, int maxRetries = 3) { // 按天写入es - var indexName = $"{GlobalConst.CompleteWarningDetailsIndex}-{DateTime.Now:yyyy.MM.dd}"; + var indexName = $"{GlobalConst.CompleteWarningDetailsIndex}-{DateTime.Now:yyyy.MM}"; details.ForEach(x => x.IndexName = indexName); var r = await _client.IndexManyAsync(details, indexName); @@ -958,10 +958,10 @@ public class WarningDetailsEsRepository : IWarningDetailsEsRepository, ITransien public async Task CreateAliasAsync() { - var indexName1 = $"{GlobalConst.TransportWarningDetailsIndex}-{DateTime.Now:yyyy.MM.dd}"; - var indexName2 = $"{GlobalConst.ReturnWarningDetailsIndex}-{DateTime.Now:yyyy.MM.dd}"; - var indexName3 = $"{GlobalConst.CompleteWarningDetailsIndex}-{DateTime.Now:yyyy.MM.dd}"; - var indexName4 = $"{GlobalConst.ReturnMessageRecordIndex}-{DateTime.Now:yyyy.MM.dd}"; + var indexName1 = $"{GlobalConst.TransportWarningDetailsIndex}-{DateTime.Now:yyyy.MM}"; + var indexName2 = $"{GlobalConst.ReturnWarningDetailsIndex}-{DateTime.Now:yyyy.MM}"; + var indexName3 = $"{GlobalConst.CompleteWarningDetailsIndex}-{DateTime.Now:yyyy.MM}"; + var indexName4 = $"{GlobalConst.ReturnMessageRecordIndex}-{DateTime.Now:yyyy.MM}"; var exists1 = await _client.Indices.ExistsAsync(indexName1); if (!exists1.Exists) diff --git a/src/SJZY.Track.Repository/Repositories/WarningRecordEsRepository.cs b/src/SJZY.Track.Repository/Repositories/WarningRecordEsRepository.cs index eccbec0c..1078dde4 100644 --- a/src/SJZY.Track.Repository/Repositories/WarningRecordEsRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/WarningRecordEsRepository.cs @@ -16,7 +16,7 @@ public class WarningRecordEsRepository : ElasticSearchContextAbstract request @@ -33,7 +33,7 @@ public class WarningRecordEsRepository : ElasticSearchContextAbstract x.IndexName = indexName); var r = await Context.IndexManyAsync(warningRecords, indexName);