makefriends/dating
2
1
Fork 1
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

完成消息撤回功能

Browse Source
This commit is contained in:
KilLze
2026-01-08 01:20:11 +08:00
parent 0a17eb8deb
commit cf6f9b8b7c
7 changed files with 166 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/main/java/com/bao/dating/controller/websocket/ChatWebSocketHandler.java
View File

@@ -1,11 +1,13 @@
package com.bao.dating.controller.websocket;
import com.bao.dating.message.WsMessage;
import com.bao.dating.pojo.dto.ChatRecallDTO;
import com.bao.dating.pojo.dto.ChatRecordSendDTO;
import com.bao.dating.pojo.vo.ChatRecordsVO;
import com.bao.dating.service.ChatService;
import com.bao.dating.session.WsSessionManager;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -57,14 +59,23 @@ public class ChatWebSocketHandler extends TextWebSocketHandler {
log.error("WebSocket session 中未找到 userId");
return;
}
// 解析消息
WsMessage<ChatRecordSendDTO> wsMessage =
objectMapper.readValue(message.getPayload(),
new TypeReference<WsMessage<ChatRecordSendDTO>>(){});
// 处理私聊消息
if ("chat".equals(wsMessage.getType())) {
handlePrivateChat(session, senderUserId, wsMessage.getData());
JsonNode node = objectMapper.readTree(message.getPayload());
String type = node.get("type").asText();
// 根据消息类型解析消息
WsMessage wsMessage = objectMapper.readValue(message.getPayload(), WsMessage.class);
// 先获取消息类型，再根据类型进行相应处理和转换
if ("chat".equals(type)) {
// 处理私聊消息
WsMessage<ChatRecordSendDTO> chatWsMessage =
objectMapper.convertValue(node, new TypeReference<WsMessage<ChatRecordSendDTO>>(){});
handlePrivateChat(session, senderUserId, chatWsMessage.getData());
} else if ("recall".equals(type)) {
// 处理撤回消息
WsMessage<ChatRecallDTO> recallWsMessage =
objectMapper.convertValue(node, new TypeReference<WsMessage<ChatRecallDTO>>(){});
handleRecallMessage(session, senderUserId, recallWsMessage.getData());
}
}
@@ -79,6 +90,7 @@ public class ChatWebSocketHandler extends TextWebSocketHandler {
WsMessage<String> errorMsg = new WsMessage<>();
errorMsg.setType("error");
errorMsg.setData("会话已删除，无法发送消息");
// 返回错误信息
session.sendMessage(new TextMessage(objectMapper.writeValueAsString(errorMsg)));
return;
}
@@ -97,6 +109,46 @@ public class ChatWebSocketHandler extends TextWebSocketHandler {
}
}
/**
* 消息撤回处理
*/
private void handleRecallMessage(WebSocketSession session, Long senderUserId, Object data) throws Exception {
// 转 DTO
ChatRecallDTO dto = objectMapper.convertValue(data, ChatRecallDTO.class);
// 撤回逻辑
boolean success = chatService.recallMessage(senderUserId, dto.getChatId());
// 如果返回false，说明消息撤回失败
if (!success) {
WsMessage<String> errorMsg = new WsMessage<>();
errorMsg.setType("error");
errorMsg.setData("撤回失败，消息可能无法撤回或不存在");
// 返回错误信息
session.sendMessage(new TextMessage(objectMapper.writeValueAsString(errorMsg)));
return;
}
// 创建撤回通知消息
WsMessage<ChatRecallDTO> pushMsg = new WsMessage<>();
pushMsg.setType("recall");
pushMsg.setData(dto);
// 通知自己
if (session.isOpen()) {
session.sendMessage(new TextMessage(objectMapper.writeValueAsString(pushMsg)));
}
// 通知对方
WebSocketSession receiverSession =
sessionManager.getSession(dto.getReceiverUserId());
if (receiverSession != null && receiverSession.isOpen()) {
receiverSession.sendMessage(new TextMessage(objectMapper.writeValueAsString(pushMsg))
);
}
}
/**
* 用户断开连接（下线）

16
src/main/java/com/bao/dating/mapper/ChatRecordsMapper.java
View File

@@ -32,4 +32,20 @@ public interface ChatRecordsMapper {
* @return 影响行数
*/
int markMessagesAsRead(ChatMarkReadDTO markReadDTO);
/**
* 根据ID查询聊天记录
* @param chatId 聊天记录ID
* @return 聊天记录
*/
ChatRecords selectById(@Param("chatId") Long chatId);
/**
* 撤回聊天记录
* @param chatId 聊天记录ID
* @param senderUserId 发送者ID
* @return 影响行数
*/
int recallMessage(@Param("chatId") Long chatId,
@Param("senderUserId") Long senderUserId);
}

13
src/main/java/com/bao/dating/pojo/dto/ChatRecallDTO.java Normal file
View File

@@ -0,0 +1,13 @@
package com.bao.dating.pojo.dto;
import lombok.Data;
/**
* 聊天记录撤回参数
* @author lenovo
*/
@Data
public class ChatRecallDTO {
private Long chatId;
private Long receiverUserId;
}

8
src/main/java/com/bao/dating/service/ChatService.java
View File

@@ -71,4 +71,12 @@ public interface ChatService {
* @param dto 免打扰参数
*/
void updateMuteStatus(Long userId, ChatSessionMuteDTO dto);
/**
* 撤回消息
* @param senderUserId 发送方ID
* @param chatId 聊天记录ID
* @return 撤回结果
*/
boolean recallMessage(Long senderUserId, Long chatId);
}

45
src/main/java/com/bao/dating/service/impl/ChatServiceImpl.java
View File

@@ -21,6 +21,7 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.time.Duration;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
@@ -193,6 +194,9 @@ public class ChatServiceImpl implements ChatService {
}).collect(Collectors.toList());
}
/**
* 标记聊天消息为已读
*/
@Override
@Transactional(rollbackFor = Exception.class)
public void markChatMessagesAsRead(Long currentUserId, Long targetUserId) {
@@ -277,4 +281,45 @@ public class ChatServiceImpl implements ChatService {
dto.getMuteStatus()
);
}
/**
* 撤回消息
* @param senderUserId 发送者用户ID
* @param chatId 聊天记录ID
* @return 是否成功
*/
@Override
@Transactional(rollbackFor = Exception.class)
public boolean recallMessage(Long senderUserId, Long chatId) {
// 查询聊天记录
ChatRecords record = chatRecordsMapper.selectById(chatId);
// 消息不存在
if (record == null) {
log.info("消息不存在，chatId: {}", chatId);
return false;
}
// 只能撤回自己发的
if (!record.getSenderUserId().equals(senderUserId)) {
log.info("不能撤回别人发的消息，chatId: {}，当前用户: {}，消息发送者: {}", chatId, senderUserId, record.getSenderUserId());
return false;
}
// 已撤回或已删除
if (record.getMessageStatus() != 1) {
log.info("消息已撤回或已删除，chatId: {}，当前状态: {}", chatId, record.getMessageStatus());
return false;
}
// 时间限制（2 分钟）
Duration duration = Duration.between(record.getSendTime(), LocalDateTime.now());
if (duration.toMinutes() > 2) {
log.info("消息已超过 2 分钟，不能撤回，chatId: {}，发送时间: {}", chatId, record.getSendTime());
return false;
}
return chatRecordsMapper.recallMessage(chatId, senderUserId) > 0;
}
}

25
src/main/resources/com/bao/dating/mapper/ChatRecordsMapper.xml
View File

@@ -64,4 +64,29 @@
AND read_status = 0
AND message_status = 1
</update>
<!-- 根据ID查询聊天记录 -->
<select id="selectById" resultType="com.bao.dating.pojo.entity.ChatRecords">
SELECT
chat_id,
sender_user_id,
receiver_user_id,
send_time,
message_status
FROM chat_records
WHERE chat_id = #{chatId}
</select>
<!-- 撤回消息 -->
<update id="recallMessage">
UPDATE chat_records
SET
message_status = 2,
updated_at = NOW()
WHERE
chat_id = #{chatId}
AND sender_user_id = #{senderUserId}
AND message_status = 1
</update>
</mapper>

1
src/main/resources/com/bao/dating/mapper/ChatSessionsMapper.xml
View File

@@ -57,7 +57,6 @@
last_message_time, unread_count, top_status, mute_status
FROM chat_sessions
WHERE user_id = #{userId}
AND session_status = 1
AND session_status in (1,2)
ORDER BY top_status DESC, last_message_time DESC
</select>