diff --git a/src/main/java/org/springblade/modules/business/contraller/MessageController.java b/src/main/java/org/springblade/modules/business/contraller/MessageController.java index 988392a..59c062f 100644 --- a/src/main/java/org/springblade/modules/business/contraller/MessageController.java +++ b/src/main/java/org/springblade/modules/business/contraller/MessageController.java @@ -10,7 +10,6 @@ import org.springblade.modules.business.pojo.vo.MessageVO; import org.springblade.modules.business.service.IMessageService; import org.springframework.web.bind.annotation.*; -import javax.swing.plaf.SeparatorUI; import java.time.LocalDateTime; import java.util.List; @@ -33,32 +32,33 @@ public class MessageController extends BladeController { * @param status * @return */ - @PostMapping("/list") + @GetMapping("/list") @Operation(summary = "消息列表获取", description = "消息列表获取") public R getMessageList(Integer current, Integer size, LocalDateTime start, LocalDateTime end, Integer status) { - List messageList = messageService.getMessageList(current, size, start, end, status); - return R.data(messageList); + return R.data(messageService.getMessageList(current, size, start, end, status)); } /** * 获取消息总数接口 + * * @return */ - @PostMapping("/total") - @Operation(summary = "获取消息总数",description = "获取消息总数") - public R getMessageTotal(){ + @GetMapping("/total") + @Operation(summary = "获取消息总数", description = "获取消息总数") + public R getMessageTotal() { Long messageTotal = messageService.getMessageTotal(); return R.data(messageTotal); } /** * 更新已读接口 + * * @param id * @param status * @return */ - @PostMapping("/updateStatus") - @Operation(summary = "更新已读",description = "更新已读") + @PutMapping("/updateStatus") + @Operation(summary = "更新已读", description = "更新已读") public void updateMessageStatus(Integer id, Integer status) { messageService.updateMessageStatus(id, status); } @@ -66,9 +66,9 @@ public class MessageController extends BladeController { /** * 一键已读全部接口 */ - @PostMapping("/updateStatusAll") - @Operation(summary = "一键全部已读",description = "一键全部已读") - public void updateMessageStatusAll(){ + @PutMapping("/updateStatusAll") + @Operation(summary = "一键全部已读", description = "一键全部已读") + public void updateMessageStatusAll() { messageService.updateMessageStatusAll(); } @@ -80,7 +80,7 @@ public class MessageController extends BladeController { Long messageUser = message.getMessageUser(); Integer messageType = message.getMessageType(); - messageService.saveMessage(systemType,title,content,messageUser,messageType); + messageService.saveMessage(systemType, title, content, messageUser, messageType); } } diff --git a/src/main/java/org/springblade/modules/business/pojo/vo/MessageVO.java b/src/main/java/org/springblade/modules/business/pojo/vo/MessageVO.java index ca21cc2..42198d3 100644 --- a/src/main/java/org/springblade/modules/business/pojo/vo/MessageVO.java +++ b/src/main/java/org/springblade/modules/business/pojo/vo/MessageVO.java @@ -17,6 +17,4 @@ public class MessageVO { private Integer status; private Integer messageType; - - } diff --git a/src/main/java/org/springblade/modules/business/pojo/vo/PageVO.java b/src/main/java/org/springblade/modules/business/pojo/vo/PageVO.java new file mode 100644 index 0000000..ebb6aec --- /dev/null +++ b/src/main/java/org/springblade/modules/business/pojo/vo/PageVO.java @@ -0,0 +1,15 @@ +package org.springblade.modules.business.pojo.vo; + +import io.lettuce.core.protocol.CommandHandler; +import lombok.Data; + +import java.util.List; + + +@Data +public class PageVO { + + private List list; + + private Long total; +} diff --git a/src/main/java/org/springblade/modules/business/service/IMessageService.java b/src/main/java/org/springblade/modules/business/service/IMessageService.java index bf77df4..d392c59 100644 --- a/src/main/java/org/springblade/modules/business/service/IMessageService.java +++ b/src/main/java/org/springblade/modules/business/service/IMessageService.java @@ -3,6 +3,7 @@ package org.springblade.modules.business.service; import org.springblade.core.mp.base.BaseService; import org.springblade.modules.business.pojo.entity.Message; import org.springblade.modules.business.pojo.vo.MessageVO; +import org.springblade.modules.business.pojo.vo.PageVO; import java.time.LocalDateTime; import java.util.List; @@ -12,7 +13,7 @@ public interface IMessageService extends BaseService { void saveMessage(String systemType, String title, String content, Long messageUser, Integer messageType); - List getMessageList(Integer current, Integer size, LocalDateTime start, LocalDateTime end, Integer status); + PageVO getMessageList(Integer current, Integer size, LocalDateTime start, LocalDateTime end, Integer status); Long getMessageTotal(); diff --git a/src/main/java/org/springblade/modules/business/service/impl/MessageServiceImpl.java b/src/main/java/org/springblade/modules/business/service/impl/MessageServiceImpl.java index 1536957..043e923 100644 --- a/src/main/java/org/springblade/modules/business/service/impl/MessageServiceImpl.java +++ b/src/main/java/org/springblade/modules/business/service/impl/MessageServiceImpl.java @@ -8,6 +8,7 @@ import org.springblade.core.secure.utils.AuthUtil; import org.springblade.modules.business.mapper.MessageMapper; import org.springblade.modules.business.pojo.entity.Message; import org.springblade.modules.business.pojo.vo.MessageVO; +import org.springblade.modules.business.pojo.vo.PageVO; import org.springblade.modules.business.service.IMessageService; import org.springframework.stereotype.Service; @@ -54,7 +55,7 @@ public class MessageServiceImpl extends BaseServiceImpl * @return */ @Override - public List getMessageList(Integer current, Integer size, LocalDateTime start, LocalDateTime end, Integer status) { + public PageVO getMessageList(Integer current, Integer size, LocalDateTime start, LocalDateTime end, Integer status) { QueryWrapper queryWrapper = new QueryWrapper<>(); if (start != null && end != null) { queryWrapper.between("create_time", start, end); @@ -65,6 +66,7 @@ public class MessageServiceImpl extends BaseServiceImpl Page page = new Page<>(current, size); Page messagePage = baseMapper.selectPage(page, queryWrapper); List records = messagePage.getRecords(); + Long total = messagePage.getTotal(); MessageVO messageVO = new MessageVO(); List messageVOList = new ArrayList<>(); for (Message record : records) { @@ -75,7 +77,10 @@ public class MessageServiceImpl extends BaseServiceImpl messageVO.setCreateTime(record.getCreateTime()); messageVOList.add(messageVO); } - return messageVOList; + PageVO pageVO = new PageVO(); + pageVO.setList(messageVOList); + pageVO.setTotal(total); + return pageVO; } /**