From 7543047e0bd76eb53fcba9b3c8e9e6684a6f8524 Mon Sep 17 00:00:00 2001 From: "xie.bx" Date: Sun, 5 Nov 2023 22:53:18 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E5=85=AC=E5=91=8A=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bx/implatform/controller/UserController.java | 6 ------ .../java/com/bx/implatform/service/IUserService.java | 2 -- .../service/impl/GroupMessageServiceImpl.java | 2 +- .../service/impl/PrivateMessageServiceImpl.java | 2 +- .../bx/implatform/service/impl/UserServiceImpl.java | 12 ------------ im-ui/src/components/chat/ChatBox.vue | 10 ++++------ im-ui/src/view/Login.vue | 12 ++++++++---- 7 files changed, 14 insertions(+), 32 deletions(-) diff --git a/im-platform/src/main/java/com/bx/implatform/controller/UserController.java b/im-platform/src/main/java/com/bx/implatform/controller/UserController.java index 2165cde..1c7cf09 100644 --- a/im-platform/src/main/java/com/bx/implatform/controller/UserController.java +++ b/im-platform/src/main/java/com/bx/implatform/controller/UserController.java @@ -28,12 +28,6 @@ public class UserController { private IUserService userService; - @GetMapping("/online") - @ApiOperation(value = "判断用户是否在线",notes="返回在线的用户id集合") - public Result checkOnline(@NotEmpty @RequestParam("userIds") String userIds){ - List onlineIds = userService.checkOnline(userIds); - return ResultUtils.success(onlineIds); - } @GetMapping("/terminal/online") @ApiOperation(value = "判断用户哪个终端在线",notes="返回在线的用户id的终端集合") diff --git a/im-platform/src/main/java/com/bx/implatform/service/IUserService.java b/im-platform/src/main/java/com/bx/implatform/service/IUserService.java index c675567..af22b5c 100644 --- a/im-platform/src/main/java/com/bx/implatform/service/IUserService.java +++ b/im-platform/src/main/java/com/bx/implatform/service/IUserService.java @@ -30,8 +30,6 @@ public interface IUserService extends IService { List findUserByName(String name); - List checkOnline(String userIds); - List getOnlineTerminals(String userIds); diff --git a/im-platform/src/main/java/com/bx/implatform/service/impl/GroupMessageServiceImpl.java b/im-platform/src/main/java/com/bx/implatform/service/impl/GroupMessageServiceImpl.java index 176bf23..c4e6de4 100644 --- a/im-platform/src/main/java/com/bx/implatform/service/impl/GroupMessageServiceImpl.java +++ b/im-platform/src/main/java/com/bx/implatform/service/impl/GroupMessageServiceImpl.java @@ -198,7 +198,7 @@ public class GroupMessageServiceImpl extends ServiceImpl members = groupMemberService.findByUserId(session.getUserId()); List ids = members.stream().map(GroupMember::getGroupId).collect(Collectors.toList()); // 只能拉取最近3个月的 - Date minDate = DateTimeUtils.addMonths(new Date(), -1); + Date minDate = DateTimeUtils.addMonths(new Date(), -3); LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); wrapper.gt(GroupMessage::getId, minId) .gt(GroupMessage::getSendTime, minDate) diff --git a/im-platform/src/main/java/com/bx/implatform/service/impl/PrivateMessageServiceImpl.java b/im-platform/src/main/java/com/bx/implatform/service/impl/PrivateMessageServiceImpl.java index 314c2a6..c55ea56 100644 --- a/im-platform/src/main/java/com/bx/implatform/service/impl/PrivateMessageServiceImpl.java +++ b/im-platform/src/main/java/com/bx/implatform/service/impl/PrivateMessageServiceImpl.java @@ -205,7 +205,7 @@ public class PrivateMessageServiceImpl extends ServiceImpl queryWrapper = Wrappers.lambdaQuery(); // 只能拉取最近6个月的 - Date minDate = DateTimeUtils.addMonths(new Date(), -1); + Date minDate = DateTimeUtils.addMonths(new Date(), -3); queryWrapper.gt(PrivateMessage::getId, minId) .ge(PrivateMessage::getSendTime, minDate) .ne(PrivateMessage::getStatus, MessageStatus.RECALL.code()) diff --git a/im-platform/src/main/java/com/bx/implatform/service/impl/UserServiceImpl.java b/im-platform/src/main/java/com/bx/implatform/service/impl/UserServiceImpl.java index 0d9a8bf..8e905dc 100644 --- a/im-platform/src/main/java/com/bx/implatform/service/impl/UserServiceImpl.java +++ b/im-platform/src/main/java/com/bx/implatform/service/impl/UserServiceImpl.java @@ -246,18 +246,6 @@ public class UserServiceImpl extends ServiceImpl implements IU }).collect(Collectors.toList()); } - /** - * 判断用户是否在线，返回在线的用户id列表 - * - * @param userIds 用户id，多个用‘,’分割 - * @return 在线用户id列表 - */ - @Override - public List checkOnline(String userIds) { - List userIdList = Arrays.stream(userIds.split(",")) - .map(Long::parseLong).collect(Collectors.toList()); - return imClient.getOnlineUser(userIdList); - } /** diff --git a/im-ui/src/components/chat/ChatBox.vue b/im-ui/src/components/chat/ChatBox.vue index 0922333..e4f06b4 100644 --- a/im-ui/src/components/chat/ChatBox.vue +++ b/im-ui/src/components/chat/ChatBox.vue @@ -242,16 +242,12 @@ this.showMinIdx = this.showMinIdx > 10 ? this.showMinIdx - 10 : 0; }, handleScroll(e) { - let scrollElement = e.target let scrollTop = scrollElement.scrollTop - if (scrollTop <30 ) { // 在顶部,不滚动的情况 - console.log("next") + if (scrollTop < 30 ) { // 在顶部,不滚动的情况 // 多展示20条信息 this.showMinIdx = this.showMinIdx > 20 ? this.showMinIdx - 20 : 0; - } - }, switchEmotionBox() { this.showEmotion = !this.showEmotion; @@ -508,14 +504,16 @@ handler(newChat, oldChat) { if (newChat.targetId > 0 && (!oldChat || newChat.type != oldChat.type || newChat.targetId != oldChat.targetId)) { - if (this.chat.type == "GROUP") { this.loadGroup(this.chat.targetId); } else { this.loadFriend(this.chat.targetId); } + // 滚到底部 this.scrollToBottom(); this.sendText = ""; + // 消息已读 + this.readedMessage() // 初始状态只显示30条消息 let size = this.chat.messages.length; this.showMinIdx = size > 30 ? size - 30 : 0; diff --git a/im-ui/src/view/Login.vue b/im-ui/src/view/Login.vue index faafa1a..8232b52 100644 --- a/im-ui/src/view/Login.vue +++ b/im-ui/src/view/Login.vue @@ -1,8 +1,6 @@