From b9f80fa069eff7ef197d0dba85aef546c217ff0f Mon Sep 17 00:00:00 2001 From: xiaolipro <2357729423@qq.com> Date: Thu, 26 Sep 2024 10:17:15 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E8=BD=A8=E8=BF=B9=E6=8E=A8?= =?UTF-8?q?=E9=80=81=E5=AD=90=E7=B3=BB=E7=BB=9Fcode=E6=9C=AA=E4=BC=A0=20ch?= =?UTF-8?q?ange=EF=BC=9Acap-filter=E5=B9=82=E7=AD=89=E6=94=B9=E4=B8=BA3?= =?UTF-8?q?=E5=88=86=E9=92=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/SJZY.Track.Application/CAP/CAPFilter.cs | 2 +- .../Services/ProvideServices/TrackPushService.cs | 7 ++++++- .../Dtos/TrackPush/GetTrackPushContentPageOutputVO.cs | 7 ++++++- src/SJZY.Track.Domain/Queries/IProvideQueries.cs | 7 +++++++ src/SJZY.Track.Repository/Queries/ProvideQueries.cs | 8 ++++++++ .../Repositories/TrackPushConfigRepository.cs | 3 ++- 6 files changed, 30 insertions(+), 4 deletions(-) diff --git a/src/SJZY.Track.Application/CAP/CAPFilter.cs b/src/SJZY.Track.Application/CAP/CAPFilter.cs index cf67237a..c247e349 100644 --- a/src/SJZY.Track.Application/CAP/CAPFilter.cs +++ b/src/SJZY.Track.Application/CAP/CAPFilter.cs @@ -43,7 +43,7 @@ public class CapFilter : SubscribeFilter context.DeliverMessage.Headers.TryGetValue("sjzy-arguments-hash", out var hash); if (!hash.IsNullOrEmpty()) { - await RedisHelper.Client.SetAsync($"CapExecuteFilter:{hash}", 1, TimeSpan.FromMinutes(10).Seconds); + await RedisHelper.Client.SetAsync($"CapExecuteFilter:{hash}", 1, TimeSpan.FromMinutes(3)); } } diff --git a/src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs b/src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs index 7675cf3c..48c89192 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs +++ b/src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs @@ -7,6 +7,7 @@ using SJZY.Track.Application.Contract.Services.ProvideServices; using SJZY.Track.Domain.Aggregates.OrderAggregate; using SJZY.Track.Domain.Aggregates.TrackPushAggregate; using SJZY.Track.Domain.Dtos.TrackPush; +using SJZY.Track.Domain.Queries; using SJZY.UserCenter.HttpApi.Services; using Volo.Abp.Http.Client.DynamicProxying; @@ -21,6 +22,7 @@ public class TrackPushService : ApplicationService, ITrackPushService { private readonly ICapPublisher _capPublisher; private readonly IOrderRepository _orderRepository; + private readonly IProvideQueries _provideQueries; private readonly IHttpClientProxy _requestCurrentUserService; private readonly ITrackPushConfigRepository _trackPushConfigRepository; private readonly ITrackPushRecordEsRepository _trackPushRecordEsRepository; @@ -29,13 +31,14 @@ public class TrackPushService : ApplicationService, ITrackPushService , ICapPublisher capPublisher , ITrackPushRecordEsRepository trackPushRecordEsRepository , IHttpClientProxy requestCurrentUserService - , ITrackPushConfigRepository trackPushConfigRepository) + , ITrackPushConfigRepository trackPushConfigRepository, IProvideQueries provideQueries) { _orderRepository = orderRepository; _capPublisher = capPublisher; _trackPushRecordEsRepository = trackPushRecordEsRepository; _requestCurrentUserService = requestCurrentUserService; _trackPushConfigRepository = trackPushConfigRepository; + _provideQueries = provideQueries; } /// @@ -48,6 +51,7 @@ public class TrackPushService : ApplicationService, ITrackPushService { input.OrderNos = input.OrderNos.Where(x => !x.IsNullOrWhiteSpace()).Distinct().ToList(); // 单号去重、去空 + var subSystemCode = await _provideQueries.SubSystemId2CodeAsync(input.SubSystemId); var orders = await _orderRepository.GetArrayAsync(x => x.SubSystemId == input.SubSystemId && x.OrderType == input.OrderType && input.OrderNos.Contains(x.OrderNo), @@ -76,6 +80,7 @@ public class TrackPushService : ApplicationService, ITrackPushService { OptionType = OptionType.新增, SubSystemId = input.SubSystemId, + SubSystemCode = subSystemCode, CustomId = group.Key, OrderIds = group.Select(x => x.Id).ToArray(), TrackCode = input.TrackCode, diff --git a/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushContentPageOutputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushContentPageOutputVO.cs index 7752372b..6b730f2b 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushContentPageOutputVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackPush/GetTrackPushContentPageOutputVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackPush; +namespace SJZY.Track.Domain.Dtos.TrackPush; public class GetTrackPushContentPageOutputVO { @@ -7,6 +7,11 @@ public class GetTrackPushContentPageOutputVO /// public string Code { get; set; } + /// + /// 轨迹内容id + /// + public int ContentId { get; set; } + /// /// 轨迹内容 /// diff --git a/src/SJZY.Track.Domain/Queries/IProvideQueries.cs b/src/SJZY.Track.Domain/Queries/IProvideQueries.cs index e9ba5b27..60c0b330 100644 --- a/src/SJZY.Track.Domain/Queries/IProvideQueries.cs +++ b/src/SJZY.Track.Domain/Queries/IProvideQueries.cs @@ -49,4 +49,11 @@ public interface IProvideQueries /// /// Task> GetAllPullConfigsAsync(); + + /// + /// 子系统id换code + /// + /// + /// + Task SubSystemId2CodeAsync(int subSystemId); } diff --git a/src/SJZY.Track.Repository/Queries/ProvideQueries.cs b/src/SJZY.Track.Repository/Queries/ProvideQueries.cs index 291c1034..91550425 100644 --- a/src/SJZY.Track.Repository/Queries/ProvideQueries.cs +++ b/src/SJZY.Track.Repository/Queries/ProvideQueries.cs @@ -110,6 +110,14 @@ public class ProvideQueries : ISugarRepository, IProvideQueries, ITransientDepen .ToListAsync(); } + public async Task SubSystemId2CodeAsync(int subSystemId) + { + return await Context.Queryable() + .Where(x => x.Id == subSystemId) + .Select(x => x.Key) + .FirstAsync(); + } + /// /// db context /// diff --git a/src/SJZY.Track.Repository/Repositories/TrackPushConfigRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackPushConfigRepository.cs index 62883d47..050d7d9e 100644 --- a/src/SJZY.Track.Repository/Repositories/TrackPushConfigRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/TrackPushConfigRepository.cs @@ -51,7 +51,8 @@ public class TrackPushConfigRepository : BasicRepository, { Id = pushContent.Id, Sort = pushContent.Sort, - OrderNoType = enumValue.Disp + OrderNoType = enumValue.Disp, + ContentId = pushContent.TrackContentId, }, true) .ToPagedListAsync(input.PageIndex, input.PageSize); }