fix:索引命名问题

This commit is contained in:
xiaolipro 2024-09-12 11:55:29 +08:00
parent cb3f8b2756
commit d5e4a6ef8c
8 changed files with 15 additions and 17 deletions

View File

@ -304,7 +304,7 @@ public class TrackRefreshEventHandler : ITransientDependency, IRabbitHandler
// 新增服务商轨迹到es // 新增服务商轨迹到es
var track = new TrackDetailsIndex var track = new TrackDetailsIndex
{ {
IndexName = $"{GlobalConst.TrackIndex}-{DateTime.Now:yyyy.MM.dd}", IndexName = $"{GlobalConst.TrackDetailsIndex}-{DateTime.Now:yyyy.MM.dd}",
SubSystemId = context.SubSystemId, SubSystemId = context.SubSystemId,
OrderId = context.OrderId, OrderId = context.OrderId,
OrderType = context.OrderType, OrderType = context.OrderType,

View File

@ -4,7 +4,7 @@ using SJZY.Track.Domain.Consts;
namespace SJZY.Track.Domain.Aggregates.TrackDetailsAggregate; namespace SJZY.Track.Domain.Aggregates.TrackDetailsAggregate;
[ElasticsearchType(RelationName = GlobalConst.TrackIndex)] [ElasticsearchType(RelationName = GlobalConst.TrackDetailsIndex)]
public class TrackDetailsIndex : IdBaseIndex public class TrackDetailsIndex : IdBaseIndex
{ {
/// <summary> /// <summary>

View File

@ -4,7 +4,7 @@ using SJZY.Track.Domain.Consts;
namespace SJZY.Track.Domain.Aggregates.TrackPushAggregate; namespace SJZY.Track.Domain.Aggregates.TrackPushAggregate;
[ElasticsearchType(RelationName = GlobalConst.TrackPushRecordsIndex)] [ElasticsearchType(RelationName = GlobalConst.TrackPushRecordIndex)]
public class TrackPushRecordIndex : IdBaseIndex public class TrackPushRecordIndex : IdBaseIndex
{ {
/// <summary> /// <summary>

View File

@ -5,12 +5,12 @@ public partial class GlobalConst
/// <summary> /// <summary>
/// 轨迹明细 es索引名称(模板按天) /// 轨迹明细 es索引名称(模板按天)
/// </summary> /// </summary>
public const string TrackIndex = "sjzy_track_details"; public const string TrackDetailsIndex = "sjzy_track_details";
/// <summary> /// <summary>
/// 轨迹推送记录 es索引名称(模板按天) /// 轨迹推送记录 es索引名称(模板按天)
/// </summary> /// </summary>
public const string TrackPushRecordsIndex = "sjzy_track_push_records"; public const string TrackPushRecordIndex = "sjzy_track_push_records";
/// <summary> /// <summary>
/// 运输时效预警记录 es索引名称(模板按天) /// 运输时效预警记录 es索引名称(模板按天)

View File

@ -2,12 +2,11 @@ using Nest;
using SJZY.Expand.ABP.Core.Logger; using SJZY.Expand.ABP.Core.Logger;
using SJZY.Expand.ElasticSearch.Services; using SJZY.Expand.ElasticSearch.Services;
using SJZY.Track.Domain.Aggregates.OrderAggregate; using SJZY.Track.Domain.Aggregates.OrderAggregate;
using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate;
using SJZY.Track.Domain.Consts; using SJZY.Track.Domain.Consts;
namespace SJZY.Track.Repository.Repositories; namespace SJZY.Track.Repository.Repositories;
public class OrderOperationRecordEsRepository : ElasticSearchContextAbstract<TrackDetailsIndex>, public class OrderOperationRecordEsRepository : ElasticSearchContextAbstract<OrderOperationRecordIndex>,
IOrderOperationRecordEsRepository, IOrderOperationRecordEsRepository,
ITransientDependency ITransientDependency
{ {
@ -33,7 +32,7 @@ public class OrderOperationRecordEsRepository : ElasticSearchContextAbstract<Tra
public async Task<List<OrderOperationRecordIndex>> GetOrderOperationsByIdAsync(int orderId) public async Task<List<OrderOperationRecordIndex>> GetOrderOperationsByIdAsync(int orderId)
{ {
var data = await Context.SearchAsync<OrderOperationRecordIndex>(x => x var data = await Context.SearchAsync<OrderOperationRecordIndex>(x => x
.Index(GlobalConst.TrackPushRecordsIndex) .Index(GlobalConst.OrderOperationRecordIndex)
.Query(q => .Query(q =>
q.Term(t => t.OrderId, orderId) q.Term(t => t.OrderId, orderId)
) )

View File

@ -153,7 +153,7 @@ public class TrackDetailsEsRepository : ElasticSearchContextAbstract<TrackDetail
public async Task AddManyAsync(List<TrackDetailsIndex> tracks) public async Task AddManyAsync(List<TrackDetailsIndex> tracks)
{ {
// 按天写入es // 按天写入es
var indexName = $"{GlobalConst.TrackIndex}-{DateTime.Now:yyyy.MM.dd}"; var indexName = $"{GlobalConst.TrackDetailsIndex}-{DateTime.Now:yyyy.MM.dd}";
tracks.ForEach(x => x.IndexName = indexName); tracks.ForEach(x => x.IndexName = indexName);
var r = await Context.IndexManyAsync(tracks, indexName); var r = await Context.IndexManyAsync(tracks, indexName);
@ -167,7 +167,7 @@ public class TrackDetailsEsRepository : ElasticSearchContextAbstract<TrackDetail
public async Task AddAsync(TrackDetailsIndex track) public async Task AddAsync(TrackDetailsIndex track)
{ {
// 按天写入es // 按天写入es
var indexName = $"{GlobalConst.TrackIndex}-{DateTime.Now:yyyy.MM.dd}"; var indexName = $"{GlobalConst.TrackDetailsIndex}-{DateTime.Now:yyyy.MM.dd}";
track.IndexName = indexName; track.IndexName = indexName;
var r = await Context.IndexAsync(track, s => s.Index(indexName)); var r = await Context.IndexAsync(track, s => s.Index(indexName));

View File

@ -1,13 +1,12 @@
using Nest; using Nest;
using SJZY.Expand.ABP.Core.Logger; using SJZY.Expand.ABP.Core.Logger;
using SJZY.Expand.ElasticSearch.Services; using SJZY.Expand.ElasticSearch.Services;
using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate;
using SJZY.Track.Domain.Aggregates.TrackPushAggregate; using SJZY.Track.Domain.Aggregates.TrackPushAggregate;
using SJZY.Track.Domain.Consts; using SJZY.Track.Domain.Consts;
namespace SJZY.Track.Repository.Repositories; namespace SJZY.Track.Repository.Repositories;
public class TrackPushRecordEsRepository : ElasticSearchContextAbstract<TrackDetailsIndex>, public class TrackPushRecordEsRepository : ElasticSearchContextAbstract<TrackPushRecordIndex>,
ITrackPushRecordEsRepository, ITrackPushRecordEsRepository,
ITransientDependency ITransientDependency
{ {
@ -17,7 +16,7 @@ public class TrackPushRecordEsRepository : ElasticSearchContextAbstract<TrackDet
public async Task AddAsync(TrackPushRecordIndex index) public async Task AddAsync(TrackPushRecordIndex index)
{ {
index.IndexName = $"{GlobalConst.TrackPushRecordsIndex}-{DateTime.Now:yyyy.MM.dd}"; index.IndexName = $"{GlobalConst.TrackPushRecordIndex}-{DateTime.Now:yyyy.MM.dd}";
index.CreateTime = DateTime.Now; index.CreateTime = DateTime.Now;
// 按天写入es // 按天写入es
var r = await Context.IndexAsync(index, request => request var r = await Context.IndexAsync(index, request => request
@ -35,7 +34,7 @@ public class TrackPushRecordEsRepository : ElasticSearchContextAbstract<TrackDet
{ {
if (!records.Any()) return; if (!records.Any()) return;
// 按天写入es // 按天写入es
var indexName = $"{GlobalConst.TrackIndex}-{DateTime.Now:yyyy.MM.dd}"; var indexName = $"{GlobalConst.TrackPushRecordIndex}-{DateTime.Now:yyyy.MM.dd}";
records.ForEach(x => x.IndexName = indexName); records.ForEach(x => x.IndexName = indexName);
var r = await Context.IndexManyAsync(records, indexName); var r = await Context.IndexManyAsync(records, indexName);
@ -50,7 +49,7 @@ public class TrackPushRecordEsRepository : ElasticSearchContextAbstract<TrackDet
public async Task<List<TrackPushRecordIndex>> GetTrackPushRecordsAsync(int orderId) public async Task<List<TrackPushRecordIndex>> GetTrackPushRecordsAsync(int orderId)
{ {
var data = await Context.SearchAsync<TrackPushRecordIndex>(x => x var data = await Context.SearchAsync<TrackPushRecordIndex>(x => x
.Index(GlobalConst.TrackPushRecordsIndex) .Index(GlobalConst.TrackPushRecordIndex)
.Query(q => .Query(q =>
q.Term(t => t.OrderId, orderId) q.Term(t => t.OrderId, orderId)
) )
@ -63,7 +62,7 @@ public class TrackPushRecordEsRepository : ElasticSearchContextAbstract<TrackDet
public async Task<TrackPushRecordIndex?> GetLatestTrackPushRecordAsync(int orderId) public async Task<TrackPushRecordIndex?> GetLatestTrackPushRecordAsync(int orderId)
{ {
var data = await Context.SearchAsync<TrackPushRecordIndex>(x => x var data = await Context.SearchAsync<TrackPushRecordIndex>(x => x
.Index(GlobalConst.TrackPushRecordsIndex) .Index(GlobalConst.TrackPushRecordIndex)
.Query(q => .Query(q =>
q.Term(t => t.OrderId, orderId) q.Term(t => t.OrderId, orderId)
) )

View File

@ -33,7 +33,7 @@ public class WarningRecordEsRepository : ElasticSearchContextAbstract<WarningRec
{ {
if (!warningRecords.Any()) return; if (!warningRecords.Any()) return;
// 按天写入es // 按天写入es
var indexName = $"{GlobalConst.TrackIndex}-{DateTime.Now:yyyy.MM.dd}"; var indexName = $"{GlobalConst.TrackWarningRecordIndex}-{DateTime.Now:yyyy.MM.dd}";
warningRecords.ForEach(x => x.IndexName = indexName); warningRecords.ForEach(x => x.IndexName = indexName);
var r = await Context.IndexManyAsync(warningRecords, indexName); var r = await Context.IndexManyAsync(warningRecords, indexName);