diff --git a/src/Contracts/Masa.Tsc.Contracts.Admin/Logs/RequestLogLatestDto.cs b/src/Contracts/Masa.Tsc.Contracts.Admin/Logs/RequestLogLatestDto.cs index 519fa0d2..f5d80f79 100644 --- a/src/Contracts/Masa.Tsc.Contracts.Admin/Logs/RequestLogLatestDto.cs +++ b/src/Contracts/Masa.Tsc.Contracts.Admin/Logs/RequestLogLatestDto.cs @@ -11,5 +11,7 @@ public class RequestLogLatestDto : FromUri public DateTime End { get; set; } + public string Service { get; set; } + public bool IsDesc { get; set; } = true; } diff --git a/src/Services/Masa.Tsc.Service.Admin/Application/Logs/Queries/LatestLogQuery.cs b/src/Services/Masa.Tsc.Service.Admin/Application/Logs/Queries/LatestLogQuery.cs index 27e91d1a..b37bf409 100644 --- a/src/Services/Masa.Tsc.Service.Admin/Application/Logs/Queries/LatestLogQuery.cs +++ b/src/Services/Masa.Tsc.Service.Admin/Application/Logs/Queries/LatestLogQuery.cs @@ -3,7 +3,7 @@ namespace Masa.Tsc.Service.Admin.Application.Logs; -public record LatestLogQuery(DateTime Start, DateTime End, string Query, bool IsDesc = true) : Query +public record LatestLogQuery(DateTime Start, DateTime End,string Service, string Query, bool IsDesc = true) : Query { public override LogResponseDto Result { get; set; } } diff --git a/src/Services/Masa.Tsc.Service.Admin/Application/Logs/QueryHandler.cs b/src/Services/Masa.Tsc.Service.Admin/Application/Logs/QueryHandler.cs index d7b6ea03..d2eac7ef 100644 --- a/src/Services/Masa.Tsc.Service.Admin/Application/Logs/QueryHandler.cs +++ b/src/Services/Masa.Tsc.Service.Admin/Application/Logs/QueryHandler.cs @@ -33,6 +33,7 @@ public async Task GetLatestDataAsync(LatestLogQuery queryData) Start = queryData.Start, End = queryData.End, RawQuery = queryData.Query, + Service=queryData.Service, Page = 1, PageSize = 1, Sort = new FieldOrderDto { Name = StorageConst.Current.Timestimap, IsDesc = !queryData.IsDesc } diff --git a/src/Services/Masa.Tsc.Service.Admin/Services/LogService.cs b/src/Services/Masa.Tsc.Service.Admin/Services/LogService.cs index 20a378e8..7d256820 100644 --- a/src/Services/Masa.Tsc.Service.Admin/Services/LogService.cs +++ b/src/Services/Masa.Tsc.Service.Admin/Services/LogService.cs @@ -22,7 +22,7 @@ private async Task AggregateAsync([FromServices] IEventBus eventBus, [Fr private async Task GetLatestAsync([FromServices] IEventBus eventBus, [FromBody] RequestLogLatestDto param) { - var query = new LatestLogQuery(param.Start, param.End, param.Query, param.IsDesc); + var query = new LatestLogQuery(param.Start, param.End, param.Service, param.Query, param.IsDesc); await eventBus.PublishAsync(query); return query.Result; } diff --git a/src/Web/Masa.Tsc.Web.Admin.Server/Pages/_Layout.cshtml b/src/Web/Masa.Tsc.Web.Admin.Server/Pages/_Layout.cshtml index debad946..64cf3f43 100644 --- a/src/Web/Masa.Tsc.Web.Admin.Server/Pages/_Layout.cshtml +++ b/src/Web/Masa.Tsc.Web.Admin.Server/Pages/_Layout.cshtml @@ -50,5 +50,6 @@ + \ No newline at end of file