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 c4e6de4..f0fb54c 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 @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.bx.imclient.IMClient; import com.bx.imcommon.contant.IMConstant; +import com.bx.implatform.entity.PrivateMessage; import com.bx.implatform.util.DateTimeUtils; import com.bx.implatform.vo.GroupMessageVO; import com.bx.imcommon.model.IMGroupMessage; @@ -204,6 +205,7 @@ public class GroupMessageServiceImpl extends ServiceImpl messages = this.list(wrapper); 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 c55ea56..e12cdc3 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 @@ -191,7 +191,7 @@ public class PrivateMessageServiceImpl extends ServiceImpl wrap.and( wp -> wp.eq(PrivateMessage::getSendId, session.getUserId()) .in(PrivateMessage::getRecvId, friendIds)) - .or(wp -> wp.eq(PrivateMessage::getRecvId, session.getUserId()) - .in(PrivateMessage::getSendId, friendIds))) + .or(wp -> wp.eq(PrivateMessage::getRecvId, session.getUserId()) + .in(PrivateMessage::getSendId, friendIds))) + .orderByAsc(PrivateMessage::getId) .last("limit 100"); List messages = this.list(queryWrapper); @@ -236,7 +237,7 @@ public class PrivateMessageServiceImpl extends ServiceImpl updateWrapper = Wrappers.lambdaUpdate(); - updateWrapper.eq(PrivateMessage::getSendId,friendId) - .eq(PrivateMessage::getRecvId,session.getUserId()) - .eq(PrivateMessage::getStatus,MessageStatus.SENDED.code()) - .set(PrivateMessage::getStatus,MessageStatus.READED.code()); + updateWrapper.eq(PrivateMessage::getSendId, friendId) + .eq(PrivateMessage::getRecvId, session.getUserId()) + .eq(PrivateMessage::getStatus, MessageStatus.SENDED.code()) + .set(PrivateMessage::getStatus, MessageStatus.READED.code()); this.update(updateWrapper); - log.info("消息已读,接收方id:{},发送方id:{}", session.getUserId(),friendId); + log.info("消息已读,接收方id:{},发送方id:{}", session.getUserId(), friendId); } }