From 21c390c4d68f51d64556c47473713530a2efff61 Mon Sep 17 00:00:00 2001 From: keke <994305335@qq.com> Date: Sat, 2 Aug 2025 13:18:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A1.=E5=9C=A8=E4=BD=BF?= =?UTF-8?q?=E7=94=A8dify=E7=9A=84=E6=97=B6=E5=80=99,=E5=8F=91=E9=80=811+1?= =?UTF-8?q?=3D=EF=BC=9F=E6=A8=A1=E5=9E=8B=E8=BF=94=E5=9B=9E2=EF=BC=8C?= =?UTF-8?q?=E4=BD=86=E6=98=AF=E7=AC=AC=E4=BA=8C=E6=AC=A1=E9=97=AE=E4=BB=96?= =?UTF-8?q?=E4=B8=BA=E4=BB=80=E4=B9=88=E7=AD=89=E4=BA=8E2=E7=9A=84?= =?UTF-8?q?=E6=97=B6=E5=80=99=EF=BC=8C=E6=A8=A1=E5=9E=8B=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=B8=8A=E4=B8=8B=E6=96=87=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=EF=BC=8C=E7=BB=8F=E8=BF=87=E6=8E=92=E6=9F=A5=EF=BC=8C=E5=8F=91?= =?UTF-8?q?=E7=8E=B0=E7=BC=BA=E5=B0=91conversationId=EF=BC=8Csession?= =?UTF-8?q?=E8=A1=A8=E9=9C=80=E8=A6=81=E6=B7=BB=E5=8A=A0conversationId?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=202.=E5=9C=A8=E4=BD=BF=E7=94=A8dify=E7=9A=84?= =?UTF-8?q?=E6=97=B6=E5=80=99message=E8=A1=A8=E4=B8=AD=E5=B9=B6=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=AD=98=E5=82=A8=E6=A8=A1=E5=9E=8B=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E7=9A=84=E6=B6=88=E6=81=AF=EF=BC=8C=E5=B9=B6=E4=B8=94=E6=89=A3?= =?UTF-8?q?=E9=99=A4=E8=B4=B9=E7=94=A8=E3=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/ruoyi/domain/ChatSession.java | 6 ++- .../org/ruoyi/domain/bo/ChatSessionBo.java | 6 ++- .../org/ruoyi/domain/vo/ChatSessionVo.java | 5 +++ .../service/chat/impl/DifyServiceImpl.java | 43 +++++++++++++++++++ 4 files changed, 58 insertions(+), 2 deletions(-) diff --git a/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/ChatSession.java b/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/ChatSession.java index aa8967a2..5b37dbc5 100644 --- a/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/ChatSession.java +++ b/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/ChatSession.java @@ -1,5 +1,6 @@ package org.ruoyi.domain; +import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -47,6 +48,9 @@ public class ChatSession extends BaseEntity { * 备注 */ private String remark; - + /** + * 会话id + */ + private String conversationId; } diff --git a/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/bo/ChatSessionBo.java b/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/bo/ChatSessionBo.java index b47c11ce..d71b0b5f 100644 --- a/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/bo/ChatSessionBo.java +++ b/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/bo/ChatSessionBo.java @@ -1,5 +1,6 @@ package org.ruoyi.domain.bo; +import com.alibaba.excel.annotation.ExcelProperty; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotNull; import lombok.Data; @@ -44,6 +45,9 @@ public class ChatSessionBo extends BaseEntity { * 备注 */ private String remark; - + /** + * 会话id + */ + private String conversationId; } diff --git a/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/vo/ChatSessionVo.java b/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/vo/ChatSessionVo.java index fb41319a..9d142591 100644 --- a/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/vo/ChatSessionVo.java +++ b/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/vo/ChatSessionVo.java @@ -61,6 +61,11 @@ public class ChatSessionVo implements Serializable { @ExcelProperty(value = "创建时间") private String createTime; + /** + * 会话id + */ + @ExcelProperty(value = "会话id") + private String conversationId; } diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/chat/impl/DifyServiceImpl.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/chat/impl/DifyServiceImpl.java index d609ab98..d9092cc9 100644 --- a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/chat/impl/DifyServiceImpl.java +++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/chat/impl/DifyServiceImpl.java @@ -1,5 +1,6 @@ package org.ruoyi.chat.service.chat.impl; +import cn.hutool.core.util.StrUtil; import io.github.imfangs.dify.client.DifyClient; import io.github.imfangs.dify.client.DifyClientFactory; import io.github.imfangs.dify.client.callback.ChatStreamCallback; @@ -12,10 +13,15 @@ import io.github.imfangs.dify.client.model.chat.ChatMessage; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.ruoyi.chat.enums.ChatModeType; +import org.ruoyi.chat.service.chat.IChatCostService; import org.ruoyi.chat.service.chat.IChatService; +import org.ruoyi.common.chat.entity.chat.Message; import org.ruoyi.common.chat.request.ChatRequest; +import org.ruoyi.domain.bo.ChatSessionBo; import org.ruoyi.domain.vo.ChatModelVo; +import org.ruoyi.domain.vo.ChatSessionVo; import org.ruoyi.service.IChatModelService; +import org.ruoyi.service.IChatSessionService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.servlet.mvc.method.annotation.SseEmitter; @@ -31,6 +37,10 @@ public class DifyServiceImpl implements IChatService { @Autowired private IChatModelService chatModelService; + @Autowired + private IChatSessionService chatSessionService; + @Autowired + private IChatCostService chatCostService; @Override public SseEmitter chat(ChatRequest chatRequest, SseEmitter emitter) { @@ -53,6 +63,15 @@ public class DifyServiceImpl implements IChatService { .responseMode(ResponseMode.STREAMING) .build(); + // 获取conversationId + ChatSessionVo sessionInfo = chatSessionService.queryById(chatRequest.getSessionId()); + if (StrUtil.isNotBlank(sessionInfo.getConversationId())) { + message.setConversationId(sessionInfo.getConversationId()); + } + + // 获取模型返回的消息 + StringBuffer respMessage = new StringBuffer(); + // 发送流式消息 try { chatClient.sendChatMessageStream(message, new ChatStreamCallback() { @@ -60,6 +79,7 @@ public class DifyServiceImpl implements IChatService { @Override public void onMessage(MessageEvent event) { emitter.send(event.getAnswer()); + respMessage.append(event.getAnswer()); log.info("收到消息片段: {}", event.getAnswer()); } @@ -67,6 +87,29 @@ public class DifyServiceImpl implements IChatService { public void onMessageEnd(MessageEndEvent event) { emitter.complete(); log.info("消息结束，完整消息ID: {}", event.getMessageId()); + // 更新conversationId + if (StrUtil.isBlank(sessionInfo.getConversationId())) { + String conversationId = event.getConversationId(); + sessionInfo.setConversationId(conversationId); + // 更新conversationId + ChatSessionBo chatSessionBo = new ChatSessionBo(); + chatSessionBo.setConversationId(sessionInfo.getConversationId()); + chatSessionBo.setId(sessionInfo.getId()); + chatSessionBo.setUserId(sessionInfo.getUserId()); + chatSessionBo.setSessionTitle(sessionInfo.getSessionTitle()); + chatSessionBo.setSessionContent(sessionInfo.getSessionContent()); + chatSessionBo.setRemark(sessionInfo.getRemark()); + chatSessionService.updateByBo(chatSessionBo); + } + // 扣除费用 + ChatRequest chatRequestResponse = new ChatRequest(); + // 设置对话角色 + chatRequestResponse.setRole(Message.Role.ASSISTANT.getName()); + chatRequestResponse.setModel(chatRequest.getModel()); + chatRequestResponse.setUserId(chatRequest.getUserId()); + chatRequestResponse.setSessionId(chatRequest.getSessionId()); + chatRequestResponse.setPrompt(respMessage.toString()); + chatCostService.deductToken(chatRequestResponse); } @Override