Browse Source

1.修复群新成员会拉取到历史消息的bug

2.修复重新录音失败的bug
master
xie.bx 3 years ago
parent
commit
575f29644b
  1. 3
      im-platform/src/main/java/com/bx/implatform/service/impl/GroupMessageServiceImpl.java
  2. 2
      im-platform/src/main/java/com/bx/implatform/service/impl/GroupServiceImpl.java
  3. 1
      im-ui/src/components/chat/ChatVoice.vue
  4. 5
      im-ui/src/components/chat/MessageItem.vue

3
im-platform/src/main/java/com/bx/implatform/service/impl/GroupMessageServiceImpl.java

@ -111,7 +111,8 @@ public class GroupMessageServiceImpl extends ServiceImpl<GroupMessageMapper, Gro
key = RedisKey.IM_GROUP_READED_POSITION + member.getGroupId()+":"+userId; key = RedisKey.IM_GROUP_READED_POSITION + member.getGroupId()+":"+userId;
Integer maxReadedId = (Integer)redisTemplate.opsForValue().get(key); Integer maxReadedId = (Integer)redisTemplate.opsForValue().get(key);
QueryWrapper<GroupMessage> wrapper = new QueryWrapper(); QueryWrapper<GroupMessage> 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){ if(maxReadedId!=null){
wrapper.lambda().gt(GroupMessage::getId,maxReadedId); wrapper.lambda().gt(GroupMessage::getId,maxReadedId);
} }

2
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 org.springframework.transaction.annotation.Transactional;
import java.util.Collections; import java.util.Collections;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -273,6 +274,7 @@ public class GroupServiceImpl extends ServiceImpl<GroupMapper, Group> implements
groupMember.setAliasName(f.getFriendNickName()); groupMember.setAliasName(f.getFriendNickName());
groupMember.setRemark(group.getName()); groupMember.setRemark(group.getName());
groupMember.setHeadImage(f.getFriendHeadImage()); groupMember.setHeadImage(f.getFriendHeadImage());
groupMember.setCreatedTime(new Date());
groupMember.setQuit(false); groupMember.setQuit(false);
return groupMember; return groupMember;
}).collect(Collectors.toList()); }).collect(Collectors.toList());

1
im-ui/src/components/chat/ChatVoice.vue

@ -96,6 +96,7 @@
}, },
handleRestartRecord() { handleRestartRecord() {
this.rc.destroy(); this.rc.destroy();
this.rc = new Recorder()
this.rc.start(); this.rc.start();
this.state = 'RUNNING'; this.state = 'RUNNING';
this.mode = 'RECORD'; this.mode = 'RECORD';

5
im-ui/src/components/chat/MessageItem.vue

@ -250,6 +250,11 @@
.im-msg-voice { .im-msg-voice {
font-size: 14px; font-size: 14px;
cursor: pointer; cursor: pointer;
audio {
height: 45px;
padding: 5px 0;
}
} }
} }
} }

Loading…
Cancel
Save