根据新需求更改

MoviconWebApi/API/DeviceAlarmApi/Data.cs

@@ -1,4 +1,4 @@
-using MoviconWebApi.Entities;
+using MoviconWebApi.Entities;
 
 namespace MoviconWebApi.API.DeviceAlarmApi
 {
@@ -7,7 +7,7 @@ namespace MoviconWebApi.API.DeviceAlarmApi
         /// <summary>
         /// 获取设备报警列表
         /// </summary>
-        public static async Task<List<DeviceAlarmResponse>> GetDeviceAlarmList(
+        public static async Task<(List<DeviceAlarmResponse> Items, long Total)> GetDeviceAlarmList(
             IFreeSql freeSql,
             DeviceAlarmRequest request)
         {
@@ -30,8 +30,17 @@ namespace MoviconWebApi.API.DeviceAlarmApi
                     query = query.Where(a => a.EndTime <= endTime);
                 }
 
+                // 统计总数
+                var total = await query.CountAsync();
+
+                // 参数兜底与限制
+                var pageNo = request.PageNo <= 0 ? 1 : request.PageNo;
+                var pageSize = request.PageSize <= 0 ? 100 : request.PageSize;
+                if (pageSize > 100) pageSize = 100;
+
                 var data = await query
                     .OrderByDescending(a => a.StartTime)
+                    .Page(pageNo, pageSize)
                     .ToListAsync(a => new DeviceAlarmResponse
                     {
                         DeviceCode = a.DeviceCode,
@@ -42,7 +51,7 @@ namespace MoviconWebApi.API.DeviceAlarmApi
                         EndTime = a.EndTime.ToString("yyyy-MM-dd HH:mm:ss")
                     });
 
-                return data ?? new List<DeviceAlarmResponse>();
+                return (data ?? new List<DeviceAlarmResponse>(), total);
             }
             catch (Exception ex)
             {