From 8f5f651dde79d6255ae38bef7319123a06069672 Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Thu, 28 Nov 2024 15:38:27 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E6=97=A5=E5=BF=97=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Common/ApiLog/Services/ApiLogService.cs   | 45 ++++++++++---------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/Src/Dlhis.Basic/Common/ApiLog/Services/ApiLogService.cs b/Src/Dlhis.Basic/Common/ApiLog/Services/ApiLogService.cs
index bbf0ea41..8474b220 100644
--- a/Src/Dlhis.Basic/Common/ApiLog/Services/ApiLogService.cs
+++ b/Src/Dlhis.Basic/Common/ApiLog/Services/ApiLogService.cs
@@ -2,35 +2,40 @@
 using Dlhis.Basic.Common.ApiLog.Response;
 using Dlhis.Basic.Common.ApiLog.Services.Implements;
 using Dlhis.Entity.Common;
+using Kurisu.AspNetCore.CustomClass;
 using Kurisu.AspNetCore.DataAccess.Dto;
 using Kurisu.AspNetCore.DataAccess.SqlSugar.Extensions;
 using Kurisu.AspNetCore.DataAccess.SqlSugar.Services;
 using Kurisu.AspNetCore.Utils.Extensions;
 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;
+
+    public ApiLogService(IDbContext dbContext)
     {
-        private readonly IDbContext _dbContext;
+        _dbContext = dbContext;
+    }
 
-        public ApiLogService(IDbContext dbContext)
+    public async Task<Pagination<ApiLogResponse>> GetLogsAsync(ApiLogRequest request)
+    {
+        var logs = await _dbContext.ChangeDb("log").Queryable<ApiLogEntity>()
+            .WhereIF(request.SearchDateTimePeriod.HasValue(), x => x._ts >= request.SearchDateTimePeriod.Start && x._ts <= request.SearchDateTimePeriod.End)
+            .WhereIF(request.Level.HasValue, x => x.Level == request.Level)
+            .WhereIF(request.Search.IsPresent(), x => x.Message.Contains(request.Search))
+            .OrderBy(x => x._ts, OrderByType.Desc)
+            .Select<ApiLogResponse>()
+            .ToPageListAsync(request.PageIndex, request.PageSize);
+
+        return new Pagination<ApiLogResponse>
         {
-            _dbContext = dbContext;
-        }
-
-        public async Task<Pagination<ApiLogResponse>> GetLogsAsync(ApiLogRequest request)
-        {
-            var logs = await _dbContext.ChangeDb("log").Queryable<ApiLogEntity>()
-                .WhereIF(request.SearchDateTimePeriod?.Start.HasValue == true && request.SearchDateTimePeriod?.End.HasValue == true,
-                    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)
-                .OrderBy(x => x.Timestamp, OrderByType.Desc)
-                .Select<ApiLogResponse>()
-                .ToPageListAsync(request);
-
-            return logs;
-        }
+            PageIndex = request.PageIndex,
+            PageSize = request.PageSize,
+            Total = 0,
+            Data = logs
+        };
     }
 }
\ No newline at end of file