根据新需求更改

MoviconWebApi/API/ClearDataApi/Data.cs

@@ -1,10 +1,10 @@
-using MoviconWebApi.Entities;
+using MoviconWebApi.Entities;
 
 namespace MoviconWebApi.API.ClearDataApi
 {
     public static class Data
     {
-        internal static async Task<List<ClearDataResponse>?> GetClearData(ClearDataRequest request, IFreeSql freeSql)
+        internal static async Task<(List<ClearDataResponse> Items, long Total)> GetClearData(ClearDataRequest request, IFreeSql freeSql)
         {
             try
             {
@@ -29,11 +29,19 @@ namespace MoviconWebApi.API.ClearDataApi
                     query = query.Where(x => x.CreateTime <= endTime);
                 }
 
-                // 按创建时间降序排序
-                query = query.OrderByDescending(x => x.CreateTime);
+                // 统计总数
+                var total = await query.CountAsync();
 
-                // 执行查询并映射到响应模型
-                var result = await query.ToListAsync(x => new ClearDataResponse
+                // 参数兜底与限制
+                var pageNo = request.PageNo <= 0 ? 1 : request.PageNo;
+                var pageSize = request.PageSize <= 0 ? 100 : request.PageSize;
+                if (pageSize > 100) pageSize = 100;
+
+                // 按创建时间降序排序 + 分页 + 映射到响应模型
+                var result = await query
+                    .OrderByDescending(x => x.CreateTime)
+                    .Page(pageNo, pageSize)
+                    .ToListAsync(x => new ClearDataResponse
                 {
                     DeviceCode = x.DeviceCode,
                     DeviceName = x.DeviceName,
@@ -66,13 +74,13 @@ namespace MoviconWebApi.API.ClearDataApi
                     CreateTime = x.CreateTime.ToString("yyyy-MM-dd HH:mm:ss")
                 });
 
-                return result;
+                return (result ?? new List<ClearDataResponse>(), total);
             }
             catch (Exception ex)
             {
                 // 记录异常日志（可以根据实际需求添加日志记录）
                 Console.WriteLine($"获取清洗数据失败：{ex.Message}");
-                return null;
+                throw;
             }
 
         }