Commit 550d9a7d authored by 林洋洋's avatar 林洋洋

修复NULL指针

parent 13684eee
......@@ -124,12 +124,16 @@ public class ChatController {
.stream()
.chatResponse()
.map(response -> {
AssistantMessage assistantMessage = response.getResult().getOutput();
ChatResult result = new ChatResult();
if (assistantMessage instanceof DeepSeekAssistantMessage) {
result.setReasoningContent(((DeepSeekAssistantMessage) assistantMessage).getReasoningContent());
if (response.getResult() != null && response.getResult().getOutput() != null) {
AssistantMessage assistantMessage = response.getResult().getOutput();
if (assistantMessage instanceof DeepSeekAssistantMessage) {
result.setReasoningContent(((DeepSeekAssistantMessage) assistantMessage).getReasoningContent());
}
result.setMessage(assistantMessage.getText());
} else {
result.setMessage(""); // 设置为空字符串避免null
}
result.setMessage(assistantMessage.getText());
return result;
});
......@@ -177,14 +181,18 @@ public class ChatController {
.stream()
.chatResponse()
.map(response -> {
AssistantMessage assistantMessage = response.getResult().getOutput();
ChatResult result = new ChatResult();
if (assistantMessage instanceof DeepSeekAssistantMessage) {
result.setReasoningContent(((DeepSeekAssistantMessage) assistantMessage).getReasoningContent());
}
result.setMessage(assistantMessage.getText());
if (StringUtils.isNotBlank(assistantMessage.getText())) {
contentBuilder.append(assistantMessage.getText());
if (response.getResult() != null && response.getResult().getOutput() != null) {
AssistantMessage assistantMessage = response.getResult().getOutput();
if (assistantMessage instanceof DeepSeekAssistantMessage) {
result.setReasoningContent(((DeepSeekAssistantMessage) assistantMessage).getReasoningContent());
}
result.setMessage(assistantMessage.getText());
if (StringUtils.isNotBlank(assistantMessage.getText())) {
contentBuilder.append(assistantMessage.getText());
}
} else {
result.setMessage(""); // 设置为空字符串避免null
}
return result;
})
......@@ -216,16 +224,19 @@ public class ChatController {
.advisors(messageChatMemoryAdvisor)
.advisors(a -> a.param(ChatMemory.CONVERSATION_ID, conversationId))
.tools(excelTools)
.advisors()
.stream()
.chatResponse()
.map(response -> {
AssistantMessage assistantMessage = response.getResult().getOutput();
ChatResult result = new ChatResult();
if (assistantMessage instanceof DeepSeekAssistantMessage) {
result.setReasoningContent(((DeepSeekAssistantMessage) assistantMessage).getReasoningContent());
if (response.getResult() != null && response.getResult().getOutput() != null) {
AssistantMessage assistantMessage = response.getResult().getOutput();
if (assistantMessage instanceof DeepSeekAssistantMessage) {
result.setReasoningContent(((DeepSeekAssistantMessage) assistantMessage).getReasoningContent());
}
result.setMessage(assistantMessage.getText());
} else {
result.setMessage(""); // 设置为空字符串避免null
}
result.setMessage(assistantMessage.getText());
return result;
});
......@@ -271,12 +282,16 @@ public class ChatController {
.stream()
.chatResponse()
.map(response -> {
AssistantMessage assistantMessage = response.getResult().getOutput();
ChatResult result = new ChatResult();
if (assistantMessage instanceof DeepSeekAssistantMessage) {
result.setReasoningContent(((DeepSeekAssistantMessage) assistantMessage).getReasoningContent());
if (response.getResult() != null && response.getResult().getOutput() != null) {
AssistantMessage assistantMessage = response.getResult().getOutput();
if (assistantMessage instanceof DeepSeekAssistantMessage) {
result.setReasoningContent(((DeepSeekAssistantMessage) assistantMessage).getReasoningContent());
}
result.setMessage(assistantMessage.getText());
} else {
result.setMessage(""); // 设置为空字符串避免null
}
result.setMessage(assistantMessage.getText());
return result;
});
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment