From 7fd3abc42e7551417b1557f3663b42d5286fb8cb Mon Sep 17 00:00:00 2001 From: wangguorui <2069821375@qq.com> Date: Thu, 29 Jan 2026 17:39:00 +0800 Subject: [PATCH] =?UTF-8?q?1=E6=9C=8829=E6=97=A5=EF=BC=8C=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E6=8E=A8=E9=80=81=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/controller/cash/MessageController.java | 18 ++++++++++++++---- .../java/com/example/demo/domain/vo/coin/Page.java | 7 ++----- .../com/example/demo/service/cash/MessageService.java | 3 ++- .../demo/serviceImpl/cash/MessageServiceImpl.java | 8 +++++--- 4 files changed, 23 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/example/demo/controller/cash/MessageController.java b/src/main/java/com/example/demo/controller/cash/MessageController.java index b69ecbb..16bb14d 100644 --- a/src/main/java/com/example/demo/controller/cash/MessageController.java +++ b/src/main/java/com/example/demo/controller/cash/MessageController.java @@ -6,10 +6,12 @@ import com.example.demo.domain.DTO.IdRequest; import com.example.demo.domain.entity.Admin; import com.example.demo.domain.vo.cash.Status; import com.example.demo.domain.vo.coin.Messages; +import com.example.demo.domain.vo.coin.Page; import com.example.demo.domain.vo.coin.Result; import com.example.demo.service.cash.MessageService; import com.example.demo.service.coin.MarketService; import com.example.demo.service.coin.TranslationService; +import com.github.pagehelper.PageInfo; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -47,7 +49,11 @@ public class MessageController { private TranslationService translationService; @PostMapping - public Result getMessage(@RequestBody Status status, @RequestHeader(defaultValue = "zh_CN") String lang) throws Exception { + public Result getMessage(@RequestBody Page page, @RequestHeader(defaultValue = "zh_CN") String lang) throws Exception { + // 提取分页参数 + Integer pageNum = page.getPageNum(); + Integer pageSize = page.getPageSize(); + Status status = page.getStatus(); HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); String token = request.getHeader("token"); @@ -60,7 +66,7 @@ public class MessageController { String languageCode = parseLanguageCode(lang); // 如果不是中文环境，将查询条件中的翻译文本转换为中文简体 if (!"zh".equalsIgnoreCase(languageCode) && !"zh_cn".equalsIgnoreCase(languageCode)) { - List messages = messageService.getMessage(markets, status.getStatus()); + List messages = messageService.getMessageWithPaging(markets, status.getStatus(), pageNum, pageSize); convertTranslatedFieldsToChinese((Messages) messages, languageCode); } @@ -69,10 +75,14 @@ public class MessageController { markets = null; } - List messages = messageService.getMessage(markets, status.getStatus()); + // 分页查询 + List messages = messageService.getMessageWithPaging(markets, status.getStatus(), pageNum, pageSize); // 对返回结果进行多语言转换 translateMessages(messages, lang); - return Result.success(messages); + // 返回分页结果 + PageInfo pageInfo = new PageInfo<>(messages); + return Result.success(pageInfo); + } @PostMapping("/update") diff --git a/src/main/java/com/example/demo/domain/vo/coin/Page.java b/src/main/java/com/example/demo/domain/vo/coin/Page.java index b320ee6..e9eb1dd 100644 --- a/src/main/java/com/example/demo/domain/vo/coin/Page.java +++ b/src/main/java/com/example/demo/domain/vo/coin/Page.java @@ -4,11 +4,7 @@ import com.example.demo.domain.DTO.BeanConsumeCartDTO; import com.example.demo.domain.DTO.PerformanceDTO; import com.example.demo.domain.entity.User; import com.example.demo.domain.vo.bean.*; -import com.example.demo.domain.vo.cash.CashCollection; -import com.example.demo.domain.vo.cash.CashRecordDTO; -import com.example.demo.domain.vo.cash.CashRecordDone; -import com.example.demo.domain.vo.cash.PerformanceVO; -import com.example.demo.domain.vo.cash.FundsDTO; +import com.example.demo.domain.vo.cash.*; import lombok.Data; import lombok.NoArgsConstructor; @@ -56,5 +52,6 @@ public class Page { private PerformanceDTO performanceDTO;//业绩归属 private FundsDTO fundsDTO;//现金收款 private PerformanceVO performanceVO;//业绩归属 + private Status status; } diff --git a/src/main/java/com/example/demo/service/cash/MessageService.java b/src/main/java/com/example/demo/service/cash/MessageService.java index 8e51301..07d8c0c 100644 --- a/src/main/java/com/example/demo/service/cash/MessageService.java +++ b/src/main/java/com/example/demo/service/cash/MessageService.java @@ -16,7 +16,8 @@ import java.util.List; **/ @Service public interface MessageService { - List getMessage(List markets, List status); + // 在 MessageService 中添加分页查询方法 + List getMessageWithPaging(List markets, List status, Integer pageNum, Integer pageSize); void update(Integer id) throws Exception; } diff --git a/src/main/java/com/example/demo/serviceImpl/cash/MessageServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/MessageServiceImpl.java index ff3e85a..c4eb621 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/MessageServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/MessageServiceImpl.java @@ -3,6 +3,7 @@ package com.example.demo.serviceImpl.cash; import com.example.demo.domain.vo.coin.Messages; import com.example.demo.service.cash.MessageService; import com.example.demo.mapper.cash.MessageMapper; +import com.github.pagehelper.PageHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -23,11 +24,12 @@ public class MessageServiceImpl implements MessageService { @Autowired private MessageMapper messageMapper; @Override - public List getMessage(List markets, List status) { - if(status== null|| status.size()==0){ + public List getMessageWithPaging(List markets, List status, Integer pageNum, Integer pageSize) { + if(status == null || status.size() == 0){ status.add(99); } - return messageMapper.getMessage(markets, status) ; + PageHelper.startPage(pageNum, pageSize); + return messageMapper.getMessage(markets, status); } @Override