fix: 租户列表接口添加分页支持
- 支持 page 和 pageSize 参数 - 返回 PagedResult<TenantListItemDto> Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
@@ -21,22 +21,31 @@ public sealed class TenantsController(IMediator mediator) : BaseApiController
|
|||||||
/// 获取租户列表(用于下拉选择器)。
|
/// 获取租户列表(用于下拉选择器)。
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="keyword">关键字(租户名称/编码)。</param>
|
/// <param name="keyword">关键字(租户名称/编码)。</param>
|
||||||
|
/// <param name="page">页码(从 1 开始)。</param>
|
||||||
|
/// <param name="pageSize">每页条数。</param>
|
||||||
/// <param name="cancellationToken">取消标记。</param>
|
/// <param name="cancellationToken">取消标记。</param>
|
||||||
/// <returns>租户列表。</returns>
|
/// <returns>租户分页列表。</returns>
|
||||||
[HttpGet]
|
[HttpGet]
|
||||||
[PermissionAuthorize("tenant:read")]
|
[PermissionAuthorize("tenant:read")]
|
||||||
[ProducesResponseType(typeof(ApiResponse<IReadOnlyList<TenantListItemDto>>), StatusCodes.Status200OK)]
|
[ProducesResponseType(typeof(ApiResponse<PagedResult<TenantListItemDto>>), StatusCodes.Status200OK)]
|
||||||
public async Task<ApiResponse<IReadOnlyList<TenantListItemDto>>> List(
|
public async Task<ApiResponse<PagedResult<TenantListItemDto>>> List(
|
||||||
[FromQuery] string? keyword,
|
[FromQuery] string? keyword,
|
||||||
CancellationToken cancellationToken)
|
[FromQuery] int page = 1,
|
||||||
|
[FromQuery] int pageSize = 20,
|
||||||
|
CancellationToken cancellationToken = default)
|
||||||
{
|
{
|
||||||
// 1. 构造查询
|
// 1. 构造查询
|
||||||
var query = new ListTenantsQuery { Keyword = keyword };
|
var query = new ListTenantsQuery
|
||||||
|
{
|
||||||
|
Keyword = keyword,
|
||||||
|
Page = page,
|
||||||
|
PageSize = pageSize
|
||||||
|
};
|
||||||
|
|
||||||
// 2. 执行查询
|
// 2. 执行查询
|
||||||
var result = await mediator.Send(query, cancellationToken);
|
var result = await mediator.Send(query, cancellationToken);
|
||||||
|
|
||||||
// 3. 返回租户列表
|
// 3. 返回租户分页列表
|
||||||
return ApiResponse<IReadOnlyList<TenantListItemDto>>.Ok(result);
|
return ApiResponse<PagedResult<TenantListItemDto>>.Ok(result);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ using MediatR;
|
|||||||
using TakeoutSaaS.Application.App.Tenants.Contracts;
|
using TakeoutSaaS.Application.App.Tenants.Contracts;
|
||||||
using TakeoutSaaS.Application.App.Tenants.Queries;
|
using TakeoutSaaS.Application.App.Tenants.Queries;
|
||||||
using TakeoutSaaS.Domain.Tenants.Repositories;
|
using TakeoutSaaS.Domain.Tenants.Repositories;
|
||||||
|
using TakeoutSaaS.Shared.Abstractions.Results;
|
||||||
|
|
||||||
namespace TakeoutSaaS.Application.App.Tenants.Handlers;
|
namespace TakeoutSaaS.Application.App.Tenants.Handlers;
|
||||||
|
|
||||||
@@ -9,16 +10,27 @@ namespace TakeoutSaaS.Application.App.Tenants.Handlers;
|
|||||||
/// 获取租户列表查询处理器。
|
/// 获取租户列表查询处理器。
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public sealed class ListTenantsQueryHandler(ITenantRepository tenantRepository)
|
public sealed class ListTenantsQueryHandler(ITenantRepository tenantRepository)
|
||||||
: IRequestHandler<ListTenantsQuery, IReadOnlyList<TenantListItemDto>>
|
: IRequestHandler<ListTenantsQuery, PagedResult<TenantListItemDto>>
|
||||||
{
|
{
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public async Task<IReadOnlyList<TenantListItemDto>> Handle(ListTenantsQuery request, CancellationToken cancellationToken)
|
public async Task<PagedResult<TenantListItemDto>> Handle(ListTenantsQuery request, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
// 1. 查询租户列表
|
// 1. 查询租户列表
|
||||||
var tenants = await tenantRepository.GetAllAsync(request.Keyword, cancellationToken);
|
var tenants = await tenantRepository.GetAllAsync(request.Keyword, cancellationToken);
|
||||||
|
|
||||||
// 2. 映射 DTO
|
// 2. 计算分页参数
|
||||||
return tenants.Select(t => new TenantListItemDto
|
var totalCount = tenants.Count;
|
||||||
|
var page = Math.Max(1, request.Page);
|
||||||
|
var pageSize = Math.Clamp(request.PageSize, 1, 100);
|
||||||
|
|
||||||
|
// 3. 应用分页
|
||||||
|
var pagedTenants = tenants
|
||||||
|
.Skip((page - 1) * pageSize)
|
||||||
|
.Take(pageSize)
|
||||||
|
.ToArray();
|
||||||
|
|
||||||
|
// 4. 映射 DTO
|
||||||
|
var dtos = pagedTenants.Select(t => new TenantListItemDto
|
||||||
{
|
{
|
||||||
Id = t.Id,
|
Id = t.Id,
|
||||||
Code = t.Code,
|
Code = t.Code,
|
||||||
@@ -26,5 +38,8 @@ public sealed class ListTenantsQueryHandler(ITenantRepository tenantRepository)
|
|||||||
ShortName = t.ShortName,
|
ShortName = t.ShortName,
|
||||||
Status = t.Status
|
Status = t.Status
|
||||||
}).ToArray();
|
}).ToArray();
|
||||||
|
|
||||||
|
// 5. 返回分页结果
|
||||||
|
return new PagedResult<TenantListItemDto>(dtos, page, pageSize, totalCount);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,15 +1,26 @@
|
|||||||
using MediatR;
|
using MediatR;
|
||||||
using TakeoutSaaS.Application.App.Tenants.Contracts;
|
using TakeoutSaaS.Application.App.Tenants.Contracts;
|
||||||
|
using TakeoutSaaS.Shared.Abstractions.Results;
|
||||||
|
|
||||||
namespace TakeoutSaaS.Application.App.Tenants.Queries;
|
namespace TakeoutSaaS.Application.App.Tenants.Queries;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 获取租户列表查询(用于下拉选择器)。
|
/// 获取租户列表查询(用于下拉选择器)。
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public sealed record ListTenantsQuery : IRequest<IReadOnlyList<TenantListItemDto>>
|
public sealed record ListTenantsQuery : IRequest<PagedResult<TenantListItemDto>>
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 关键字(租户名称/编码)。
|
/// 关键字(租户名称/编码)。
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string? Keyword { get; init; }
|
public string? Keyword { get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 页码(从 1 开始)。
|
||||||
|
/// </summary>
|
||||||
|
public int Page { get; init; } = 1;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 每页条数。
|
||||||
|
/// </summary>
|
||||||
|
public int PageSize { get; init; } = 20;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user