From 9390e0fd7010ff91551fee69f9f912db29f6b726 Mon Sep 17 00:00:00 2001 From: huangfeng Date: Wed, 15 May 2024 09:47:32 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9F=A5=E8=AF=A2=E5=BF=83=E8=B7=B3?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E5=A2=9E=E5=8A=A0=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xymanager_admin/controller/TerminalExtController.java | 6 ++++-- .../shxy/xymanager_service/impl/HeartbeatServiceImpl.java | 8 ++++++-- .../shxy/xymanager_service/service/HeartbeatService.java | 3 ++- 3 files changed, 12 insertions(+), 5 deletions(-) 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> heartbeat(Integer termId) { - List list = heartbeatService.listAll(termId); + public ResponseReult> heartbeat(Integer termId, Integer pageNum, Integer pageSize) { + pageNum = this.initPageNum(pageNum); + pageSize = this.initPageSize(pageSize); + PageInfo 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 listAll(Integer termId) { + public PageInfo 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 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 listAll(Integer termId); + PageInfo listAll(Integer termId, Integer pageNum, Integer pageSize); }