Merge branch 'S06' into test
This commit is contained in:
commit
e3ef469250
@ -18,13 +18,13 @@ namespace SJZY.Track.Application.CAP.EventHandlers;
|
|||||||
public class TrackDeleteEventHandler : ITransientDependency, ICapSubscribe
|
public class TrackDeleteEventHandler : ITransientDependency, ICapSubscribe
|
||||||
{
|
{
|
||||||
private readonly ICapPublisher _capPublisher;
|
private readonly ICapPublisher _capPublisher;
|
||||||
private readonly IOrderRepository _orderRepository;
|
|
||||||
private readonly ITrackStatusRepository _trackStatusRepository;
|
|
||||||
private readonly ITrackContentRepository _trackContentRepository;
|
|
||||||
private readonly IProvideQueries _provideQueries;
|
|
||||||
private readonly ITrackDetailsEsRepository _trackDetailsEsRepository;
|
|
||||||
private readonly RabbitClientBus _rabbitClientBus;
|
|
||||||
private readonly IOrderOperationRecordEsRepository _orderOperationRecordEsRepository;
|
private readonly IOrderOperationRecordEsRepository _orderOperationRecordEsRepository;
|
||||||
|
private readonly IOrderRepository _orderRepository;
|
||||||
|
private readonly IProvideQueries _provideQueries;
|
||||||
|
private readonly RabbitClientBus _rabbitClientBus;
|
||||||
|
private readonly ITrackContentRepository _trackContentRepository;
|
||||||
|
private readonly ITrackDetailsEsRepository _trackDetailsEsRepository;
|
||||||
|
private readonly ITrackStatusRepository _trackStatusRepository;
|
||||||
|
|
||||||
public TrackDeleteEventHandler(IProvideQueries provideQueries,
|
public TrackDeleteEventHandler(IProvideQueries provideQueries,
|
||||||
IOrderRepository orderRepository, ICapPublisher capPublisher,
|
IOrderRepository orderRepository, ICapPublisher capPublisher,
|
||||||
@ -128,6 +128,7 @@ public class TrackDeleteEventHandler : ITransientDependency, ICapSubscribe
|
|||||||
|
|
||||||
private async Task PublicTrackTopicAsync(TrackDeleteEvent eto, List<TrackDetailsIndex> trackList)
|
private async Task PublicTrackTopicAsync(TrackDeleteEvent eto, List<TrackDetailsIndex> trackList)
|
||||||
{
|
{
|
||||||
|
// // todo: review 这里查库太多了
|
||||||
if (trackList == null)
|
if (trackList == null)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@ -167,7 +168,8 @@ public class TrackDeleteEventHandler : ITransientDependency, ICapSubscribe
|
|||||||
Option = 2
|
Option = 2
|
||||||
};
|
};
|
||||||
|
|
||||||
_rabbitClientBus.Publish(GlobalConst.TrackChangeExchange, $"TrackChange.{content.SubSystemCode}", Encoding.UTF8.GetBytes(data.ToJson()));
|
_rabbitClientBus.Publish(GlobalConst.TrackChangeExchange, $"TrackChange.{content.SubSystemCode}",
|
||||||
|
Encoding.UTF8.GetBytes(data.ToJson()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -50,6 +50,7 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe
|
|||||||
|
|
||||||
// 处理广播事件
|
// 处理广播事件
|
||||||
if (content != null && (content.IsToMq || @event.IsToMq))
|
if (content != null && (content.IsToMq || @event.IsToMq))
|
||||||
|
// todo: review BroadcastingService抽一层接口,面向抽象编程
|
||||||
_broadcastingService.TrackChangePublicTopicAsync(@event, content);
|
_broadcastingService.TrackChangePublicTopicAsync(@event, content);
|
||||||
|
|
||||||
if (canNextOrderIds.Count == 0) return;
|
if (canNextOrderIds.Count == 0) return;
|
||||||
|
|||||||
@ -378,18 +378,7 @@ public class TrackDetailsEsRepository : ElasticSearchContextAbstract<TrackDetail
|
|||||||
|
|
||||||
var r = await Context.SearchAsync<TrackDetailsIndex>(x => x
|
var r = await Context.SearchAsync<TrackDetailsIndex>(x => x
|
||||||
.Index(GlobalConst.TrackDetailsIndex)
|
.Index(GlobalConst.TrackDetailsIndex)
|
||||||
.Source(s => s.Includes(fd => fd
|
.Source()
|
||||||
.Field(f => f.OrderId)
|
|
||||||
.Field(f => f.OrderNo)
|
|
||||||
.Field(f => f.TrackStatus)
|
|
||||||
.Field(f => f.TrackCode)
|
|
||||||
.Field(f => f.TrackContent)
|
|
||||||
.Field(f => f.OriginTrackContent)
|
|
||||||
.Field(f => f.TrackPlace)
|
|
||||||
.Field(f => f.TrackTime)
|
|
||||||
.Field(f => f.ZeroTrackTime)
|
|
||||||
.Field(f => f.TrackTimeZone)
|
|
||||||
))
|
|
||||||
.Query(q =>
|
.Query(q =>
|
||||||
q.Bool(b => b
|
q.Bool(b => b
|
||||||
.Must(
|
.Must(
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user