|
@@ -302,8 +302,11 @@ public class AiChatMessageServiceImpl implements AiChatMessageService {
|
|
userId, conversation.getRoleId(), MessageType.ASSISTANT, kcb, sendReqVO.getUseContext(),
|
|
userId, conversation.getRoleId(), MessageType.ASSISTANT, kcb, sendReqVO.getUseContext(),
|
|
knowledgeSegments, sendReqVO.getContentType(), sendReqVO.getStateId());
|
|
knowledgeSegments, sendReqVO.getContentType(), sendReqVO.getStateId());
|
|
|
|
|
|
- if (StrUtil.isBlank(conversation.getDifyConversationId())) {
|
|
|
|
- result.setReceive(BeanUtils.toBean(assistantMessage, AiChatMessageSendRespVO.Message.class));
|
|
|
|
|
|
+ if (StrUtil.isBlank(conversation.getDifyConversationId()) && StrUtil.equals(conversation.getDifyConversationId(), "0")) {
|
|
|
|
+ AiChatMessageSendRespVO.Message rs = BeanUtils.toBean(assistantMessage,
|
|
|
|
+ AiChatMessageSendRespVO.Message.class);
|
|
|
|
+ rs.setDifyConversationId("0");
|
|
|
|
+ result.setReceive(rs);
|
|
return Flux.just(success(result))
|
|
return Flux.just(success(result))
|
|
;
|
|
;
|
|
}
|
|
}
|
|
@@ -317,6 +320,7 @@ public class AiChatMessageServiceImpl implements AiChatMessageService {
|
|
AiChatMessageSendRespVO.Message receive = BeanUtils.toBean(assistantMessage,
|
|
AiChatMessageSendRespVO.Message receive = BeanUtils.toBean(assistantMessage,
|
|
AiChatMessageSendRespVO.Message.class);
|
|
AiChatMessageSendRespVO.Message.class);
|
|
receive.setEvent(chunk.getEvent());
|
|
receive.setEvent(chunk.getEvent());
|
|
|
|
+ receive.setDifyConversationId(difyId.toString());
|
|
result.setReceive(receive);
|
|
result.setReceive(receive);
|
|
// 响应结果
|
|
// 响应结果
|
|
return success(result);
|
|
return success(result);
|