Browse Source

fix(dynamic-quertable): 当用户方法与动态查询重名时, 自动api端点不会创建多个端点.

pull/772/head
cKey 3 years ago
parent
commit
2706fc3ef2
  1. 4
      aspnet-core/modules/dynamic-queryable/LINGYUN.Abp.Dynamic.Queryable.Application.Contracts/LINGYUN/Abp/Dynamic/Queryable/IDynamicQueryableAppService.cs
  2. 8
      aspnet-core/modules/dynamic-queryable/LINGYUN.Abp.Dynamic.Queryable.Application/LINGYUN/Abp/Dynamic/Queryable/DynamicQueryableAppService.cs
  3. 4
      aspnet-core/modules/dynamic-queryable/LINGYUN.Abp.Dynamic.Queryable.HttpApi/LINGYUN/Abp/Dynamic/Queryable/DynamicQueryableControllerBase.cs

4
aspnet-core/modules/dynamic-queryable/LINGYUN.Abp.Dynamic.Queryable.Application.Contracts/LINGYUN/Abp/Dynamic/Queryable/IDynamicQueryableAppService.cs

@ -13,7 +13,7 @@ public interface IDynamicQueryableAppService<TEntityDto>
/// <summary>
/// 根据动态条件查询数据
/// </summary>
/// <param name="input"></param>
/// <param name="dynamicInput"></param>
/// <returns></returns>
Task<PagedResultDto<TEntityDto>> GetListAsync(GetListByDynamicQueryableInput input);
Task<PagedResultDto<TEntityDto>> GetListAsync(GetListByDynamicQueryableInput dynamicInput);
}

8
aspnet-core/modules/dynamic-queryable/LINGYUN.Abp.Dynamic.Queryable.Application/LINGYUN/Abp/Dynamic/Queryable/DynamicQueryableAppService.cs

@ -56,16 +56,16 @@ public abstract class DynamicQueryableAppService<TEntity, TEntityDto> : Applicat
/// <summary>
/// 根据动态条件查询数据
/// </summary>
/// <param name="input"></param>
/// <param name="dynamicInput"></param>
/// <returns></returns>
public async virtual Task<PagedResultDto<TEntityDto>> GetListAsync(GetListByDynamicQueryableInput input)
public async virtual Task<PagedResultDto<TEntityDto>> GetListAsync(GetListByDynamicQueryableInput dynamicInput)
{
Expression<Func<TEntity, bool>> condition = (e) => true;
condition = condition.DynamicQuery(input.Queryable);
condition = condition.DynamicQuery(dynamicInput.Queryable);
var totalCount = await GetCountAsync(condition);
var entities = await GetListAsync(condition, input);
var entities = await GetListAsync(condition, dynamicInput);
return new PagedResultDto<TEntityDto>(totalCount,
MapToEntitiesDto(entities));

4
aspnet-core/modules/dynamic-queryable/LINGYUN.Abp.Dynamic.Queryable.HttpApi/LINGYUN/Abp/Dynamic/Queryable/DynamicQueryableControllerBase.cs

@ -24,8 +24,8 @@ public abstract class DynamicQueryableControllerBase<TEntityDto> : AbpController
[HttpPost]
[Route("search")]
public Task<PagedResultDto<TEntityDto>> GetListAsync(GetListByDynamicQueryableInput input)
public Task<PagedResultDto<TEntityDto>> GetListAsync(GetListByDynamicQueryableInput dynamicInput)
{
return DynamicQueryableAppService.GetListAsync(input);
return DynamicQueryableAppService.GetListAsync(dynamicInput);
}
}

Loading…
Cancel
Save