Skip to content

A
ask_data_ai_admin
Commit 550d9a7d authored by 林洋洋's avatar 林洋洋
Browse files
Options

修复NULL指针

parent 13684eee
Show whitespace changes
Inline Side-by-side
Showing with 35 additions and 20 deletions
ask-data-ai/ask-data-ai-biz/src/main/java/com/ask/controller/ChatController.java
View file @ 550d9a7d
...@@ -124,12 +124,16 @@ public class ChatController { ...@@ -124,12 +124,16 @@ public class ChatController {
.stream() .stream()
.chatResponse() .chatResponse()
.map(response -> { .map(response -> {
AssistantMessage assistantMessage = response.getResult().getOutput();
ChatResult result = new ChatResult(); ChatResult result = new ChatResult();
if (response.getResult() != null && response.getResult().getOutput() != null) {
AssistantMessage assistantMessage = response.getResult().getOutput();
if (assistantMessage instanceof DeepSeekAssistantMessage) { if (assistantMessage instanceof DeepSeekAssistantMessage) {
result.setReasoningContent(((DeepSeekAssistantMessage) assistantMessage).getReasoningContent()); result.setReasoningContent(((DeepSeekAssistantMessage) assistantMessage).getReasoningContent());
} }
result.setMessage(assistantMessage.getText()); result.setMessage(assistantMessage.getText());
} else {
result.setMessage(""); // 设置为空字符串避免null
}
return result; return result;
}); });
...@@ -177,8 +181,9 @@ public class ChatController { ...@@ -177,8 +181,9 @@ public class ChatController {
.stream() .stream()
.chatResponse() .chatResponse()
.map(response -> { .map(response -> {
AssistantMessage assistantMessage = response.getResult().getOutput();
ChatResult result = new ChatResult(); ChatResult result = new ChatResult();
if (response.getResult() != null && response.getResult().getOutput() != null) {
AssistantMessage assistantMessage = response.getResult().getOutput();
if (assistantMessage instanceof DeepSeekAssistantMessage) { if (assistantMessage instanceof DeepSeekAssistantMessage) {
result.setReasoningContent(((DeepSeekAssistantMessage) assistantMessage).getReasoningContent()); result.setReasoningContent(((DeepSeekAssistantMessage) assistantMessage).getReasoningContent());
} }
...@@ -186,6 +191,9 @@ public class ChatController { ...@@ -186,6 +191,9 @@ public class ChatController {
if (StringUtils.isNotBlank(assistantMessage.getText())) { if (StringUtils.isNotBlank(assistantMessage.getText())) {
contentBuilder.append(assistantMessage.getText()); contentBuilder.append(assistantMessage.getText());
} }
} else {
result.setMessage(""); // 设置为空字符串避免null
}
return result; return result;
}) })
.concatWith(Mono.fromSupplier(() -> { .concatWith(Mono.fromSupplier(() -> {
...@@ -216,16 +224,19 @@ public class ChatController { ...@@ -216,16 +224,19 @@ public class ChatController {
.advisors(messageChatMemoryAdvisor) .advisors(messageChatMemoryAdvisor)
.advisors(a -> a.param(ChatMemory.CONVERSATION_ID, conversationId)) .advisors(a -> a.param(ChatMemory.CONVERSATION_ID, conversationId))
.tools(excelTools) .tools(excelTools)
.advisors()
.stream() .stream()
.chatResponse() .chatResponse()
.map(response -> { .map(response -> {
AssistantMessage assistantMessage = response.getResult().getOutput();
ChatResult result = new ChatResult(); ChatResult result = new ChatResult();
if (response.getResult() != null && response.getResult().getOutput() != null) {
AssistantMessage assistantMessage = response.getResult().getOutput();
if (assistantMessage instanceof DeepSeekAssistantMessage) { if (assistantMessage instanceof DeepSeekAssistantMessage) {
result.setReasoningContent(((DeepSeekAssistantMessage) assistantMessage).getReasoningContent()); result.setReasoningContent(((DeepSeekAssistantMessage) assistantMessage).getReasoningContent());
} }
result.setMessage(assistantMessage.getText()); result.setMessage(assistantMessage.getText());
} else {
result.setMessage(""); // 设置为空字符串避免null
}
return result; return result;
}); });
...@@ -271,12 +282,16 @@ public class ChatController { ...@@ -271,12 +282,16 @@ public class ChatController {
.stream() .stream()
.chatResponse() .chatResponse()
.map(response -> { .map(response -> {
AssistantMessage assistantMessage = response.getResult().getOutput();
ChatResult result = new ChatResult(); ChatResult result = new ChatResult();
if (response.getResult() != null && response.getResult().getOutput() != null) {
AssistantMessage assistantMessage = response.getResult().getOutput();
if (assistantMessage instanceof DeepSeekAssistantMessage) { if (assistantMessage instanceof DeepSeekAssistantMessage) {
result.setReasoningContent(((DeepSeekAssistantMessage) assistantMessage).getReasoningContent()); result.setReasoningContent(((DeepSeekAssistantMessage) assistantMessage).getReasoningContent());
} }
result.setMessage(assistantMessage.getText()); result.setMessage(assistantMessage.getText());
} else {
result.setMessage(""); // 设置为空字符串避免null
}
return result; 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