Browse Source

Revert "1月29日,消息推送分页"

This reverts commit 7fd3abc42e.
dev
wangguorui 4 weeks ago
parent
commit
7b1775de75
  1. 18
      src/main/java/com/example/demo/controller/cash/MessageController.java
  2. 7
      src/main/java/com/example/demo/domain/vo/coin/Page.java
  3. 3
      src/main/java/com/example/demo/service/cash/MessageService.java
  4. 4
      src/main/java/com/example/demo/serviceImpl/cash/MessageServiceImpl.java

18
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.entity.Admin;
import com.example.demo.domain.vo.cash.Status; import com.example.demo.domain.vo.cash.Status;
import com.example.demo.domain.vo.coin.Messages; 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.domain.vo.coin.Result;
import com.example.demo.service.cash.MessageService; import com.example.demo.service.cash.MessageService;
import com.example.demo.service.coin.MarketService; import com.example.demo.service.coin.MarketService;
import com.example.demo.service.coin.TranslationService; import com.example.demo.service.coin.TranslationService;
import com.github.pagehelper.PageInfo;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@ -49,11 +47,7 @@ public class MessageController {
private TranslationService translationService; private TranslationService translationService;
@PostMapping @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(); HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String token = request.getHeader("token"); String token = request.getHeader("token");
@ -66,7 +60,7 @@ public class MessageController {
String languageCode = parseLanguageCode(lang); String languageCode = parseLanguageCode(lang);
// 如果不是中文环境将查询条件中的翻译文本转换为中文简体 // 如果不是中文环境将查询条件中的翻译文本转换为中文简体
if (!"zh".equalsIgnoreCase(languageCode) && !"zh_cn".equalsIgnoreCase(languageCode)) { if (!"zh".equalsIgnoreCase(languageCode) && !"zh_cn".equalsIgnoreCase(languageCode)) {
List<com.example.demo.domain.vo.coin.Messages> messages = messageService.getMessageWithPaging(markets, status.getStatus(), pageNum, pageSize);
List<com.example.demo.domain.vo.coin.Messages> messages = messageService.getMessage(markets, status.getStatus());
convertTranslatedFieldsToChinese((Messages) messages, languageCode); convertTranslatedFieldsToChinese((Messages) messages, languageCode);
} }
@ -75,14 +69,10 @@ public class MessageController {
markets = null; markets = null;
} }
// 分页查询
List<Messages> messages = messageService.getMessageWithPaging(markets, status.getStatus(), pageNum, pageSize);
List<com.example.demo.domain.vo.coin.Messages> messages = messageService.getMessage(markets, status.getStatus());
// 对返回结果进行多语言转换 // 对返回结果进行多语言转换
translateMessages(messages, lang); translateMessages(messages, lang);
// 返回分页结果
PageInfo<Messages> pageInfo = new PageInfo<>(messages);
return Result.success(pageInfo);
return Result.success(messages);
} }
@PostMapping("/update") @PostMapping("/update")

7
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.DTO.PerformanceDTO;
import com.example.demo.domain.entity.User; import com.example.demo.domain.entity.User;
import com.example.demo.domain.vo.bean.*; 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.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
@ -52,6 +56,5 @@ public class Page {
private PerformanceDTO performanceDTO;//业绩归属 private PerformanceDTO performanceDTO;//业绩归属
private FundsDTO fundsDTO;//现金收款 private FundsDTO fundsDTO;//现金收款
private PerformanceVO performanceVO;//业绩归属 private PerformanceVO performanceVO;//业绩归属
private Status status;
} }

3
src/main/java/com/example/demo/service/cash/MessageService.java

@ -16,8 +16,7 @@ import java.util.List;
**/ **/
@Service @Service
public interface MessageService { public interface MessageService {
// MessageService 中添加分页查询方法
List<Messages> getMessageWithPaging(List<String> markets, List<Integer> status, Integer pageNum, Integer pageSize);
List<Messages> getMessage(List<String> markets, List<Integer> status);
void update(Integer id) throws Exception; void update(Integer id) throws Exception;
} }

4
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.domain.vo.coin.Messages;
import com.example.demo.service.cash.MessageService; import com.example.demo.service.cash.MessageService;
import com.example.demo.mapper.cash.MessageMapper; import com.example.demo.mapper.cash.MessageMapper;
import com.github.pagehelper.PageHelper;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@ -24,11 +23,10 @@ public class MessageServiceImpl implements MessageService {
@Autowired @Autowired
private MessageMapper messageMapper; private MessageMapper messageMapper;
@Override @Override
public List<Messages> getMessageWithPaging(List<String> markets, List<Integer> status, Integer pageNum, Integer pageSize) {
public List<Messages> getMessage(List<String> markets, List<Integer> status) {
if(status== null|| status.size()==0){ if(status== null|| status.size()==0){
status.add(99); status.add(99);
} }
PageHelper.startPage(pageNum, pageSize);
return messageMapper.getMessage(markets, status) ; return messageMapper.getMessage(markets, status) ;
} }

Loading…
Cancel
Save