修改分页3.0

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; //总数列表
  }

src/main/java/com/link/mapper/UserCountMapper.java

@@ -12,15 +12,15 @@ import java.util.List;
 @Mapper
 @Qualifier("hljwSqlSessionTemplate")
 public interface UserCountMapper {
-    List<UserCountVO> getEmailUserList(@Param("startTime") LocalDateTime startTime,@Param("page") Integer page,@Param("pageSize") Integer pageSize);
+    List<UserCountVO> getEmailUserList(@Param("startTime") LocalDateTime startTime,@Param("offset") Integer offset,@Param("pageSize") Integer pageSize);
 
     Integer getEmailUserTotal(@Param("startTime") LocalDateTime startTime);
 
-    List<UserCountVO> getGoogleUserList(@Param("startTime") LocalDateTime startTime,@Param("page") Integer page,@Param("pageSize") Integer pageSize);
+    List<UserCountVO> getGoogleUserList(@Param("startTime") LocalDateTime startTime,@Param("offset") Integer offset,@Param("pageSize") Integer pageSize);
 
     Integer getGoogleUserTotal(@Param("startTime") LocalDateTime startTime);
 
-    List<UserCountVO> getMessageUserList(@Param("startTime") LocalDateTime startTime,@Param("page") Integer page,@Param("pageSize") Integer pageSize);
+    List<UserCountVO> getMessageUserList(@Param("startTime") LocalDateTime startTime,@Param("offset") Integer offset,@Param("pageSize") Integer pageSize);
 
     Integer getMessageUserTotal(@Param("startTime") LocalDateTime startTime);
 }

src/main/java/com/link/serviceImpl/UserCountServiceImpl.java

@@ -26,7 +26,8 @@ public class UserCountServiceImpl implements UserCountService {
         List<UserCountVO> 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<UserCountVO> 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<UserCountVO> 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);

src/main/resources/com/link/mapper/UserCountMapper.xml

@@ -35,7 +35,7 @@
     <select id="getEmailUserList" resultType="com.link.domain.vo.UserCountVO">
         <include refid="EmailUser"></include>
         order by t1 desc
-        limit #{page}, #{pageSize};
+        limit #{offset}, #{pageSize};
     </select>
 
     <select id="getEmailUserTotal" resultType="integer">
@@ -58,7 +58,7 @@
     <select id="getGoogleUserList" resultType="com.link.domain.vo.UserCountVO">
         <include refid="GoogleUser"></include>
         order by t1 desc
-        limit #{page}, #{pageSize};
+        limit #{offset}, #{pageSize};
     </select>
 
     <select id="getGoogleUserTotal" resultType="integer">
@@ -82,7 +82,7 @@
     <select id="getMessageUserList" resultType="com.link.domain.vo.UserCountVO">
         <include refid="MessageUser"></include>
         order by t1 desc
-        limit #{page}, #{pageSize};
+        limit #{offset}, #{pageSize};
     </select>
 
     <select id="getMessageUserTotal" resultType="integer">