From 575f29644be23c91c417c3e104fcee4a1a823754 Mon Sep 17 00:00:00 2001 From: "xie.bx" Date: Tue, 15 Nov 2022 10:41:36 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E7=BE=A4=E6=96=B0=E6=88=90?= =?UTF-8?q?=E5=91=98=E4=BC=9A=E6=8B=89=E5=8F=96=E5=88=B0=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=9A=84bug=202.=E4=BF=AE=E5=A4=8D=E9=87=8D?= =?UTF-8?q?=E6=96=B0=E5=BD=95=E9=9F=B3=E5=A4=B1=E8=B4=A5=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bx/implatform/service/impl/GroupMessageServiceImpl.java | 3 ++- .../com/bx/implatform/service/impl/GroupServiceImpl.java | 2 ++ im-ui/src/components/chat/ChatVoice.vue | 1 + im-ui/src/components/chat/MessageItem.vue | 5 +++++ 4 files changed, 10 insertions(+), 1 deletion(-) 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 3c62332..31ef659 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 @@ -111,7 +111,8 @@ public class GroupMessageServiceImpl extends ServiceImpl wrapper = new QueryWrapper(); - wrapper.lambda().eq(GroupMessage::getGroupId,member.getGroupId()); + wrapper.lambda().eq(GroupMessage::getGroupId,member.getGroupId()) + .gt(GroupMessage::getSendTime,member.getCreatedTime()); if(maxReadedId!=null){ wrapper.lambda().gt(GroupMessage::getId,maxReadedId); } diff --git a/im-platform/src/main/java/com/bx/implatform/service/impl/GroupServiceImpl.java b/im-platform/src/main/java/com/bx/implatform/service/impl/GroupServiceImpl.java index c5b9ceb..65da723 100644 --- a/im-platform/src/main/java/com/bx/implatform/service/impl/GroupServiceImpl.java +++ b/im-platform/src/main/java/com/bx/implatform/service/impl/GroupServiceImpl.java @@ -30,6 +30,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.Collections; +import java.util.Date; import java.util.List; import java.util.Optional; import java.util.stream.Collectors; @@ -273,6 +274,7 @@ public class GroupServiceImpl extends ServiceImpl implements groupMember.setAliasName(f.getFriendNickName()); groupMember.setRemark(group.getName()); groupMember.setHeadImage(f.getFriendHeadImage()); + groupMember.setCreatedTime(new Date()); groupMember.setQuit(false); return groupMember; }).collect(Collectors.toList()); diff --git a/im-ui/src/components/chat/ChatVoice.vue b/im-ui/src/components/chat/ChatVoice.vue index cf3ff97..223eb49 100644 --- a/im-ui/src/components/chat/ChatVoice.vue +++ b/im-ui/src/components/chat/ChatVoice.vue @@ -96,6 +96,7 @@ }, handleRestartRecord() { this.rc.destroy(); + this.rc = new Recorder() this.rc.start(); this.state = 'RUNNING'; this.mode = 'RECORD'; diff --git a/im-ui/src/components/chat/MessageItem.vue b/im-ui/src/components/chat/MessageItem.vue index 9e89f7c..2b2ce20 100644 --- a/im-ui/src/components/chat/MessageItem.vue +++ b/im-ui/src/components/chat/MessageItem.vue @@ -250,6 +250,11 @@ .im-msg-voice { font-size: 14px; cursor: pointer; + + audio { + height: 45px; + padding: 5px 0; + } } } }