Просмотр исходного кода

优化日志管理分页查询和删除本地上传文件找不到文件问题

兰聪 4 лет назад
Родитель
Сommit
a0922a5538

+ 1 - 1
Admin.NET/Admin.NET.Core/Service/File/SysFileService.cs

@@ -133,7 +133,7 @@ namespace Admin.NET.Core.Service
                 }
                 else
                 {
-                    var filePath = Path.Combine(App.WebHostEnvironment.WebRootPath, file.FilePath, input.Id.ToString());
+                    var filePath = Path.Combine(App.WebHostEnvironment.WebRootPath, file.FilePath, input.Id.ToString() + file.Suffix);
                     if (File.Exists(filePath))
                         File.Delete(filePath);
                 }

+ 1 - 1
Admin.NET/Admin.NET.Core/Service/log/Dto/LogInput.cs → Admin.NET/Admin.NET.Core/Service/log/Dto/PageLogInput.cs

@@ -2,7 +2,7 @@
 
 namespace Admin.NET.Core.Service
 {
-    public class LogInput
+    public class PageLogInput : BasePageInput
     {
         /// <summary>
         /// 开始时间

+ 3 - 2
Admin.NET/Admin.NET.Core/Service/log/SysExLogService.cs

@@ -24,12 +24,13 @@ namespace Admin.NET.Core.Service
         /// </summary>
         /// <returns></returns>
         [HttpGet("/sysExLog/pageList")]
-        public async Task<List<SysLogEx>> GetExLogList([FromQuery] LogInput input)
+        public async Task<SqlSugarPagedList<SysLogEx>> GetExLogList([FromQuery] PageLogInput input)
         {
             return await _sysExLogRep.AsQueryable()
                 .WhereIF(!string.IsNullOrWhiteSpace(input.StartTime.ToString()) && !string.IsNullOrWhiteSpace(input.EndTime.ToString()),
                             u => u.CreateTime >= input.StartTime && u.CreateTime <= input.EndTime)
-                .OrderBy(u => u.CreateTime, SqlSugar.OrderByType.Desc).ToListAsync();
+                .OrderBy(u => u.CreateTime, SqlSugar.OrderByType.Desc)
+                .ToPagedListAsync(input.Page, input.PageSize);
         }
 
         /// <summary>

+ 3 - 2
Admin.NET/Admin.NET.Core/Service/log/SysOpLogService.cs

@@ -24,12 +24,13 @@ namespace Admin.NET.Core.Service
         /// </summary>
         /// <returns></returns>
         [HttpGet("/sysOpLog/pageList")]
-        public async Task<List<SysLogOp>> GetOpLogList([FromQuery] LogInput input)
+        public async Task<SqlSugarPagedList<SysLogOp>> GetOpLogList([FromQuery] PageLogInput input)
         {
             return await _sysOpLogRep.AsQueryable()
                 .WhereIF(!string.IsNullOrWhiteSpace(input.StartTime.ToString()) && !string.IsNullOrWhiteSpace(input.EndTime.ToString()),
                             u => u.CreateTime >= input.StartTime && u.CreateTime <= input.EndTime)
-                .OrderBy(u => u.CreateTime, SqlSugar.OrderByType.Desc).ToListAsync();
+                .OrderBy(u => u.CreateTime, SqlSugar.OrderByType.Desc)
+                .ToPagedListAsync(input.Page, input.PageSize);
         }
 
         /// <summary>

+ 3 - 2
Admin.NET/Admin.NET.Core/Service/log/SysVisLogService.cs

@@ -24,12 +24,13 @@ namespace Admin.NET.Core.Service
         /// </summary>
         /// <returns></returns>
         [HttpGet("/sysVisLog/pageList")]
-        public async Task<List<SysLogVis>> GetVisLogList([FromQuery] LogInput input)
+        public async Task<SqlSugarPagedList<SysLogVis>> GetVisLogList([FromQuery] PageLogInput input)
         {
             return await _sysVisLogRep.AsQueryable()
                 .WhereIF(!string.IsNullOrWhiteSpace(input.StartTime.ToString()) && !string.IsNullOrWhiteSpace(input.EndTime.ToString()),
                             u => u.CreateTime >= input.StartTime && u.CreateTime <= input.EndTime)
-                .OrderBy(u => u.CreateTime, SqlSugar.OrderByType.Desc).ToListAsync();
+                .OrderBy(u => u.CreateTime, SqlSugar.OrderByType.Desc)
+                .ToPagedListAsync(input.Page, input.PageSize);
         }
 
         /// <summary>