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

Merge branch 'S06' into test

Browse Source
This commit is contained in:
hardstylewyl 2024-12-27 11:19:22 +08:00
commit 8d469d0a17
9 changed files with 88 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/SJZY.Track.Application.Contract/Dtos/ProvideServices/BatchUpsertTrackInput.cs
View File

@ -129,4 +129,9 @@ public class BatchUpsertTrackInput : OrderNosInfo
/// 是否强制推送
/// </summary>
public bool ForcedPush { get; set; }
/// <summary>
/// 指定是否推送
/// </summary>
public bool IsToMq { get; set; }
}

5
src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpsertTrackInput.cs
View File

@ -133,4 +133,9 @@ public class UpsertTrackInput : OrderNoInfo
/// 是否强制推送
/// </summary>
public bool ForcedPush { get; set; }
/// <summary>
/// 指定是否推送
/// </summary>
public bool IsToMq { get; set; }
}

4
src/SJZY.Track.Application.Contract/Events/TrackUpsertEvent.cs
View File

@ -151,6 +151,10 @@ public class TrackUpsertEvent
/// </summary>
public bool ForcedPush { get; set; }
/// <summary>
/// 指定是否推送
/// </summary>
public bool IsToMq { get; set; }
public override string ToString()
{

2
src/SJZY.Track.Application.Contract/SJZY.Track.Application.Contract.csproj
View File

@ -5,7 +5,7 @@
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
<Version>7.0.9</Version>
<Version>7.0.10</Version>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
</PropertyGroup>
<ItemGroup>

16
src/SJZY.Track.Application/CAP/EventHandlers/TrackPushEventHandler.cs
View File

@ -69,6 +69,7 @@ public class TrackPushEventHandler : ITransientDependency, ICapSubscribe
if (@event.ForcedPush)
{
//当为强制推送，会走手动推送逻辑
await DoPushAsync(@event);
return;
}
@ -95,7 +96,7 @@ public class TrackPushEventHandler : ITransientDependency, ICapSubscribe
var items = new List<TrackPushInput>();
TrackPushContentConfigDto? config;
var isSystemPush = @event.OperationMan == null;
if (isSystemPush)
if (isSystemPush && !@event.ForcedPush)
{
foreach (var order in _orders)
{
@ -139,13 +140,18 @@ public class TrackPushEventHandler : ITransientDependency, ICapSubscribe
if (config == null) return;
var tracks = await _trackDetailsEsRepository.GetListAsync(@event.OrderIds, @event.TrackCode);
tracks = tracks.DistinctBy(x => x.OrderId).ToList(); // 防止重复推送
if (tracks.Count == 0) return; // 一个能推的轨迹都不存在
// tips：人工推送只要能推就推了，不会校验已推和顺序问题，因为可能是更新
foreach (var track in tracks)
foreach (var order in _orders)
{
var order = _orders.First(x => x.Id == track.OrderId);
//取订单的下某个code的最新创建时间的轨迹 防止重复推送
var track = tracks
.Where(x => x.OrderId == order.Id && x.TrackCode == @event.TrackCode)
.OrderByDescending(x => x.CreateTime)
.FirstOrDefault();
if (track == null) return; // 一个能推的轨迹都不存在
if (config is { IsAllPush: true })
{
// 强制推送只需直接查出配置

6
src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs
View File

@ -49,8 +49,8 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe
var content = await HandleTrackAsync(@event, canNextOrderIds);
// 处理广播事件
if (content is { IsToMq: true })
await _broadcastingService.TrackChangePublicTopicAsync(@event, content);
if (content != null && (content.IsToMq || @event.IsToMq))
_broadcastingService.TrackChangePublicTopicAsync(@event, content);
if (canNextOrderIds.Count == 0) return;
// 根据订单关联关系异步向下刷（异步）
@ -219,7 +219,7 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe
Extra = @event.Extra
},
ForcedPush = @event.ForcedPush,
IsToMq = trackContent.IsToMq
IsToMq = (trackContent.IsToMq || @event.IsToMq)
};
await _capPublisher.PublishAsync(GlobalConst.TrackPushSubscribe, trackPushEvent);

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

@ -70,7 +70,7 @@ public class TrackPushCompletedEventHandler : ITransientDependency, IRabbitHandl
// 推送广播
if (log.IsToMq)
await _broadcastingService.TrackPushCompletedPublicTopicAsync(log);
_broadcastingService.TrackPushCompletedPublicTopicAsync(log);
// 往es 写推送日志
await _trackPushRecordEsRepository.AddAsync(log);

18
src/SJZY.Track.Application/Services/Broadcasting/BroadcastingService.cs
View File

@ -26,9 +26,7 @@ public class BroadcastingService : ITransientDependency
/// <param name="eto"></param>
/// <param name="content"></param>
/// <returns></returns>
public Task TrackChangePublicTopicAsync(TrackUpsertEvent eto, TrackContentVO content)
{
return Task.Run(() =>
public void TrackChangePublicTopicAsync(TrackUpsertEvent eto, TrackContentVO content)
{
var data = new TrackChangeEto
{
@ -63,9 +61,8 @@ public class BroadcastingService : ITransientDependency
else
data.Option = 3;
_rabbitClientBus.Publish(GlobalConst.TrackChangeExchange, $"TrackChange.{content.SubSystemCode}", Encoding.UTF8.GetBytes(data.ToJson()));
return Task.CompletedTask;
});
_rabbitClientBus.Publish(GlobalConst.TrackChangeExchange, $"TrackChange.{content.SubSystemCode}",
Encoding.UTF8.GetBytes(data.ToJson()));
}
/// <summary>
@ -73,9 +70,7 @@ public class BroadcastingService : ITransientDependency
/// </summary>
/// <param name="log"></param>
/// <returns></returns>
public Task TrackPushCompletedPublicTopicAsync(TrackPushRecordIndex log)
{
return Task.Run(() =>
public void TrackPushCompletedPublicTopicAsync(TrackPushRecordIndex log)
{
var data = new TrackPushCompletedEvent
{
@ -97,8 +92,7 @@ public class BroadcastingService : ITransientDependency
Extra = log.Extra
};
_rabbitClientBus.Publish(GlobalConst.TrackPushExchange, $"TrackPush.{log.SubSystemCode}", Encoding.UTF8.GetBytes(data.ToJson()));
return Task.CompletedTask;
});
_rabbitClientBus.Publish(GlobalConst.TrackPushExchange, $"TrackPush.{log.SubSystemCode}",
Encoding.UTF8.GetBytes(data.ToJson()));
}
}

4
src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs
View File

@ -145,6 +145,7 @@ public partial class TrackService : ApplicationService, ITrackService
{
//todo:保留之前的方式 后续可去除
userInfo = await _requestCurrentUserService.Service.GetCurrentUserBasicInfoAsync(input.OptionUserId);
if (userInfo.Code != GlobalConst.SuccessCode || userInfo.Data is null)
//TODO: log || ex
throw new BusinessException(message: $"调用用户中心，获取用户信息失败:{userInfo.Msg}");
@ -477,7 +478,8 @@ public partial class TrackService : ApplicationService, ITrackService
EstimatedDeliveryDate = input.EstimatedDeliveryDate,
DestinationTimeZone = input.DestinationTimeZone,
Extra = input.Extra,
ForcedPush = input.ForcedPush
ForcedPush = input.ForcedPush,
IsToMq = input.IsToMq,
};
await _capPublisher.PublishAsync(GlobalConst.TrackUpsertSubscribe, @event);
}