diff --git a/src/main/java/com/link/domain/PageQuery.java b/src/main/java/com/link/domain/PageQuery.java index 9435159..5a26b88 100644 --- a/src/main/java/com/link/domain/PageQuery.java +++ b/src/main/java/com/link/domain/PageQuery.java @@ -11,6 +11,12 @@ import java.util.List; @NoArgsConstructor public class PageQuery { + private Integer page; + private Integer pageSize; + private Integer startPage; + public Integer getStartPage(){ + return (page-1)*pageSize; + } private Long total; private List list; } diff --git a/src/main/java/com/link/serviceImpl/UserCountServiceImpl.java b/src/main/java/com/link/serviceImpl/UserCountServiceImpl.java index d098f40..3f3509f 100644 --- a/src/main/java/com/link/serviceImpl/UserCountServiceImpl.java +++ b/src/main/java/com/link/serviceImpl/UserCountServiceImpl.java @@ -26,6 +26,8 @@ public class UserCountServiceImpl implements UserCountService { List userCountVOList =userCountMapper.getEmailUserCount(startTime); PageInfo pageInfo = new PageInfo<>(userCountVOList); PageQuery data = new PageQuery(); + data.setPage(page); + data.setPageSize(pageSize); data.setTotal(pageInfo.getTotal()); data.setList(userCountVOList); return data; @@ -37,6 +39,8 @@ public class UserCountServiceImpl implements UserCountService { List userCountVOList =userCountMapper.getGoogleUserCount(startTime); PageInfo pageInfo = new PageInfo<>(userCountVOList); PageQuery data = new PageQuery(); + data.setPage(page); + data.setPageSize(pageSize); data.setTotal(pageInfo.getTotal()); data.setList(userCountVOList); return data; @@ -48,6 +52,8 @@ public class UserCountServiceImpl implements UserCountService { List userCountVOList =userCountMapper.getMessageUserCount(startTime); PageInfo pageInfo = new PageInfo<>(userCountVOList); PageQuery data = new PageQuery(); + data.setPage(page); + data.setPageSize(pageSize); data.setTotal(pageInfo.getTotal()); data.setList(userCountVOList); return data;