From 888fe551ef812ec1bcd3c80bdac9e3179c9f2da0 Mon Sep 17 00:00:00 2001
From: wang-hao-jie <1550036656@qq.com>
Date: 星期四, 18 十一月 2021 11:39:43 +0800
Subject: [PATCH] 加油记录
---
xboot-modules/xboot-base/src/main/java/cn/exrick/xboot/base/controller/manage/MessageController.java | 65 ++++++++++++++++++--------------
1 files changed, 36 insertions(+), 29 deletions(-)
diff --git a/xboot-modules/xboot-base/src/main/java/cn/exrick/xboot/base/controller/manage/MessageController.java b/xboot-modules/xboot-base/src/main/java/cn/exrick/xboot/base/controller/manage/MessageController.java
index 0e979dc..386f4b3 100644
--- a/xboot-modules/xboot-base/src/main/java/cn/exrick/xboot/base/controller/manage/MessageController.java
+++ b/xboot-modules/xboot-base/src/main/java/cn/exrick/xboot/base/controller/manage/MessageController.java
@@ -13,6 +13,7 @@
import cn.exrick.xboot.core.service.MessageSendService;
import cn.exrick.xboot.core.service.MessageService;
import cn.exrick.xboot.core.service.UserService;
+import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HtmlUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -54,7 +55,13 @@
public Result<Page<Message>> getByCondition(Message message,
SearchVo searchVo,
PageVo pageVo) {
-
+ if(pageVo.getPageSize()==0){
+ pageVo.setPageSize(5);
+ }
+ if(StrUtil.isEmpty(pageVo.getOrder())){
+ pageVo.setOrder("desc");
+ pageVo.setSort("createTime");
+ }
Page<Message> page = messageService.findByCondition(message, searchVo, PageUtil.initPage(pageVo));
page.forEach(e->{
e.setContentText(HtmlUtil.cleanHtmlTag(e.getContent()));
@@ -77,29 +84,29 @@
Message m = messageService.save(message);
// 淇濆瓨娑堟伅鍙戦�佽〃
- List<MessageSend> messageSends = new ArrayList<>();
- if (CommonConstant.MESSAGE_RANGE_ALL.equals(message.getRange())) {
- // 鍏ㄤ綋
- List<User> allUser = userService.getAll();
- allUser.forEach(u -> {
- MessageSend ms = new MessageSend().setMessageId(m.getId()).setUserId(u.getId());
- messageSends.add(ms);
- });
- sendService.saveOrUpdateAll(messageSends);
- // 鎺ㄩ��
- messagingTemplate.convertAndSend("/topic/subscribe", "鎮ㄦ敹鍒颁簡鏂扮殑绯荤粺娑堟伅");
- } else if (CommonConstant.MESSAGE_RANGE_USER.equals(message.getRange())) {
- // 鎸囧畾鐢ㄦ埛
- for (String id : message.getUserIds()) {
- MessageSend ms = new MessageSend().setMessageId(m.getId()).setUserId(id);
- messageSends.add(ms);
- }
- sendService.saveOrUpdateAll(messageSends);
- // 鎺ㄩ��
- for (String id : message.getUserIds()) {
- messagingTemplate.convertAndSendToUser(id, "/queue/subscribe", "鎮ㄦ敹鍒颁簡鏂扮殑娑堟伅");
- }
- }
+// List<MessageSend> messageSends = new ArrayList<>();
+// if (CommonConstant.MESSAGE_RANGE_ALL.equals(message.getRange())) {
+// // 鍏ㄤ綋
+// List<User> allUser = userService.getAll();
+// allUser.forEach(u -> {
+// MessageSend ms = new MessageSend().setMessageId(m.getId()).setUserId(u.getId());
+// messageSends.add(ms);
+// });
+// sendService.saveOrUpdateAll(messageSends);
+// // 鎺ㄩ��
+// messagingTemplate.convertAndSend("/topic/subscribe", "鎮ㄦ敹鍒颁簡鏂扮殑绯荤粺娑堟伅");
+// } else if (CommonConstant.MESSAGE_RANGE_USER.equals(message.getRange())) {
+// // 鎸囧畾鐢ㄦ埛
+// for (String id : message.getUserIds()) {
+// MessageSend ms = new MessageSend().setMessageId(m.getId()).setUserId(id);
+// messageSends.add(ms);
+// }
+// sendService.saveOrUpdateAll(messageSends);
+// // 鎺ㄩ��
+// for (String id : message.getUserIds()) {
+// messagingTemplate.convertAndSendToUser(id, "/queue/subscribe", "鎮ㄦ敹鍒颁簡鏂扮殑娑堟伅");
+// }
+// }
return ResultUtil.success("娣诲姞鎴愬姛");
}
@@ -116,13 +123,13 @@
public Result<Object> delMessage(@RequestParam String[] ids) {
for (String id : ids) {
- if (ActivitiConstant.MESSAGE_PASS_ID.equals(id) || ActivitiConstant.MESSAGE_BACK_ID.equals(id) || ActivitiConstant.MESSAGE_DELEGATE_ID.equals(id)
- || ActivitiConstant.MESSAGE_TODO_ID.equals(id)) {
- return ResultUtil.error("鎶辨瓑锛屾棤娉曞垹闄ゅ伐浣滄祦鐩稿叧绯荤粺娑堟伅");
- }
+// if (ActivitiConstant.MESSAGE_PASS_ID.equals(id) || ActivitiConstant.MESSAGE_BACK_ID.equals(id) || ActivitiConstant.MESSAGE_DELEGATE_ID.equals(id)
+// || ActivitiConstant.MESSAGE_TODO_ID.equals(id)) {
+// return ResultUtil.error("鎶辨瓑锛屾棤娉曞垹闄ゅ伐浣滄祦鐩稿叧绯荤粺娑堟伅");
+// }
messageService.delete(id);
// 鍒犻櫎鍙戦�佽〃
- sendService.deleteByMessageId(id);
+ //sendService.deleteByMessageId(id);
}
return ResultUtil.success("缂栬緫鎴愬姛");
}
--
Gitblit v1.9.1