From 9ee347dd260c9b1b18e31d628dfeef18f2a774f7 Mon Sep 17 00:00:00 2001 From: xsx <825657193@qq.com> Date: Wed, 16 Jul 2025 17:24:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B6=88=E6=81=AF=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=9E=9A=E4=B8=BE=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/bx/implatform/enums/MessageStatus.java | 8 ++++---- .../bx/implatform/listener/PrivateMessageListener.java | 4 ++-- .../com/bx/implatform/service/impl/FriendServiceImpl.java | 4 ++-- .../implatform/service/impl/GroupMessageServiceImpl.java | 5 ++--- .../com/bx/implatform/service/impl/GroupServiceImpl.java | 2 +- .../service/impl/PrivateMessageServiceImpl.java | 6 +++--- .../implatform/service/impl/WebrtcPrivateServiceImpl.java | 6 +++--- .../implatform/task/consumer/GroupBannedConsumerTask.java | 2 +- .../implatform/task/consumer/GroupUnbanConsumerTask.java | 2 +- 9 files changed, 19 insertions(+), 20 deletions(-) diff --git a/im-platform/src/main/java/com/bx/implatform/enums/MessageStatus.java b/im-platform/src/main/java/com/bx/implatform/enums/MessageStatus.java index 68769d2..73197c1 100644 --- a/im-platform/src/main/java/com/bx/implatform/enums/MessageStatus.java +++ b/im-platform/src/main/java/com/bx/implatform/enums/MessageStatus.java @@ -6,13 +6,13 @@ import lombok.AllArgsConstructor; public enum MessageStatus { /** - * 文件 + * 等待推送(未送达) */ - UNSEND(0, "未送达"), + PENDING(0, "等待推送"), /** - * 文件 + * 已送达(未读) */ - SENDED(1, "送达"), + DELIVERED(1, "已送达"), /** * 撤回 */ diff --git a/im-platform/src/main/java/com/bx/implatform/listener/PrivateMessageListener.java b/im-platform/src/main/java/com/bx/implatform/listener/PrivateMessageListener.java index b59db7a..d75ab86 100644 --- a/im-platform/src/main/java/com/bx/implatform/listener/PrivateMessageListener.java +++ b/im-platform/src/main/java/com/bx/implatform/listener/PrivateMessageListener.java @@ -41,8 +41,8 @@ public class PrivateMessageListener implements MessageListener if(CollUtil.isNotEmpty(messageIds)){ UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.lambda().in(PrivateMessage::getId, messageIds) - .eq(PrivateMessage::getStatus, MessageStatus.UNSEND.code()) - .set(PrivateMessage::getStatus, MessageStatus.SENDED.code()); + .eq(PrivateMessage::getStatus, MessageStatus.PENDING.code()) + .set(PrivateMessage::getStatus, MessageStatus.DELIVERED.code()); privateMessageService.update(updateWrapper); } } diff --git a/im-platform/src/main/java/com/bx/implatform/service/impl/FriendServiceImpl.java b/im-platform/src/main/java/com/bx/implatform/service/impl/FriendServiceImpl.java index bbe6204..ec7beec 100644 --- a/im-platform/src/main/java/com/bx/implatform/service/impl/FriendServiceImpl.java +++ b/im-platform/src/main/java/com/bx/implatform/service/impl/FriendServiceImpl.java @@ -233,7 +233,7 @@ public class FriendServiceImpl extends ServiceImpl impleme msg.setRecvId(friendId); msg.setContent("你们已成为好友，现在可以开始聊天了"); msg.setSendTime(new Date()); - msg.setStatus(MessageStatus.UNSEND.code()); + msg.setStatus(MessageStatus.PENDING.code()); msg.setType(MessageType.TIP_TEXT.code()); privateMessageMapper.insert(msg); // 推给对方 @@ -257,7 +257,7 @@ public class FriendServiceImpl extends ServiceImpl impleme msg.setRecvId(friendId); msg.setSendTime(new Date()); msg.setType(MessageType.TIP_TEXT.code()); - msg.setStatus(MessageStatus.UNSEND.code()); + msg.setStatus(MessageStatus.PENDING.code()); msg.setContent("你们的好友关系已被解除"); privateMessageMapper.insert(msg); // 推送 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 50cd4cb..5830074 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 @@ -42,7 +42,6 @@ import org.springframework.transaction.annotation.Transactional; import java.util.*; import java.util.concurrent.ScheduledThreadPoolExecutor; -import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; @Slf4j @@ -123,7 +122,7 @@ public class GroupMessageServiceImpl extends ServiceImpl atIds = CommaTextUtils.asList(m.getAtUserIds()); vo.setAtUserIds(atIds.stream().map(Long::parseLong).collect(Collectors.toList())); // 填充状态 - vo.setStatus(readedMaxId >= m.getId() ? MessageStatus.READED.code() : MessageStatus.UNSEND.code()); + vo.setStatus(readedMaxId >= m.getId() ? MessageStatus.READED.code() : MessageStatus.PENDING.code()); // 针对回执消息填充已读人数 if (m.getReceipt()) { if (Objects.isNull(maxIdMap)) { 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 f5ab43d..9437908 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 @@ -330,7 +330,7 @@ public class GroupServiceImpl extends ServiceImpl implements GroupMessage message = new GroupMessage(); message.setContent(content); message.setType(MessageType.TIP_TEXT.code()); - message.setStatus(MessageStatus.UNSEND.code()); + message.setStatus(MessageStatus.PENDING.code()); message.setSendTime(new Date()); message.setSendNickName(session.getNickName()); message.setGroupId(groupId); 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 fa88b16..d0336b8 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 @@ -57,7 +57,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()) + .eq(PrivateMessage::getStatus, MessageStatus.DELIVERED.code()) .set(PrivateMessage::getStatus, MessageStatus.READED.code()); this.update(updateWrapper); log.info("消息已读，接收方id:{},发送方id:{}", session.getUserId(), friendId); diff --git a/im-platform/src/main/java/com/bx/implatform/service/impl/WebrtcPrivateServiceImpl.java b/im-platform/src/main/java/com/bx/implatform/service/impl/WebrtcPrivateServiceImpl.java index 2b93199..374c740 100644 --- a/im-platform/src/main/java/com/bx/implatform/service/impl/WebrtcPrivateServiceImpl.java +++ b/im-platform/src/main/java/com/bx/implatform/service/impl/WebrtcPrivateServiceImpl.java @@ -51,12 +51,12 @@ public class WebrtcPrivateServiceImpl implements WebrtcPrivateService { webrtcSession.setMode(mode); // 校验 if (!imClient.isOnline(uid)) { - this.sendActMessage(webrtcSession, MessageStatus.UNSEND, "未接通"); + this.sendActMessage(webrtcSession, MessageStatus.PENDING, "未接通"); log.info("对方不在线,uid:{}", uid); throw new GlobalException("对方目前不在线"); } if (userStateUtils.isBusy(uid)) { - this.sendActMessage(webrtcSession, MessageStatus.UNSEND, "未接通"); + this.sendActMessage(webrtcSession, MessageStatus.PENDING, "未接通"); log.info("对方正忙,uid:{}", uid); throw new GlobalException("对方正忙"); } @@ -171,7 +171,7 @@ public class WebrtcPrivateServiceImpl implements WebrtcPrivateService { // 通知对方取消会话 imClient.sendPrivateMessage(sendMessage); // 生成通话消息 - sendActMessage(webrtcSession, MessageStatus.UNSEND, "已取消"); + sendActMessage(webrtcSession, MessageStatus.PENDING, "已取消"); } @Override diff --git a/im-platform/src/main/java/com/bx/implatform/task/consumer/GroupBannedConsumerTask.java b/im-platform/src/main/java/com/bx/implatform/task/consumer/GroupBannedConsumerTask.java index 27c8853..44712d9 100644 --- a/im-platform/src/main/java/com/bx/implatform/task/consumer/GroupBannedConsumerTask.java +++ b/im-platform/src/main/java/com/bx/implatform/task/consumer/GroupBannedConsumerTask.java @@ -52,7 +52,7 @@ public class GroupBannedConsumerTask extends RedisMQConsumer { msg.setContent(tip); msg.setSendId(Constant.SYS_USER_ID); msg.setSendTime(new Date()); - msg.setStatus(MessageStatus.UNSEND.code()); + msg.setStatus(MessageStatus.PENDING.code()); msg.setSendNickName("系统管理员"); msg.setType(MessageType.TIP_TEXT.code()); groupMessageService.save(msg); diff --git a/im-platform/src/main/java/com/bx/implatform/task/consumer/GroupUnbanConsumerTask.java b/im-platform/src/main/java/com/bx/implatform/task/consumer/GroupUnbanConsumerTask.java index 67b3993..ec7c2da 100644 --- a/im-platform/src/main/java/com/bx/implatform/task/consumer/GroupUnbanConsumerTask.java +++ b/im-platform/src/main/java/com/bx/implatform/task/consumer/GroupUnbanConsumerTask.java @@ -51,7 +51,7 @@ public class GroupUnbanConsumerTask extends RedisMQConsumer { msg.setContent("已解除封禁"); msg.setSendId(Constant.SYS_USER_ID); msg.setSendTime(new Date()); - msg.setStatus(MessageStatus.UNSEND.code()); + msg.setStatus(MessageStatus.PENDING.code()); msg.setSendNickName("系统管理员"); msg.setType(MessageType.TIP_TEXT.code()); groupMessageService.save(msg);