feat:轨迹查询(QueryAsync,QueryAsyncV2),增加根据请求header中的子系统标识(SubsystemId)控制轨迹的可见度,内部系统所有轨迹全部可见,外部系统则要求过滤外部轨迹

This commit is contained in:
hardstylewyl 2025-01-07 09:11:48 +08:00
parent 3b37d73df8
commit f2c9356668
6 changed files with 50 additions and 4 deletions

View File

@ -1,7 +1,9 @@
using Microsoft.AspNetCore.Http;
using SJZY.Track.Application.Contract.Dtos.ProvideServices;
using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate;
using SJZY.Track.Domain.Aggregates.TrackTemplateAggregate;
using SJZY.Track.Domain.Dtos.TrackTemplate;
using SJZY.Track.Domain.Queries;
namespace SJZY.Track.Application.Services.ProvideServices;
@ -12,6 +14,8 @@ public partial class TrackService
{
private readonly ITrackDetailsEsRepository _trackDetailsEsRepository;
private readonly ITrackTemplateRepository _trackTemplateRepository;
private readonly IHttpContextAccessor _contextAccessor;
private readonly IVSystemQueries _vSystemQueries;
/// <summary>
/// 查询轨迹(时区补正)
@ -27,9 +31,12 @@ public partial class TrackService
var details = await _trackDetailsEsRepository.GetListAsync(input.SubSystemId, input.OrderType, input.OrderNos);
//内部子系统不过滤外部轨迹
var isFilterExternal = await HasFilterExternalTrack();
// 是否对外
var trackCodes = details.Select(x => x.TrackCode)
.Where(x => x != GlobalConst.EmptyString)
.WhereIf(isFilterExternal, x => x != GlobalConst.EmptyString)
.Distinct()
.ToList();
@ -109,9 +116,12 @@ public partial class TrackService
var details = await _trackDetailsEsRepository.GetListAsync(input.SubSystemId, input.OrderType, input.OrderNos);
//内部子系统不过滤外部轨迹
var isFilterExternal = await HasFilterExternalTrack();
// 是否对外
var trackCodes = details.Select(x => x.TrackCode)
.Where(x => x != GlobalConst.EmptyString)
.WhereIf(isFilterExternal, x => x != GlobalConst.EmptyString)
.Distinct()
.ToList();
@ -173,6 +183,22 @@ public partial class TrackService
return new UnifyResultDto<List<GetTrackOutput>>(true, sortedList, "操作成功");
}
//内部系统展示所有轨迹,外部系统则要求过滤外部轨迹
private async Task<bool> HasFilterExternalTrack()
{
var isFilter = true;
if (_contextAccessor.HttpContext!.Request.Headers.TryGetValue(GlobalConst.HTTP_HEADER_SUBSYSTEMID, out var subsystemIdStr))
{
if (int.TryParse(subsystemIdStr, out var subsystemId))
{
var systemEntity = await _vSystemQueries.GetFirstAsync(x => x.Id == subsystemId);
isFilter = systemEntity?.SystemProperty != 1;
}
}
return isFilter;
}
private async Task<List<GetTrackOutput>> TracksOrdered(List<GetTrackOutput> list, OrderNosInfo orderNosInfo, SortMethod? sortMethod, string? trackTemplateCode = null)
{

View File

@ -1,4 +1,5 @@
using DotNetCore.CAP;
using Microsoft.AspNetCore.Http;
using SJZY.Track.Application.Contract.Dtos.ProvideServices;
using SJZY.Track.Application.Contract.Events;
using SJZY.Track.Application.Contract.Services.ProvideServices;
@ -7,6 +8,7 @@ using SJZY.Track.Domain.Aggregates.TrackContentAggregate;
using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate;
using SJZY.Track.Domain.Aggregates.TrackTemplateAggregate;
using SJZY.Track.Domain.Enums;
using SJZY.Track.Domain.Queries;
using SJZY.UserCenter.HttpApi.Services;
using SJZY.UserCenter.HttpApi.Services.User;
using Volo.Abp.Http.Client.DynamicProxying;
@ -27,13 +29,15 @@ public partial class TrackService : ApplicationService, ITrackService
public TrackService(IOrderRepository orderRepository, ICapPublisher capPublisher,
ITrackDetailsEsRepository trackDetailsEsRepository, ITrackContentRepository trackContentRepository,
IHttpClientProxy<IUserBaseInfoService> requestCurrentUserService, ITrackTemplateRepository trackTemplateRepository)
IHttpClientProxy<IUserBaseInfoService> requestCurrentUserService, ITrackTemplateRepository trackTemplateRepository, IHttpContextAccessor contextAccessor, IVSystemQueries vSystemQueries)
{
_orderRepository = orderRepository;
this._orderRepository = orderRepository;
_capPublisher = capPublisher;
_trackContentRepository = trackContentRepository;
_requestCurrentUserService = requestCurrentUserService;
_vSystemQueries = vSystemQueries;
_contextAccessor = contextAccessor;
_trackTemplateRepository = trackTemplateRepository;
_trackDetailsEsRepository = trackDetailsEsRepository;
}

View File

@ -4,6 +4,7 @@ public partial class GlobalConst
{
public const string MainDataKey_OrderType = "TrackOrderType";
public const string MainDataKey_TrackQuestionType = "TrackQuestionType";
public const string HTTP_HEADER_SUBSYSTEMID = "Subsystemid";
public const string SystemUser = "系统";
public const string EmptyString = "--";
public const int ChunkSize = 100;

View File

@ -0,0 +1,7 @@
using SJZY.Track.Domain.VEntities;
namespace SJZY.Track.Domain.Queries;
public interface IVSystemQueries : IBasicQuery<VSystemEntity>
{
}

View File

@ -4,7 +4,7 @@ namespace SJZY.Track.Domain.VEntities;
///
/// </summary>
[SugarTable("v_system")]
public class VSystemEntity : IFullAuditedBasicEntitys
public class VSystemEntity : IFullAuditedBasicEntitys, IEntity
{
/// <summary>
/// 子系统id

View File

@ -0,0 +1,8 @@
using SJZY.Track.Domain.Queries;
using SJZY.Track.Domain.VEntities;
namespace SJZY.Track.Repository.Queries;
public class VSystemQueries : BasicQuery<VSystemEntity>, IVSystemQueries, ITransientDependency
{
}