diff --git a/src/main/java/com/link/domain/PageQuery.java b/src/main/java/com/link/domain/PageQuery.java index 69f6be7..2c150ad 100644 --- a/src/main/java/com/link/domain/PageQuery.java +++ b/src/main/java/com/link/domain/PageQuery.java @@ -11,8 +11,9 @@ import java.util.List; @NoArgsConstructor public class PageQuery { - private Integer page; - private Integer pageSize; - private Integer total; - private List list; + private Integer page; //当前页数 + private Integer offset; //数据偏移量 即当前页的数据是从第几个数据开始的 + private Integer pageSize; //每页数据量 + private Integer total; //数据总量 + private List list; //总数列表 } diff --git a/src/main/java/com/link/mapper/UserCountMapper.java b/src/main/java/com/link/mapper/UserCountMapper.java index ec2c2ca..9d61ee0 100644 --- a/src/main/java/com/link/mapper/UserCountMapper.java +++ b/src/main/java/com/link/mapper/UserCountMapper.java @@ -12,15 +12,15 @@ import java.util.List; @Mapper @Qualifier("hljwSqlSessionTemplate") public interface UserCountMapper { - List getEmailUserList(@Param("startTime") LocalDateTime startTime,@Param("page") Integer page,@Param("pageSize") Integer pageSize); + List getEmailUserList(@Param("startTime") LocalDateTime startTime,@Param("offset") Integer offset,@Param("pageSize") Integer pageSize); Integer getEmailUserTotal(@Param("startTime") LocalDateTime startTime); - List getGoogleUserList(@Param("startTime") LocalDateTime startTime,@Param("page") Integer page,@Param("pageSize") Integer pageSize); + List getGoogleUserList(@Param("startTime") LocalDateTime startTime,@Param("offset") Integer offset,@Param("pageSize") Integer pageSize); Integer getGoogleUserTotal(@Param("startTime") LocalDateTime startTime); - List getMessageUserList(@Param("startTime") LocalDateTime startTime,@Param("page") Integer page,@Param("pageSize") Integer pageSize); + List getMessageUserList(@Param("startTime") LocalDateTime startTime,@Param("offset") Integer offset,@Param("pageSize") Integer pageSize); Integer getMessageUserTotal(@Param("startTime") LocalDateTime startTime); } diff --git a/src/main/java/com/link/serviceImpl/UserCountServiceImpl.java b/src/main/java/com/link/serviceImpl/UserCountServiceImpl.java index c66fca7..bfaa05f 100644 --- a/src/main/java/com/link/serviceImpl/UserCountServiceImpl.java +++ b/src/main/java/com/link/serviceImpl/UserCountServiceImpl.java @@ -26,7 +26,8 @@ public class UserCountServiceImpl implements UserCountService { List userCountVOList =userCountMapper.getEmailUserList(dto.getStartTime(),dto.getStart(),dto.getPageSize()); Integer userCountVOTotal= userCountMapper.getEmailUserTotal(dto.getStartTime()); PageQuery result = new PageQuery(); - result.setPage(dto.getStart()); + result.setPage(dto.getPage()); + result.setOffset(dto.getStart()); result.setPageSize(dto.getPageSize()); result.setTotal(userCountVOTotal); result.setList(userCountVOList); @@ -39,7 +40,8 @@ public class UserCountServiceImpl implements UserCountService { List userCountVOList =userCountMapper.getGoogleUserList(dto.getStartTime(),dto.getStart(),dto.getPageSize()); Integer userCountVOTotal= userCountMapper.getGoogleUserTotal(dto.getStartTime()); PageQuery result = new PageQuery(); - result.setPage(dto.getStart()); + result.setPage(dto.getPage()); + result.setOffset(dto.getStart()); result.setPageSize(dto.getPageSize()); result.setTotal(userCountVOTotal); result.setList(userCountVOList); @@ -51,7 +53,8 @@ public class UserCountServiceImpl implements UserCountService { List userCountVOList =userCountMapper.getMessageUserList(dto.getStartTime(),dto.getStart(),dto.getPageSize()); Integer userCountVOTotal= userCountMapper.getMessageUserTotal(dto.getStartTime()); PageQuery result = new PageQuery(); - result.setPage(dto.getStart()); + result.setPage(dto.getPage()); + result.setOffset(dto.getStart()); result.setPageSize(dto.getPageSize()); result.setTotal(userCountVOTotal); result.setList(userCountVOList); diff --git a/src/main/resources/com/link/mapper/UserCountMapper.xml b/src/main/resources/com/link/mapper/UserCountMapper.xml index 464210e..dd64f4b 100644 --- a/src/main/resources/com/link/mapper/UserCountMapper.xml +++ b/src/main/resources/com/link/mapper/UserCountMapper.xml @@ -35,7 +35,7 @@ order by t1 desc - limit #{page}, #{pageSize}; + limit #{offset}, #{pageSize}; order by t1 desc - limit #{page}, #{pageSize}; + limit #{offset}, #{pageSize};