diff --git a/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/WEBDeviceController.java b/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/WEBDeviceController.java
index 7f61a218..e05e6b74 100644
--- a/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/WEBDeviceController.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/WEBDeviceController.java
@@ -3,6 +3,8 @@ package com.fuyuanshen.web.controller.device;
 
 import com.fuyuanshen.app.domain.AppPersonnelInfoRecords;
 import com.fuyuanshen.common.core.domain.R;
+import com.fuyuanshen.common.mybatis.core.page.PageQuery;
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
 import com.fuyuanshen.common.web.core.BaseController;
 import com.fuyuanshen.equipment.domain.DeviceLog;
 import com.fuyuanshen.equipment.domain.vo.DeviceAlarmVo;
@@ -101,15 +103,16 @@ public class WEBDeviceController extends BaseController {
      */
     @Operation(summary = "设备告警记录")
     @GetMapping(value = "/getAlarmRecord/{deviceId}")
-    public R<List<DeviceAlarmVo>> getAlarmRecord(@PathVariable Long deviceId,
-                                                 @RequestParam(required = false) String startTime,
-                                                 @RequestParam(required = false) String endTime) {
-        List<DeviceAlarmVo> device = deviceService.getAlarmRecord(deviceId, startTime, endTime);
-        return R.ok(device);
+    public TableDataInfo<DeviceAlarmVo> getAlarmRecord(@PathVariable Long deviceId,
+                                                       @RequestParam(required = false) String startTime,
+                                                       @RequestParam(required = false) String endTime,
+                                                       PageQuery pageQuery) {
+        return deviceService.getAlarmRecord(deviceId, startTime, endTime, pageQuery);
     }
 
 
 
+
 }
 
 
diff --git a/fys-admin/src/main/java/com/fuyuanshen/web/service/WEBDeviceService.java b/fys-admin/src/main/java/com/fuyuanshen/web/service/WEBDeviceService.java
index f83658c6..e891de0f 100644
--- a/fys-admin/src/main/java/com/fuyuanshen/web/service/WEBDeviceService.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/web/service/WEBDeviceService.java
@@ -68,6 +68,6 @@ public interface WEBDeviceService extends IService<Device> {
      * @param endTime 结束时间
      * @return
      */
-    List<DeviceAlarmVo> getAlarmRecord(Long deviceId, String startTime, String endTime);
+    TableDataInfo<DeviceAlarmVo> getAlarmRecord(Long deviceId, String startTime, String endTime, PageQuery pageQuery);
 
 }
diff --git a/fys-admin/src/main/java/com/fuyuanshen/web/service/impl/WEBDeviceServiceImpl.java b/fys-admin/src/main/java/com/fuyuanshen/web/service/impl/WEBDeviceServiceImpl.java
index b6ec1f15..ea7199a1 100644
--- a/fys-admin/src/main/java/com/fuyuanshen/web/service/impl/WEBDeviceServiceImpl.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/web/service/impl/WEBDeviceServiceImpl.java
@@ -4,14 +4,17 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fuyuanshen.app.domain.AppDeviceBindRecord;
 import com.fuyuanshen.app.domain.AppDeviceShare;
 import com.fuyuanshen.app.domain.AppPersonnelInfoRecords;
-import com.fuyuanshen.app.domain.vo.AppDeviceShareVo;
 import com.fuyuanshen.app.mapper.AppDeviceBindRecordMapper;
 import com.fuyuanshen.app.mapper.AppDeviceShareMapper;
 import com.fuyuanshen.app.mapper.AppPersonnelInfoRecordsMapper;
+import com.fuyuanshen.common.mybatis.core.page.PageQuery;
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
 import com.fuyuanshen.equipment.domain.Device;
 import com.fuyuanshen.equipment.domain.DeviceAlarm;
 import com.fuyuanshen.equipment.domain.DeviceAssignments;
@@ -24,7 +27,6 @@ import com.fuyuanshen.equipment.mapper.DeviceAssignmentsMapper;
 import com.fuyuanshen.equipment.mapper.DeviceLogMapper;
 import com.fuyuanshen.equipment.mapper.DeviceMapper;
 import com.fuyuanshen.web.service.WEBDeviceService;
-import com.fuyuanshen.web.service.device.DeviceBizService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -154,22 +156,23 @@ public class WEBDeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impl
      * @return
      */
     @Override
-    public List<DeviceAlarmVo> getAlarmRecord(Long deviceId, String startTime, String endTime) {
+    public TableDataInfo getAlarmRecord(Long deviceId, String startTime, String endTime, PageQuery pageQuery) {
+        Page<DeviceAlarm> page = pageQuery.build();
         QueryWrapper<DeviceAlarm> queryWrapper = new QueryWrapper<DeviceAlarm>().eq("device_id", deviceId);
 
         if (StrUtil.isNotEmpty(startTime)) {
-            queryWrapper.ge("create_time", startTime);
+            queryWrapper.ge("start_time", startTime);
         }
-
         if (StrUtil.isNotEmpty(endTime)) {
-            queryWrapper.le("create_time", endTime);
+            queryWrapper.le("start_time", endTime);
         }
+        queryWrapper.orderByDesc("start_time");
+        IPage<DeviceAlarm> alarmPage = deviceAlarmMapper.selectPage(page, queryWrapper);
 
-        List<DeviceAlarm> alarmList = deviceAlarmMapper.selectList(
-                queryWrapper.orderByDesc("create_time"));
-        List<DeviceAlarmVo> deviceAlarmVoList = BeanUtil.copyToList(alarmList, DeviceAlarmVo.class);
-        return deviceAlarmVoList;
+        // List<DeviceAlarmVo> deviceAlarmVoList = BeanUtil.copyToList(alarmPage.getRecords(), DeviceAlarmVo.class);
+        return TableDataInfo.build(alarmPage);
     }
 
-
 }
+
+
diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceAlarm.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceAlarm.java
index 65b4e88c..720ee9bc 100644
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceAlarm.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceAlarm.java
@@ -4,7 +4,9 @@ import com.fuyuanshen.common.tenant.core.TenantEntity;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 import java.util.Date;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 
 import java.io.Serial;
@@ -63,7 +65,6 @@ public class DeviceAlarm extends TenantEntity {
 
     /**
      * 经度
-
      */
     private Long longitude;
 
@@ -90,7 +91,7 @@ public class DeviceAlarm extends TenantEntity {
     /**
      * 报警持续时间
      */
-    private Long durationTime;
+    private String durationTime;
 
     /**
      * 0已处理，1未处理