!1008 MALL-KEFU: 优化消息已读处理逻辑

Merge pull request !1008 from puhui999/develop
This commit is contained in:
芋道源码 2024-07-06 15:57:14 +00:00 committed by Gitee
commit f510ae5c16
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 20 additions and 13 deletions

View File

@ -34,8 +34,8 @@ public class KeFuConversationController {
@Resource @Resource
private MemberUserApi memberUserApi; private MemberUserApi memberUserApi;
@PostMapping("/update-conversation-pinned") @PutMapping("/update-conversation-pinned")
@Operation(summary = "置顶客服会话") @Operation(summary = "置顶/取消置顶客服会话")
@PreAuthorize("@ss.hasPermission('promotion:kefu-conversation:update')") @PreAuthorize("@ss.hasPermission('promotion:kefu-conversation:update')")
public CommonResult<Boolean> updateConversationPinned(@Valid @RequestBody KeFuConversationUpdatePinnedReqVO updateReqVO) { public CommonResult<Boolean> updateConversationPinned(@Valid @RequestBody KeFuConversationUpdatePinnedReqVO updateReqVO) {
conversationService.updateConversationPinnedByAdmin(updateReqVO); conversationService.updateConversationPinnedByAdmin(updateReqVO);

View File

@ -27,9 +27,11 @@ public interface KeFuMessageMapper extends BaseMapperX<KeFuMessageDO> {
.orderByDesc(KeFuMessageDO::getCreateTime)); .orderByDesc(KeFuMessageDO::getCreateTime));
} }
default List<KeFuMessageDO> selectListByConversationIdAndReadStatus(Long conversationId, Boolean readStatus) { default List<KeFuMessageDO> selectListByConversationIdAndUserTypeAndReadStatus(Long conversationId, Integer userType,
Boolean readStatus) {
return selectList(new LambdaQueryWrapper<KeFuMessageDO>() return selectList(new LambdaQueryWrapper<KeFuMessageDO>()
.eq(KeFuMessageDO::getConversationId, conversationId) .eq(KeFuMessageDO::getConversationId, conversationId)
.ne(KeFuMessageDO::getSenderType, userType) // 管理员查询出未读的会员消息会员查询出未读的客服消息
.eq(KeFuMessageDO::getReadStatus, readStatus)); .eq(KeFuMessageDO::getReadStatus, readStatus));
} }
@ -38,7 +40,7 @@ public interface KeFuMessageMapper extends BaseMapperX<KeFuMessageDO> {
.in(KeFuMessageDO::getId, ids)); .in(KeFuMessageDO::getId, ids));
} }
default PageResult<KeFuMessageDO> selectPage(AppKeFuMessagePageReqVO pageReqVO){ default PageResult<KeFuMessageDO> selectPage(AppKeFuMessagePageReqVO pageReqVO) {
return selectPage(pageReqVO, new LambdaQueryWrapperX<KeFuMessageDO>() return selectPage(pageReqVO, new LambdaQueryWrapperX<KeFuMessageDO>()
.eqIfPresent(KeFuMessageDO::getConversationId, pageReqVO.getConversationId()) .eqIfPresent(KeFuMessageDO::getConversationId, pageReqVO.getConversationId())
.orderByDesc(KeFuMessageDO::getCreateTime)); .orderByDesc(KeFuMessageDO::getCreateTime));

View File

@ -41,6 +41,10 @@ public class KeFuConversationServiceImpl implements KeFuConversationService {
@Override @Override
public void updateConversationPinnedByAdmin(KeFuConversationUpdatePinnedReqVO updateReqVO) { public void updateConversationPinnedByAdmin(KeFuConversationUpdatePinnedReqVO updateReqVO) {
// 校验存在
validateKefuConversationExists(updateReqVO.getId());
// 更新管理员会话置顶状态
conversationMapper.updateById(new KeFuConversationDO().setId(updateReqVO.getId()).setAdminPinned(updateReqVO.getAdminPinned())); conversationMapper.updateById(new KeFuConversationDO().setId(updateReqVO.getId()).setAdminPinned(updateReqVO.getAdminPinned()));
} }

View File

@ -67,7 +67,7 @@ public class KeFuMessageServiceImpl implements KeFuMessageService {
conversationService.updateConversationLastMessage(kefuMessage); conversationService.updateConversationLastMessage(kefuMessage);
// 3. 发送消息 // 3. 发送消息
getSelf().sendAsyncMessage(UserTypeEnum.MEMBER.getValue(), conversation.getUserId(), kefuMessage); getSelf().sendAsyncMessageToMember(conversation.getUserId(), KEFU_MESSAGE_TYPE, kefuMessage);
return kefuMessage.getId(); return kefuMessage.getId();
} }
@ -83,7 +83,7 @@ public class KeFuMessageServiceImpl implements KeFuMessageService {
// 2. 更新会话消息冗余 // 2. 更新会话消息冗余
conversationService.updateConversationLastMessage(kefuMessage); conversationService.updateConversationLastMessage(kefuMessage);
// 3. 发送消息 // 3. 发送消息
getSelf().sendAsyncMessageToAdmin(kefuMessage); getSelf().sendAsyncMessageToAdmin(KEFU_MESSAGE_TYPE, kefuMessage);
return kefuMessage.getId(); return kefuMessage.getId();
} }
@ -97,7 +97,7 @@ public class KeFuMessageServiceImpl implements KeFuMessageService {
throw exception(KEFU_CONVERSATION_NOT_EXISTS); throw exception(KEFU_CONVERSATION_NOT_EXISTS);
} }
// 1.3 查询会话所有的未读消息 (tips: 多个客服一个人点了就都点了) // 1.3 查询会话所有的未读消息 (tips: 多个客服一个人点了就都点了)
List<KeFuMessageDO> messageList = keFuMessageMapper.selectListByConversationIdAndReadStatus(conversationId, Boolean.FALSE); List<KeFuMessageDO> messageList = keFuMessageMapper.selectListByConversationIdAndUserTypeAndReadStatus(conversationId, userType, Boolean.FALSE);
if (CollUtil.isEmpty(messageList)) { if (CollUtil.isEmpty(messageList)) {
return; return;
} }
@ -109,10 +109,11 @@ public class KeFuMessageServiceImpl implements KeFuMessageService {
conversationService.updateAdminUnreadMessageCountToZero(conversationId); conversationService.updateAdminUnreadMessageCountToZero(conversationId);
// 2.3 发送消息通知会员管理员已读 -> 会员更新发送的消息状态 // 2.3 发送消息通知会员管理员已读 -> 会员更新发送的消息状态
// TODO @puhui999待定~
KeFuMessageDO keFuMessage = getFirst(filterList(messageList, message -> UserTypeEnum.MEMBER.getValue().equals(message.getSenderType()))); KeFuMessageDO keFuMessage = getFirst(filterList(messageList, message -> UserTypeEnum.MEMBER.getValue().equals(message.getSenderType())));
assert keFuMessage != null; // 断言避免警告 assert keFuMessage != null; // 断言避免警告
webSocketSenderApi.sendObject(UserTypeEnum.MEMBER.getValue(), keFuMessage.getSenderId(), KEFU_MESSAGE_ADMIN_READ, StrUtil.EMPTY); getSelf().sendAsyncMessageToMember(keFuMessage.getSenderId(), KEFU_MESSAGE_ADMIN_READ, StrUtil.EMPTY);
// 2.4 通知所有管理员消息已读
getSelf().sendAsyncMessageToAdmin(KEFU_MESSAGE_ADMIN_READ, StrUtil.EMPTY);
} }
private void validateReceiverExist(Long receiverId, Integer receiverType) { private void validateReceiverExist(Long receiverId, Integer receiverType) {
@ -125,13 +126,13 @@ public class KeFuMessageServiceImpl implements KeFuMessageService {
} }
@Async @Async
public void sendAsyncMessage(Integer userType, Long userId, Object content) { public void sendAsyncMessageToMember(Long userId, String messageType, Object content) {
webSocketSenderApi.sendObject(userType, userId, KEFU_MESSAGE_TYPE, content); webSocketSenderApi.sendObject(UserTypeEnum.MEMBER.getValue(), userId, messageType, content);
} }
@Async @Async
public void sendAsyncMessageToAdmin(Object content) { public void sendAsyncMessageToAdmin(String messageType, Object content) {
webSocketSenderApi.sendObject(UserTypeEnum.ADMIN.getValue(), KEFU_MESSAGE_TYPE, content); webSocketSenderApi.sendObject(UserTypeEnum.ADMIN.getValue(), messageType, content);
} }
@Override @Override