diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalExtController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalExtController.java
index 5661938..ec64219 100644
--- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalExtController.java
+++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalExtController.java
@@ -164,8 +164,10 @@ public class TerminalExtController extends BaseController {
 
     @GetMapping("heartbeat")
     @ApiOperation("心跳历史")
-    public ResponseReult<List<TerminalHeartbeatHistory>> heartbeat(Integer termId) {
-        List<TerminalHeartbeatHistory> list = heartbeatService.listAll(termId);
+    public ResponseReult<PageInfo<TerminalHeartbeatHistory>> heartbeat(Integer termId, Integer pageNum, Integer pageSize) {
+        pageNum = this.initPageNum(pageNum);
+        pageSize = this.initPageSize(pageSize);
+        PageInfo<TerminalHeartbeatHistory> list = heartbeatService.listAll(termId, pageNum, pageSize);
         return ResponseReult.success(list);
     }
 
diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/HeartbeatServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/HeartbeatServiceImpl.java
index cc68eb8..3063cb3 100644
--- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/HeartbeatServiceImpl.java
+++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/HeartbeatServiceImpl.java
@@ -1,7 +1,9 @@
 package com.shxy.xymanager_service.impl;
 
+import com.github.pagehelper.PageInfo;
 import com.shxy.xymanager_common.entity.TerminalHeartbeatHistory;
 import com.shxy.xymanager_common.entity.TerminalHeartbeatHistoryExample;
+import com.shxy.xymanager_common.page.PageUtils;
 import com.shxy.xymanager_dao.dao.TerminalHeartbeatHistoryMapper;
 import com.shxy.xymanager_service.service.HeartbeatService;
 import lombok.extern.slf4j.Slf4j;
@@ -17,11 +19,13 @@ public class HeartbeatServiceImpl implements HeartbeatService {
     TerminalHeartbeatHistoryMapper mapper;
 
     @Override
-    public List<TerminalHeartbeatHistory> listAll(Integer termId) {
+    public PageInfo<TerminalHeartbeatHistory> listAll(Integer termId, Integer pageNum, Integer pageSize) {
         TerminalHeartbeatHistoryExample example = new TerminalHeartbeatHistoryExample();
         TerminalHeartbeatHistoryExample.Criteria criteria = example.createCriteria();
         criteria.andTermIdEqualTo(termId);
         example.setOrderByClause("heartbeat_time desc");
-        return mapper.selectByExample(example);
+        PageUtils.SetPage(pageNum, pageSize);
+        List<TerminalHeartbeatHistory> list = mapper.selectByExample(example);
+        return new PageInfo<>(list);
     }
 }
diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/HeartbeatService.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/HeartbeatService.java
index a4ddc53..1088ac0 100644
--- a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/HeartbeatService.java
+++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/HeartbeatService.java
@@ -1,11 +1,12 @@
 package com.shxy.xymanager_service.service;
 
+import com.github.pagehelper.PageInfo;
 import com.shxy.xymanager_common.entity.TerminalHeartbeatHistory;
 
 import java.util.List;
 
 public interface HeartbeatService {
 
-    List<TerminalHeartbeatHistory> listAll(Integer termId);
+    PageInfo<TerminalHeartbeatHistory> listAll(Integer termId, Integer pageNum, Integer pageSize);
 
 }