修改分页bug

src/main/java/com/link/controller/UserCountController.java

@@ -15,26 +15,21 @@ public class UserCountController {
     private UserCountService userCountService;
 
     @PostMapping("/toEmail")
-    public Result getEmailUserCount(@RequestBody UserCountDTO dto,
-                                    @RequestParam(name = "page",defaultValue = "1") Integer page,
-                                    @RequestParam(name = "pageSize",defaultValue = "20") Integer pageSize) {
-        Object result = userCountService.getEmailUserCount(dto.getStartTime(),page,pageSize);
+    public Result getEmailUserCount(@RequestBody UserCountDTO dto) {
+
+        Object result = userCountService.getEmailUserCount(dto);
         return Result.ok("success",result);
     }
 
     @PostMapping("/toGoogle")
-    public Result getGoogleUserCount(@RequestBody UserCountDTO dto,
-                                     @RequestParam(name = "page",defaultValue = "1") Integer page,
-                                     @RequestParam(name = "pageSize",defaultValue = "20") Integer pageSize) {
-        Object result = userCountService.getGoogleUserCount(dto.getStartTime(),page,pageSize);
+    public Result getGoogleUserCount(@RequestBody UserCountDTO dto) {
+        Object result = userCountService.getGoogleUserCount(dto);
         return Result.ok("success",result);
     }
 
     @PostMapping("/toMessage")
-    public Result getMessageUserCount(@RequestBody UserCountDTO dto,
-                                      @RequestParam(name = "page",defaultValue = "1") Integer page,
-                                      @RequestParam(name = "pageSize",defaultValue = "20") Integer pageSize) {
-        Object result = userCountService.getMessageUserCount(dto.getStartTime(),page,pageSize);
+    public Result getMessageUserCount(@RequestBody UserCountDTO dto) {
+        Object result = userCountService.getMessageUserCount(dto);
         return Result.ok("success",result);
     }
 }

src/main/java/com/link/domain/PageQuery.java

@@ -11,12 +11,6 @@ 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;
  }

src/main/java/com/link/domain/dto/UserCountDTO.java

@@ -11,6 +11,10 @@ import java.time.LocalDateTime;
 @NoArgsConstructor
 @AllArgsConstructor
 public class UserCountDTO {
+
+    private Integer page=1;
+    private Integer pageSize=20;
+
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime startTime;
 }

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

@@ -12,9 +12,9 @@ import java.util.List;
 @Mapper
 @Qualifier("hljwSqlSessionTemplate")
 public interface UserCountMapper {
-    List<UserCountVO> getEmailUserCount(@Param("startTime") LocalDateTime startTime);
+    List<UserCountVO> getEmailUserCount(@Param("startTime") LocalDateTime startTime,@Param("page") Integer page,@Param("pageSize") Integer pageSize);
 
-    List<UserCountVO> getGoogleUserCount(@Param("startTime") LocalDateTime startTime);
+    List<UserCountVO> getGoogleUserCount(@Param("startTime") LocalDateTime startTime,@Param("page") Integer page,@Param("pageSize") Integer pageSize);
 
-    List<UserCountVO> getMessageUserCount(@Param("startTime") LocalDateTime startTime);
+    List<UserCountVO> getMessageUserCount(@Param("startTime") LocalDateTime startTime,@Param("page") Integer page,@Param("pageSize") Integer pageSize);
 }

src/main/java/com/link/service/UserCountService.java

@@ -1,6 +1,8 @@
 package com.link.service;
 
 import com.link.domain.PageQuery;
+import com.link.domain.Result;
+import com.link.domain.dto.UserCountDTO;
 import com.link.domain.vo.UserCountVO;
 
 import java.time.LocalDateTime;
@@ -8,10 +10,10 @@ import java.util.List;
 
 public interface UserCountService {
 
-    PageQuery getEmailUserCount(LocalDateTime startTime, Integer page, Integer pageSize);
+    PageQuery getEmailUserCount(UserCountDTO dto);
 
-    PageQuery getGoogleUserCount(LocalDateTime startTime, Integer page, Integer pageSize);
+    PageQuery getGoogleUserCount(UserCountDTO dto);
 
-    PageQuery getMessageUserCount(LocalDateTime startTime, Integer page, Integer pageSize);
+    PageQuery getMessageUserCount(UserCountDTO dto);
 
 }

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

@@ -4,6 +4,7 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.link.domain.PageQuery;
 import com.link.domain.Result;
+import com.link.domain.dto.UserCountDTO;
 import com.link.domain.vo.UserCountVO;
 import com.link.mapper.UserCountMapper;
 import com.link.service.UserCountService;
@@ -21,41 +22,33 @@ public class UserCountServiceImpl implements UserCountService {
     @Autowired
     private UserCountMapper userCountMapper;
     @Override
-    public PageQuery getEmailUserCount(LocalDateTime startTime, Integer page , Integer pageSize) {
-        PageHelper.startPage(page,pageSize);
-        List<UserCountVO> userCountVOList =userCountMapper.getEmailUserCount(startTime);
+    public PageQuery getEmailUserCount(UserCountDTO dto) {
+        List<UserCountVO> userCountVOList =userCountMapper.getEmailUserCount(dto.getStartTime(),dto.getPage(),dto.getPageSize());
         PageInfo<UserCountVO> pageInfo = new PageInfo<>(userCountVOList);
-        PageQuery data = new PageQuery();
-        data.setPage(page);
-        data.setPageSize(pageSize);
-        data.setTotal(pageInfo.getTotal());
-        data.setList(userCountVOList);
-        return data;
+        PageQuery result = new PageQuery();
+        result.setTotal(pageInfo.getTotal());
+        result.setList(userCountVOList);
+        return result;
     }
 
     @Override
-    public PageQuery getGoogleUserCount(LocalDateTime startTime, Integer page , Integer pageSize) {
-        PageHelper.startPage(page,pageSize);
-        List<UserCountVO> userCountVOList =userCountMapper.getGoogleUserCount(startTime);
+    public PageQuery getGoogleUserCount(UserCountDTO dto) {
+
+        List<UserCountVO> userCountVOList =userCountMapper.getGoogleUserCount(dto.getStartTime(),dto.getPage(),dto.getPageSize());
         PageInfo<UserCountVO> pageInfo = new PageInfo<>(userCountVOList);
-        PageQuery data = new PageQuery();
-        data.setPage(page);
-        data.setPageSize(pageSize);
-        data.setTotal(pageInfo.getTotal());
-        data.setList(userCountVOList);
-        return data;
+        PageQuery result = new PageQuery();
+        result.setTotal(pageInfo.getTotal());
+        result.setList(userCountVOList);
+        return result;
     }
 
     @Override
-    public PageQuery getMessageUserCount(LocalDateTime startTime, Integer page , Integer pageSize) {
-        PageHelper.startPage(page,pageSize);
-        List<UserCountVO> userCountVOList =userCountMapper.getMessageUserCount(startTime);
+    public PageQuery getMessageUserCount(UserCountDTO dto) {
+        List<UserCountVO> userCountVOList =userCountMapper.getMessageUserCount(dto.getStartTime(),dto.getPage(),dto.getPageSize());
         PageInfo<UserCountVO> pageInfo = new PageInfo<>(userCountVOList);
-        PageQuery data = new PageQuery();
-        data.setPage(page);
-        data.setPageSize(pageSize);
-        data.setTotal(pageInfo.getTotal());
-        data.setList(userCountVOList);
-        return data;
+        PageQuery result = new PageQuery();
+        result.setTotal(pageInfo.getTotal());
+        result.setList(userCountVOList);
+        return result;
     }
 }

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

@@ -30,7 +30,8 @@
              ) c
         where tt >= #{startTime}
         group by t1
-        order by t1 desc;
+        order by t1 desc
+        limit #{page}, #{pageSize};
     </select>
 
     <select id="getGoogleUserCount" resultType="com.link.domain.vo.UserCountVO">
@@ -41,7 +42,8 @@
         )a)b)c
         where tt>= #{startTime}
         group by t1
-        order by t1 desc;
+        order by t1 desc
+        limit #{page}, #{pageSize};
     </select>
 
     <select id="getMessageUserCount" resultType="com.link.domain.vo.UserCountVO">
@@ -53,7 +55,8 @@
         )a)b)c
         where tt>= #{startTime}
         group by t1
-        order by t1 desc;
+        order by t1 desc
+        limit #{page}, #{pageSize};
     </select>
 
 </mapper>