聊天页bug修复

This commit is contained in:
2025-10-26 17:43:24 +08:00
parent 2e243c7671
commit accd1ae9da
4 changed files with 131 additions and 65 deletions
@@ -442,21 +442,12 @@ public class AiChatServiceImpl implements AiChatService {
// 调用Coze API(带messageId // 调用Coze API(带messageId
String aiReply = sendMessageWithMessageId(conversationId, messageId, message, userId); String aiReply = sendMessageWithMessageId(conversationId, messageId, message, userId);
// 注意:不保存用户消息,因为WebSocket处理器已经保存了 // 注意:不在这里保存AI回复消息
// 只保存AI回复 // WebSocket处理器会在sendAiReplyInParts中分割并保存每条消息
Message aiMessage = new Message(); // 这样可以确保分割后的消息都被正确保存到数据库
aiMessage.setId(snowflakeIdGenerator.nextIdAsString());
aiMessage.setConversationId(conversationId);
aiMessage.setCreateBy(userId); // 设置创建人为当前用户
aiMessage.setContent(aiReply);
aiMessage.setType("text");
aiMessage.setSender("ai");
aiMessage.setCozeRole("assistant");
aiMessage.setCozeContentType("text");
aiMessage = messageService.createMessage(aiMessage);
log.info("WebSocket聊天消息处理完成(带messageId: userMessageId={}, aiMessageId={}", log.info("WebSocket聊天消息处理完成(带messageId: userMessageId={}, aiReplyLength={}",
messageId, aiMessage.getId()); messageId, aiReply != null ? aiReply.length() : 0);
return aiReply; return aiReply;
@@ -10,6 +10,7 @@ import com.emotion.service.WebSocketService;
import com.emotion.service.AiChatService; import com.emotion.service.AiChatService;
import com.emotion.service.MessageService; import com.emotion.service.MessageService;
import com.emotion.service.ConversationService; import com.emotion.service.ConversationService;
import com.emotion.util.SnowflakeIdGenerator;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.messaging.simp.SimpMessagingTemplate; import org.springframework.messaging.simp.SimpMessagingTemplate;
@@ -43,6 +44,9 @@ public class WebSocketServiceImpl implements WebSocketService {
@Autowired @Autowired
private ConversationService conversationService; private ConversationService conversationService;
@Autowired
private SnowflakeIdGenerator snowflakeIdGenerator;
// 在线用户管理 // 在线用户管理
private final ConcurrentHashMap<String, String> onlineUsers = new ConcurrentHashMap<>(); private final ConcurrentHashMap<String, String> onlineUsers = new ConcurrentHashMap<>();
@@ -464,24 +468,46 @@ public class WebSocketServiceImpl implements WebSocketService {
* @param content 消息内容 * @param content 消息内容
*/ */
private void sendSingleAiMessage(String userId, String conversationId, String content) { private void sendSingleAiMessage(String userId, String conversationId, String content) {
// 构建AI回复消息 try {
WebSocketMessage aiMessage = WebSocketMessage.builder() // 保存AI消息到数据库
.messageId(UUID.randomUUID().toString()) Message aiMessage = new Message();
.conversationId(conversationId) aiMessage.setId(snowflakeIdGenerator.nextIdAsString());
.type("TEXT") aiMessage.setConversationId(conversationId);
.content(content) aiMessage.setUserId(userId);
.senderId("ai") aiMessage.setCreateBy("ai");
.senderType("AI") aiMessage.setContent(content);
.status("SENT") aiMessage.setType("text");
.createTime(LocalDateTime.now()) aiMessage.setSender("ai");
.build(); aiMessage.setCozeRole("assistant");
aiMessage.setCozeContentType("text");
aiMessage.setTimestamp(LocalDateTime.now());
messageService.createMessage(aiMessage);
// 发送给用户私有队列 log.info("AI消息已保存到数据库: messageId={}, conversationId={}, contentLength={}",
messagingTemplate.convertAndSendToUser(userId, "/queue/messages", aiMessage); aiMessage.getId(), conversationId, content.length());
// 发送到会话公共频道 // 构建WebSocket消息
if (conversationId != null) { WebSocketMessage wsMessage = WebSocketMessage.builder()
messagingTemplate.convertAndSend("/topic/conversation/" + conversationId, aiMessage); .messageId(aiMessage.getId())
.conversationId(conversationId)
.type("TEXT")
.content(content)
.senderId("ai")
.senderType("AI")
.status("SENT")
.createTime(LocalDateTime.now())
.build();
// 发送给用户私有队列
messagingTemplate.convertAndSendToUser(userId, "/queue/messages", wsMessage);
// 发送到会话公共频道
if (conversationId != null) {
messagingTemplate.convertAndSend("/topic/conversation/" + conversationId, wsMessage);
}
} catch (Exception e) {
log.error("发送单条AI消息失败: userId={}, conversationId={}", userId, conversationId, e);
sendErrorMessage(userId, "消息发送失败,请稍后重试");
} }
} }
+82 -27
View File
@@ -27,6 +27,12 @@ export interface ChatSession {
messageCount: number messageCount: number
} }
// 消息队列项
interface QueuedMessage {
message: ChatMessage
timestamp: number
}
export const useChatStore = defineStore('chat', () => { export const useChatStore = defineStore('chat', () => {
const authStore = useAuthStore() const authStore = useAuthStore()
@@ -39,6 +45,11 @@ export const useChatStore = defineStore('chat', () => {
const connectionStatus = ref<ConnectionStatus>('DISCONNECTED') const connectionStatus = ref<ConnectionStatus>('DISCONNECTED')
const wsConnected = ref(false) const wsConnected = ref(false)
// 消息队列和处理状态
const messageQueue = ref<QueuedMessage[]>([])
const isProcessingQueue = ref(false)
const queueProcessingInterval = ref<number | null>(null)
// 计算属性 // 计算属性
const currentMessages = computed(() => { const currentMessages = computed(() => {
if (!currentSession.value) return [] if (!currentSession.value) return []
@@ -48,7 +59,37 @@ export const useChatStore = defineStore('chat', () => {
) )
}) })
// 添加消息 // 处理消息队列 - 批量处理消息以避免竞态条件
const processMessageQueue = async () => {
if (isProcessingQueue.value || messageQueue.value.length === 0) {
return
}
isProcessingQueue.value = true
try {
// 一次性取出所有待处理消息
const batch = messageQueue.value.splice(0, messageQueue.value.length)
// 批量添加消息到数组
const newMessages = batch.map(item => item.message)
messages.value.push(...newMessages)
console.log(`✅ 消息队列处理完成,添加了 ${newMessages.length} 条消息,当前总数: ${messages.value.length}`)
} finally {
isProcessingQueue.value = false
}
}
// 将消息加入队列而不是直接添加
const queueMessage = (message: ChatMessage) => {
messageQueue.value.push({
message,
timestamp: Date.now()
})
console.log(`📝 消息已加入队列,队列长度: ${messageQueue.value.length}`)
}
// 添加消息 - 现在返回消息但不直接添加到数组
const addMessage = (message: Omit<ChatMessage, 'id' | 'timestamp'>) => { const addMessage = (message: Omit<ChatMessage, 'id' | 'timestamp'>) => {
const newMessage: ChatMessage = { const newMessage: ChatMessage = {
...message, ...message,
@@ -56,7 +97,8 @@ export const useChatStore = defineStore('chat', () => {
timestamp: new Date().toISOString(), timestamp: new Date().toISOString(),
status: message.type === 'user' ? 'sending' : 'sent' status: message.type === 'user' ? 'sending' : 'sent'
} }
messages.value.push(newMessage) // 将消息加入队列而不是直接添加
queueMessage(newMessage)
return newMessage return newMessage
} }
@@ -360,15 +402,10 @@ export const useChatStore = defineStore('chat', () => {
const timeA = parseTime(a.timestamp) const timeA = parseTime(a.timestamp)
const timeB = parseTime(b.timestamp) const timeB = parseTime(b.timestamp)
console.log('📝 排序比较:', {
a: { id: a.id.substring(0, 8), timestamp: a.timestamp, parsed: new Date(timeA).toLocaleString() },
b: { id: b.id.substring(0, 8), timestamp: b.timestamp, parsed: new Date(timeB).toLocaleString() },
result: timeA - timeB
})
return timeA - timeB return timeA - timeB
}) })
// 直接设置消息数组(初始加载时不使用队列)
messages.value = chatMessages messages.value = chatMessages
console.log('📝 最近消息已加载并排序,消息总数:', messages.value.length) console.log('📝 最近消息已加载并排序,消息总数:', messages.value.length)
@@ -380,42 +417,39 @@ export const useChatStore = defineStore('chat', () => {
} }
} }
// 添加AI回复消息(直接显示完整内容 // 添加AI回复消息(使用队列处理
const addAiReplyMessages = async (content: string) => { const addAiReplyMessages = async (content: string) => {
// 停止输入状态 // 停止输入状态
isTyping.value = false isTyping.value = false
// 使用 nextTick 确保 DOM 更新的顺序性,避免与定时同步并发 // 添加AI消息到队列
await nextTick()
// 直接添加完整的AI回复
const aiMessage = addMessage({ const aiMessage = addMessage({
content: content.trim(), content: content.trim(),
type: 'ai', type: 'ai',
conversationId: currentSession.value?.id conversationId: currentSession.value?.id
}) })
// 强制触发响应式更新 console.log('✅ AI消息已加入队列,消息ID:', aiMessage.id)
console.log('✅ AI消息已添加,当前消息总数:', messages.value.length)
console.log('📝 最新AI消息:', aiMessage) // 立即处理队列
console.log('📊 所有消息:', messages.value) await processMessageQueue()
} }
// WebSocket消息处理 // WebSocket消息处理 - 使用队列处理所有消息
let handleWebSocketMessage = async (wsMessage: WebSocketMessage) => { let handleWebSocketMessage = async (wsMessage: WebSocketMessage) => {
console.log('收到WebSocket消息:', wsMessage.type, wsMessage.senderType) console.log('收到WebSocket消息:', wsMessage.type, wsMessage.senderType)
switch (wsMessage.type) { switch (wsMessage.type) {
case 'TEXT': case 'TEXT':
if (wsMessage.senderType === 'AI') { if (wsMessage.senderType === 'AI') {
// AI回复消息 - 支持分段显示 // AI回复消息 - 加入队列处理
await addAiReplyMessages(wsMessage.content) await addAiReplyMessages(wsMessage.content)
} }
break break
case 'AI_THINKING': case 'AI_THINKING':
// AI正在思考 // AI正在思考 - 不修改响应式数据,避免竞态
isTyping.value = true console.log('⏳ AI正在思考中...')
break break
case 'CONNECTION': case 'CONNECTION':
@@ -424,22 +458,23 @@ export const useChatStore = defineStore('chat', () => {
break break
case 'ERROR': case 'ERROR':
// 错误消息 // 错误消息 - 加入队列处理
addMessage({ addMessage({
content: wsMessage.content, content: wsMessage.content,
type: 'ai', type: 'ai',
sessionId: currentSession.value?.id sessionId: currentSession.value?.id
}) })
isTyping.value = false await processMessageQueue()
break break
case 'SYSTEM': case 'SYSTEM':
// 系统消息 // 系统消息 - 加入队列处理
addMessage({ addMessage({
content: wsMessage.content, content: wsMessage.content,
type: 'ai', type: 'ai',
sessionId: currentSession.value?.id sessionId: currentSession.value?.id
}) })
await processMessageQueue()
break break
default: default:
@@ -466,6 +501,14 @@ export const useChatStore = defineStore('chat', () => {
wsConnected.value = true wsConnected.value = true
isConnected.value = true isConnected.value = true
// 启动消息队列处理器 - 每50ms处理一次队列
if (queueProcessingInterval.value === null) {
queueProcessingInterval.value = window.setInterval(() => {
processMessageQueue()
}, 50)
console.log('✅ 消息队列处理器已启动')
}
// 设置会话ID // 设置会话ID
if (currentSession.value?.id) { if (currentSession.value?.id) {
stompWebSocketService.setConversationId(currentSession.value.id) stompWebSocketService.setConversationId(currentSession.value.id)
@@ -475,13 +518,18 @@ export const useChatStore = defineStore('chat', () => {
console.log('WebSocket连接断开') console.log('WebSocket连接断开')
wsConnected.value = false wsConnected.value = false
isConnected.value = false isConnected.value = false
isTyping.value = false
// 停止消息队列处理器
if (queueProcessingInterval.value !== null) {
clearInterval(queueProcessingInterval.value)
queueProcessingInterval.value = null
console.log('✅ 消息队列处理器已停止')
}
}, },
onError: (error) => { onError: (error) => {
console.error('WebSocket错误:', error) console.error('WebSocket错误:', error)
wsConnected.value = false wsConnected.value = false
isConnected.value = false isConnected.value = false
isTyping.value = false
// 显示用户友好的错误信息 // 显示用户友好的错误信息
if (error.userMessage) { if (error.userMessage) {
@@ -490,6 +538,7 @@ export const useChatStore = defineStore('chat', () => {
type: 'ai', type: 'ai',
sessionId: currentSession.value?.id sessionId: currentSession.value?.id
}) })
processMessageQueue()
} }
}, },
onStatusChange: (status) => { onStatusChange: (status) => {
@@ -508,7 +557,13 @@ export const useChatStore = defineStore('chat', () => {
stompWebSocketService.disconnect() stompWebSocketService.disconnect()
wsConnected.value = false wsConnected.value = false
isConnected.value = false isConnected.value = false
isTyping.value = false
// 停止消息队列处理器
if (queueProcessingInterval.value !== null) {
clearInterval(queueProcessingInterval.value)
queueProcessingInterval.value = null
console.log('✅ 消息队列处理器已停止')
}
} }
// 初始化聊天 - 参考web项目的实现 // 初始化聊天 - 参考web项目的实现
+1 -7
View File
@@ -161,7 +161,7 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { ref, computed, onMounted, onUnmounted, nextTick, watch } from 'vue' import { ref, computed, onMounted, onUnmounted, nextTick } from 'vue'
import { useChatStore } from '@/stores/chat' import { useChatStore } from '@/stores/chat'
import { messageApi } from '@/services/message' import { messageApi } from '@/services/message'
import MessageService from '@/services/message' import MessageService from '@/services/message'
@@ -313,12 +313,6 @@ const sendMessage = async () => {
} }
} }
// 监听消息变化,自动滚动到底部
watch(() => messages.value.length, async () => {
await nextTick()
forceScrollToBottom()
})
// 调整文本框高度 // 调整文本框高度
const adjustTextareaHeight = () => { const adjustTextareaHeight = () => {
if (messageInput.value) { if (messageInput.value) {