修改消息状态枚举命名

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, "已送达"),
     /**
      * 撤回
      */

im-platform/src/main/java/com/bx/implatform/listener/PrivateMessageListener.java

@@ -41,8 +41,8 @@ public class PrivateMessageListener implements MessageListener<PrivateMessageVO>
         if(CollUtil.isNotEmpty(messageIds)){
             UpdateWrapper<PrivateMessage> 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);
         }
     }

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

@@ -233,7 +233,7 @@ public class FriendServiceImpl extends ServiceImpl<FriendMapper, Friend> 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<FriendMapper, Friend> 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);
         // 推送

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<GroupMessageMapper, Gro
         this.updateById(msg);
         // 生成一条撤回消息
         GroupMessage recallMsg = new GroupMessage();
-        recallMsg.setStatus(MessageStatus.UNSEND.code());
+        recallMsg.setStatus(MessageStatus.PENDING.code());
         recallMsg.setType(MessageType.RECALL.code());
         recallMsg.setGroupId(msg.getGroupId());
         recallMsg.setSendId(session.getUserId());
@@ -228,7 +227,7 @@ public class GroupMessageServiceImpl extends ServiceImpl<GroupMessageMapper, Gro
                     List<String> 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)) {

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

@@ -330,7 +330,7 @@ public class GroupServiceImpl extends ServiceImpl<GroupMapper, Group> 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);

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

@@ -57,7 +57,7 @@ public class PrivateMessageServiceImpl extends ServiceImpl<PrivateMessageMapper,
         // 保存消息
         PrivateMessage msg = BeanUtils.copyProperties(dto, PrivateMessage.class);
         msg.setSendId(session.getUserId());
-        msg.setStatus(MessageStatus.UNSEND.code());
+        msg.setStatus(MessageStatus.PENDING.code());
         msg.setSendTime(new Date());
         // 过滤内容中的敏感词
         if (MessageType.TEXT.code().equals(dto.getType())) {
@@ -97,7 +97,7 @@ public class PrivateMessageServiceImpl extends ServiceImpl<PrivateMessageMapper,
         // 生成一条撤回消息
         PrivateMessage recallMsg = new PrivateMessage();
         recallMsg.setSendId(session.getUserId());
-        recallMsg.setStatus(MessageStatus.UNSEND.code());
+        recallMsg.setStatus(MessageStatus.PENDING.code());
         recallMsg.setSendTime(new Date());
         recallMsg.setRecvId(msg.getRecvId());
         recallMsg.setType(MessageType.RECALL.code());
@@ -205,7 +205,7 @@ public class PrivateMessageServiceImpl extends ServiceImpl<PrivateMessageMapper,
         // 修改消息状态为已读
         LambdaUpdateWrapper<PrivateMessage> 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);

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

im-platform/src/main/java/com/bx/implatform/task/consumer/GroupBannedConsumerTask.java

@@ -52,7 +52,7 @@ public class GroupBannedConsumerTask extends RedisMQConsumer<GroupBanDTO> {
         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);

im-platform/src/main/java/com/bx/implatform/task/consumer/GroupUnbanConsumerTask.java

@@ -51,7 +51,7 @@ public class GroupUnbanConsumerTask extends RedisMQConsumer<GroupUnbanDTO> {
         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);