Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
ask_data_ai_admin
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linyangyang
ask_data_ai_admin
Commits
550d9a7d
Commit
550d9a7d
authored
Jul 31, 2025
by
林洋洋
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复NULL指针
parent
13684eee
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
35 additions
and
20 deletions
+35
-20
ChatController.java
...-biz/src/main/java/com/ask/controller/ChatController.java
+35
-20
No files found.
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 {
.
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
;
});
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment