From ec048091cd7753912a44943ceb92557f969672b1 Mon Sep 17 00:00:00 2001 From: WangYang <13176915986@163.com> Date: Wed, 3 Dec 2025 18:43:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E9=A1=B5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/link/controller/UserCountController.java | 19 ++++----- src/main/java/com/link/domain/PageQuery.java | 6 --- .../java/com/link/domain/dto/UserCountDTO.java | 4 ++ src/main/java/com/link/mapper/UserCountMapper.java | 6 +-- .../java/com/link/service/UserCountService.java | 8 ++-- .../com/link/serviceImpl/UserCountServiceImpl.java | 47 +++++++++------------- .../resources/com/link/mapper/UserCountMapper.xml | 9 +++-- 7 files changed, 45 insertions(+), 54 deletions(-) diff --git a/src/main/java/com/link/controller/UserCountController.java b/src/main/java/com/link/controller/UserCountController.java index 093239e..d9801ec 100644 --- a/src/main/java/com/link/controller/UserCountController.java +++ b/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); } } diff --git a/src/main/java/com/link/domain/PageQuery.java b/src/main/java/com/link/domain/PageQuery.java index 5a26b88..9435159 100644 --- a/src/main/java/com/link/domain/PageQuery.java +++ b/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; } diff --git a/src/main/java/com/link/domain/dto/UserCountDTO.java b/src/main/java/com/link/domain/dto/UserCountDTO.java index 92678da..3a91356 100644 --- a/src/main/java/com/link/domain/dto/UserCountDTO.java +++ b/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; } diff --git a/src/main/java/com/link/mapper/UserCountMapper.java b/src/main/java/com/link/mapper/UserCountMapper.java index ec0cdac..3606b11 100644 --- a/src/main/java/com/link/mapper/UserCountMapper.java +++ b/src/main/java/com/link/mapper/UserCountMapper.java @@ -12,9 +12,9 @@ import java.util.List; @Mapper @Qualifier("hljwSqlSessionTemplate") public interface UserCountMapper { - List getEmailUserCount(@Param("startTime") LocalDateTime startTime); + List getEmailUserCount(@Param("startTime") LocalDateTime startTime,@Param("page") Integer page,@Param("pageSize") Integer pageSize); - List getGoogleUserCount(@Param("startTime") LocalDateTime startTime); + List getGoogleUserCount(@Param("startTime") LocalDateTime startTime,@Param("page") Integer page,@Param("pageSize") Integer pageSize); - List getMessageUserCount(@Param("startTime") LocalDateTime startTime); + List getMessageUserCount(@Param("startTime") LocalDateTime startTime,@Param("page") Integer page,@Param("pageSize") Integer pageSize); } diff --git a/src/main/java/com/link/service/UserCountService.java b/src/main/java/com/link/service/UserCountService.java index a98790b..f5513cb 100644 --- a/src/main/java/com/link/service/UserCountService.java +++ b/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); } diff --git a/src/main/java/com/link/serviceImpl/UserCountServiceImpl.java b/src/main/java/com/link/serviceImpl/UserCountServiceImpl.java index 3f3509f..a70e1f4 100644 --- a/src/main/java/com/link/serviceImpl/UserCountServiceImpl.java +++ b/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 userCountVOList =userCountMapper.getEmailUserCount(startTime); + public PageQuery getEmailUserCount(UserCountDTO dto) { + List userCountVOList =userCountMapper.getEmailUserCount(dto.getStartTime(),dto.getPage(),dto.getPageSize()); PageInfo 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 userCountVOList =userCountMapper.getGoogleUserCount(startTime); + public PageQuery getGoogleUserCount(UserCountDTO dto) { + + List userCountVOList =userCountMapper.getGoogleUserCount(dto.getStartTime(),dto.getPage(),dto.getPageSize()); PageInfo 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 userCountVOList =userCountMapper.getMessageUserCount(startTime); + public PageQuery getMessageUserCount(UserCountDTO dto) { + List userCountVOList =userCountMapper.getMessageUserCount(dto.getStartTime(),dto.getPage(),dto.getPageSize()); PageInfo 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; } } diff --git a/src/main/resources/com/link/mapper/UserCountMapper.xml b/src/main/resources/com/link/mapper/UserCountMapper.xml index 00c6a4f..7b3cc9c 100644 --- a/src/main/resources/com/link/mapper/UserCountMapper.xml +++ b/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}; \ No newline at end of file