fix 日志查询优化
This commit is contained in:
@@ -2,16 +2,17 @@
|
|||||||
using Dlhis.Basic.Common.ApiLog.Response;
|
using Dlhis.Basic.Common.ApiLog.Response;
|
||||||
using Dlhis.Basic.Common.ApiLog.Services.Implements;
|
using Dlhis.Basic.Common.ApiLog.Services.Implements;
|
||||||
using Dlhis.Entity.Common;
|
using Dlhis.Entity.Common;
|
||||||
|
using Kurisu.AspNetCore.CustomClass;
|
||||||
using Kurisu.AspNetCore.DataAccess.Dto;
|
using Kurisu.AspNetCore.DataAccess.Dto;
|
||||||
using Kurisu.AspNetCore.DataAccess.SqlSugar.Extensions;
|
using Kurisu.AspNetCore.DataAccess.SqlSugar.Extensions;
|
||||||
using Kurisu.AspNetCore.DataAccess.SqlSugar.Services;
|
using Kurisu.AspNetCore.DataAccess.SqlSugar.Services;
|
||||||
using Kurisu.AspNetCore.Utils.Extensions;
|
using Kurisu.AspNetCore.Utils.Extensions;
|
||||||
using SqlSugar;
|
using SqlSugar;
|
||||||
|
|
||||||
namespace Dlhis.Basic.Common.ApiLog.Services
|
namespace Dlhis.Basic.Common.ApiLog.Services;
|
||||||
|
|
||||||
|
public class ApiLogService : IApiLogService
|
||||||
{
|
{
|
||||||
public class ApiLogService : IApiLogService
|
|
||||||
{
|
|
||||||
private readonly IDbContext _dbContext;
|
private readonly IDbContext _dbContext;
|
||||||
|
|
||||||
public ApiLogService(IDbContext dbContext)
|
public ApiLogService(IDbContext dbContext)
|
||||||
@@ -22,15 +23,19 @@ namespace Dlhis.Basic.Common.ApiLog.Services
|
|||||||
public async Task<Pagination<ApiLogResponse>> GetLogsAsync(ApiLogRequest request)
|
public async Task<Pagination<ApiLogResponse>> GetLogsAsync(ApiLogRequest request)
|
||||||
{
|
{
|
||||||
var logs = await _dbContext.ChangeDb("log").Queryable<ApiLogEntity>()
|
var logs = await _dbContext.ChangeDb("log").Queryable<ApiLogEntity>()
|
||||||
.WhereIF(request.SearchDateTimePeriod?.Start.HasValue == true && request.SearchDateTimePeriod?.End.HasValue == true,
|
.WhereIF(request.SearchDateTimePeriod.HasValue(), x => x._ts >= request.SearchDateTimePeriod.Start && x._ts <= request.SearchDateTimePeriod.End)
|
||||||
x => x._ts >= request.SearchDateTimePeriod.Start && x._ts <= request.SearchDateTimePeriod.End)
|
|
||||||
.WhereIF(request.Search.IsPresent(), x => x.Message.Contains(request.Search))
|
|
||||||
.WhereIF(request.Level.HasValue, x => x.Level == request.Level)
|
.WhereIF(request.Level.HasValue, x => x.Level == request.Level)
|
||||||
.OrderBy(x => x.Timestamp, OrderByType.Desc)
|
.WhereIF(request.Search.IsPresent(), x => x.Message.Contains(request.Search))
|
||||||
|
.OrderBy(x => x._ts, OrderByType.Desc)
|
||||||
.Select<ApiLogResponse>()
|
.Select<ApiLogResponse>()
|
||||||
.ToPageListAsync(request);
|
.ToPageListAsync(request.PageIndex, request.PageSize);
|
||||||
|
|
||||||
return logs;
|
return new Pagination<ApiLogResponse>
|
||||||
}
|
{
|
||||||
|
PageIndex = request.PageIndex,
|
||||||
|
PageSize = request.PageSize,
|
||||||
|
Total = 0,
|
||||||
|
Data = logs
|
||||||
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user