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 16bb14d..b69ecbb 100644 --- a/src/main/java/com/example/demo/controller/cash/MessageController.java +++ b/src/main/java/com/example/demo/controller/cash/MessageController.java @@ -6,12 +6,10 @@ 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; @@ -49,11 +47,7 @@ public class MessageController { private TranslationService translationService; @PostMapping - 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(); + public Result getMessage(@RequestBody Status status, @RequestHeader(defaultValue = "zh_CN") String lang) throws Exception { HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); String token = request.getHeader("token"); @@ -66,7 +60,7 @@ public class MessageController { String languageCode = parseLanguageCode(lang); // 如果不是中文环境,将查询条件中的翻译文本转换为中文简体 if (!"zh".equalsIgnoreCase(languageCode) && !"zh_cn".equalsIgnoreCase(languageCode)) { - List messages = messageService.getMessageWithPaging(markets, status.getStatus(), pageNum, pageSize); + List messages = messageService.getMessage(markets, status.getStatus()); convertTranslatedFieldsToChinese((Messages) messages, languageCode); } @@ -75,14 +69,10 @@ public class MessageController { markets = null; } - // 分页查询 - List messages = messageService.getMessageWithPaging(markets, status.getStatus(), pageNum, pageSize); + List messages = messageService.getMessage(markets, status.getStatus()); // 对返回结果进行多语言转换 translateMessages(messages, lang); - // 返回分页结果 - PageInfo pageInfo = new PageInfo<>(messages); - return Result.success(pageInfo); - + return Result.success(messages); } @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 e9eb1dd..b320ee6 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,7 +4,11 @@ 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.*; +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 lombok.Data; import lombok.NoArgsConstructor; @@ -52,6 +56,5 @@ 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 07d8c0c..8e51301 100644 --- a/src/main/java/com/example/demo/service/cash/MessageService.java +++ b/src/main/java/com/example/demo/service/cash/MessageService.java @@ -16,8 +16,7 @@ import java.util.List; **/ @Service public interface MessageService { - // 在 MessageService 中添加分页查询方法 - List getMessageWithPaging(List markets, List status, Integer pageNum, Integer pageSize); + List getMessage(List markets, List status); 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 c4eb621..ff3e85a 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/MessageServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/MessageServiceImpl.java @@ -3,7 +3,6 @@ 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; @@ -24,12 +23,11 @@ public class MessageServiceImpl implements MessageService { @Autowired private MessageMapper messageMapper; @Override - public List getMessageWithPaging(List markets, List status, Integer pageNum, Integer pageSize) { - if(status == null || status.size() == 0){ + public List getMessage(List markets, List status) { + if(status== null|| status.size()==0){ status.add(99); } - PageHelper.startPage(pageNum, pageSize); - return messageMapper.getMessage(markets, status); + return messageMapper.getMessage(markets, status) ; } @Override