ideship/track
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'S07' into test

Browse Source
This commit is contained in:
hardstylewyl 2025-06-26 11:31:55 +08:00
commit cfdbbddbd5
7 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/SJZY.Track.Application/Rabbit/TrackRefreshEventHandler.cs
View File

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

16
src/SJZY.Track.Domain/Consts/GlobalConst.ES.cs
View File

@ -3,43 +3,43 @@ namespace SJZY.Track.Domain.Consts;
public partial class GlobalConst public partial class GlobalConst
{ {
/// <summary> /// <summary>
/// 轨迹明细 es索引名称（模板按天） /// 轨迹明细 es索引名称（模板按月）
/// </summary> /// </summary>
public const string TrackDetailsIndex = "sjzy_track_details"; public const string TrackDetailsIndex = "sjzy_track_details";
/// <summary> /// <summary>
/// 轨迹推送记录 es索引名称（模板按天） /// 轨迹推送记录 es索引名称（模板按月）
/// </summary> /// </summary>
public const string TrackPushRecordIndex = "sjzy_track_push_records"; public const string TrackPushRecordIndex = "sjzy_track_push_records";
/// <summary> /// <summary>
/// 运输时效预警记录 es索引名称（模板按天） /// 运输时效预警记录 es索引名称（模板按月） todo:可以删除
/// </summary> /// </summary>
public const string TrackWarningRecordIndex = "sjzy_track_warning_records"; public const string TrackWarningRecordIndex = "sjzy_track_warning_records";
/// <summary> /// <summary>
/// 订单操作记录 es索引名称（模板按天） /// 订单操作记录 es索引名称（模板按月）
/// </summary> /// </summary>
public const string OrderOperationRecordIndex = "sjzy_track_order_operation_records"; public const string OrderOperationRecordIndex = "sjzy_track_order_operation_records";
// todo：以下为新增需要配置索引模板(prod) 生产环境还需要建立索引！！ // todo：以下为新增需要配置索引模板(prod) 生产环境还需要建立索引！！
/// <summary> /// <summary>
/// 运输时效预警明细 es索引名称（模板按天） /// 运输时效预警明细 es索引名称（模板按月）
/// </summary> /// </summary>
public const string TransportWarningDetailsIndex = "sjzy_track_transport_warning_details"; public const string TransportWarningDetailsIndex = "sjzy_track_transport_warning_details";
/// <summary> /// <summary>
/// 回传时效预警明细 es索引名称（模板按天） /// 回传时效预警明细 es索引名称（模板按月）
/// </summary> /// </summary>
public const string ReturnWarningDetailsIndex = "sjzy_track_return_warning_details"; public const string ReturnWarningDetailsIndex = "sjzy_track_return_warning_details";
/// <summary> /// <summary>
/// 回传报文日志 es索引名称（模板按天） /// 回传报文日志 es索引名称（模板按月）
/// </summary> /// </summary>
public const string ReturnMessageRecordIndex = "sjzy_track_return_message_records"; public const string ReturnMessageRecordIndex = "sjzy_track_return_message_records";
/// <summary> /// <summary>
/// 完整预警明细 es索引名称（模板按天） /// 完整预警明细 es索引名称（模板按月）
/// </summary> /// </summary>
public const string CompleteWarningDetailsIndex = "sjzy_track_complete_warning_details"; public const string CompleteWarningDetailsIndex = "sjzy_track_complete_warning_details";
} }

4
src/SJZY.Track.Repository/Repositories/OrderOperationRecordEsRepository.cs
View File

@ -16,7 +16,7 @@ public class OrderOperationRecordEsRepository : ElasticSearchContextAbstract<Ord
public async Task AddAsync(OrderOperationRecordIndex index) public async Task AddAsync(OrderOperationRecordIndex index)
{ {
index.IndexName = $"{GlobalConst.OrderOperationRecordIndex}-{DateTime.Now:yyyy.MM.dd}"; index.IndexName = $"{GlobalConst.OrderOperationRecordIndex}-{DateTime.Now:yyyy.MM}";
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
@ -32,7 +32,7 @@ public class OrderOperationRecordEsRepository : ElasticSearchContextAbstract<Ord
public async Task AddManyAsync(List<OrderOperationRecordIndex> indexes) public async Task AddManyAsync(List<OrderOperationRecordIndex> indexes)
{ {
// 按天写入es // 按天写入es
var indexName = $"{GlobalConst.OrderOperationRecordIndex}-{DateTime.Now:yyyy.MM.dd}"; var indexName = $"{GlobalConst.OrderOperationRecordIndex}-{DateTime.Now:yyyy.MM}";
indexes.ForEach(x => indexes.ForEach(x =>
{ {
x.IndexName = indexName; x.IndexName = indexName;

10
src/SJZY.Track.Repository/Repositories/TrackDetailsEsRepository.cs
View File

@ -568,7 +568,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.TrackDetailsIndex}-{DateTime.Now:yyyy.MM.dd}"; var indexName = $"{GlobalConst.TrackDetailsIndex}-{DateTime.Now:yyyy.MM}";
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);
@ -585,7 +585,7 @@ public class TrackDetailsEsRepository : ElasticSearchContextAbstract<TrackDetail
public async Task AddAsync(TrackDetailsIndex track) public async Task AddAsync(TrackDetailsIndex track)
{ {
// 按天写入es // 按天写入es
var indexName = $"{GlobalConst.TrackDetailsIndex}-{DateTime.Now:yyyy.MM.dd}"; var indexName = $"{GlobalConst.TrackDetailsIndex}-{DateTime.Now:yyyy.MM}";
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));
@ -853,9 +853,9 @@ public class TrackDetailsEsRepository : ElasticSearchContextAbstract<TrackDetail
public async Task MigrateAsync() public async Task MigrateAsync()
{ {
var indexName1 = $"{GlobalConst.TrackDetailsIndex}-{DateTime.Now:yyyy.MM.dd}"; var indexName1 = $"{GlobalConst.TrackDetailsIndex}-{DateTime.Now:yyyy.MM}";
var indexName2 = $"{GlobalConst.TrackPushRecordIndex}-{DateTime.Now:yyyy.MM.dd}"; var indexName2 = $"{GlobalConst.TrackPushRecordIndex}-{DateTime.Now:yyyy.MM}";
var indexName3 = $"{GlobalConst.OrderOperationRecordIndex}-{DateTime.Now:yyyy.MM.dd}"; var indexName3 = $"{GlobalConst.OrderOperationRecordIndex}-{DateTime.Now:yyyy.MM}";
var exists1 = await Context.Indices.ExistsAsync(indexName1); var exists1 = await Context.Indices.ExistsAsync(indexName1);
if (!exists1.Exists) if (!exists1.Exists)

4
src/SJZY.Track.Repository/Repositories/TrackPushRecordEsRepository.cs
View File

@ -17,7 +17,7 @@ public class TrackPushRecordEsRepository : ElasticSearchContextAbstract<TrackPus
public async Task AddAsync(TrackPushRecordIndex index) public async Task AddAsync(TrackPushRecordIndex index)
{ {
index.IndexName = $"{GlobalConst.TrackPushRecordIndex}-{DateTime.Now:yyyy.MM.dd}"; index.IndexName = $"{GlobalConst.TrackPushRecordIndex}-{DateTime.Now:yyyy.MM}";
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 +35,7 @@ public class TrackPushRecordEsRepository : ElasticSearchContextAbstract<TrackPus
{ {
if (!records.Any()) return; if (!records.Any()) return;
// 按天写入es // 按天写入es
var indexName = $"{GlobalConst.TrackPushRecordIndex}-{DateTime.Now:yyyy.MM.dd}"; var indexName = $"{GlobalConst.TrackPushRecordIndex}-{DateTime.Now:yyyy.MM}";
records.ForEach(x => records.ForEach(x =>
{ {
x.IndexName = indexName; x.IndexName = indexName;

24
src/SJZY.Track.Repository/Repositories/WarningDetailsEsRepository.cs
View File

@ -304,7 +304,7 @@ public class WarningDetailsEsRepository : IWarningDetailsEsRepository, ITransien
public async Task InsertTransportWarningDetailsAsync(TransportWarningDetailsIndex detail) 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; detail.IndexName = indexName;
var r = await _client.IndexAsync(detail, s => s.Index(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<TransportWarningDetailsIndex> details, int maxRetries = 3) public async Task BulkInsertTransportWarningDetailsAsync(List<TransportWarningDetailsIndex> details, int maxRetries = 3)
{ {
// 按天写入es // 按天写入es
var indexName = $"{GlobalConst.TransportWarningDetailsIndex}-{DateTime.Now:yyyy.MM.dd}"; var indexName = $"{GlobalConst.TransportWarningDetailsIndex}-{DateTime.Now:yyyy.MM}";
details.ForEach(x => x.IndexName = indexName); details.ForEach(x => x.IndexName = indexName);
var r = await _client.IndexManyAsync(details, indexName); var r = await _client.IndexManyAsync(details, indexName);
@ -645,7 +645,7 @@ public class WarningDetailsEsRepository : IWarningDetailsEsRepository, ITransien
public async Task InsertReturnWarningDetailsAsync(ReturnWarningDetailsIndex detail) 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; detail.IndexName = indexName;
var r = await _client.IndexAsync(detail, s => s.Index(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<ReturnWarningDetailsIndex> details, int maxRetries = 3) public async Task BulkInsertReturnWarningDetailsAsync(List<ReturnWarningDetailsIndex> details, int maxRetries = 3)
{ {
// 按天写入es // 按天写入es
var indexName = $"{GlobalConst.ReturnWarningDetailsIndex}-{DateTime.Now:yyyy.MM.dd}"; var indexName = $"{GlobalConst.ReturnWarningDetailsIndex}-{DateTime.Now:yyyy.MM}";
details.ForEach(x => x.IndexName = indexName); details.ForEach(x => x.IndexName = indexName);
var r = await _client.IndexManyAsync(details, indexName); var r = await _client.IndexManyAsync(details, indexName);
@ -671,7 +671,7 @@ public class WarningDetailsEsRepository : IWarningDetailsEsRepository, ITransien
public async Task InsertReturnMessageRecordAsync(ReturnMessageRecordIndex detail) 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; detail.IndexName = indexName;
var r = await _client.IndexAsync(detail, s => s.Index(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<ReturnMessageRecordIndex> details, int maxRetries = 3) public async Task BulkInsertReturnMessageRecordAsync(List<ReturnMessageRecordIndex> details, int maxRetries = 3)
{ {
// 按天写入es // 按天写入es
var indexName = $"{GlobalConst.ReturnMessageRecordIndex}-{DateTime.Now:yyyy.MM.dd}"; var indexName = $"{GlobalConst.ReturnMessageRecordIndex}-{DateTime.Now:yyyy.MM}";
details.ForEach(x => x.IndexName = indexName); details.ForEach(x => x.IndexName = indexName);
var r = await _client.IndexManyAsync(details, indexName); var r = await _client.IndexManyAsync(details, indexName);
@ -930,7 +930,7 @@ public class WarningDetailsEsRepository : IWarningDetailsEsRepository, ITransien
public async Task InsertCompleteWarningDetailsAsync(CompleteWarningDetailsIndex detail) 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; detail.IndexName = indexName;
var r = await _client.IndexAsync(detail, s => s.Index(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<CompleteWarningDetailsIndex> details, int maxRetries = 3) public async Task BulkInsertCompleteWarningDetailsAsync(List<CompleteWarningDetailsIndex> details, int maxRetries = 3)
{ {
// 按天写入es // 按天写入es
var indexName = $"{GlobalConst.CompleteWarningDetailsIndex}-{DateTime.Now:yyyy.MM.dd}"; var indexName = $"{GlobalConst.CompleteWarningDetailsIndex}-{DateTime.Now:yyyy.MM}";
details.ForEach(x => x.IndexName = indexName); details.ForEach(x => x.IndexName = indexName);
var r = await _client.IndexManyAsync(details, indexName); var r = await _client.IndexManyAsync(details, indexName);
@ -958,10 +958,10 @@ public class WarningDetailsEsRepository : IWarningDetailsEsRepository, ITransien
public async Task CreateAliasAsync() public async Task CreateAliasAsync()
{ {
var indexName1 = $"{GlobalConst.TransportWarningDetailsIndex}-{DateTime.Now:yyyy.MM.dd}"; var indexName1 = $"{GlobalConst.TransportWarningDetailsIndex}-{DateTime.Now:yyyy.MM}";
var indexName2 = $"{GlobalConst.ReturnWarningDetailsIndex}-{DateTime.Now:yyyy.MM.dd}"; var indexName2 = $"{GlobalConst.ReturnWarningDetailsIndex}-{DateTime.Now:yyyy.MM}";
var indexName3 = $"{GlobalConst.CompleteWarningDetailsIndex}-{DateTime.Now:yyyy.MM.dd}"; var indexName3 = $"{GlobalConst.CompleteWarningDetailsIndex}-{DateTime.Now:yyyy.MM}";
var indexName4 = $"{GlobalConst.ReturnMessageRecordIndex}-{DateTime.Now:yyyy.MM.dd}"; var indexName4 = $"{GlobalConst.ReturnMessageRecordIndex}-{DateTime.Now:yyyy.MM}";
var exists1 = await _client.Indices.ExistsAsync(indexName1); var exists1 = await _client.Indices.ExistsAsync(indexName1);
if (!exists1.Exists) if (!exists1.Exists)

4
src/SJZY.Track.Repository/Repositories/WarningRecordEsRepository.cs
View File

@ -16,7 +16,7 @@ public class WarningRecordEsRepository : ElasticSearchContextAbstract<WarningRec
public async Task AddAsync(WarningRecordIndex index) public async Task AddAsync(WarningRecordIndex index)
{ {
index.IndexName = $"{GlobalConst.TrackWarningRecordIndex}-{DateTime.Now:yyyy.MM.dd}"; index.IndexName = $"{GlobalConst.TrackWarningRecordIndex}-{DateTime.Now:yyyy.MM}";
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
@ -33,7 +33,7 @@ public class WarningRecordEsRepository : ElasticSearchContextAbstract<WarningRec
{ {
if (!warningRecords.Any()) return; if (!warningRecords.Any()) return;
// 按天写入es // 按天写入es
var indexName = $"{GlobalConst.TrackWarningRecordIndex}-{DateTime.Now:yyyy.MM.dd}"; var indexName = $"{GlobalConst.TrackWarningRecordIndex}-{DateTime.Now:yyyy.MM}";
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);