|
@@ -12,6 +12,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
|
|
import com.usky.ai.mapper.AiQuestionMapper;
|
|
import com.usky.ai.mapper.AiQuestionMapper;
|
|
import com.usky.ai.mapper.AiSessionMapper;
|
|
import com.usky.ai.mapper.AiSessionMapper;
|
|
import com.usky.ai.service.AiQuestion;
|
|
import com.usky.ai.service.AiQuestion;
|
|
|
|
+import com.usky.ai.service.AiQuestionItem;
|
|
import com.usky.ai.service.AiSession;
|
|
import com.usky.ai.service.AiSession;
|
|
import com.usky.ai.service.vo.AiStreamOutputVO;
|
|
import com.usky.ai.service.vo.AiStreamOutputVO;
|
|
import com.usky.common.core.bean.ApiResult;
|
|
import com.usky.common.core.bean.ApiResult;
|
|
@@ -96,7 +97,7 @@ public class AiChatController {
|
|
aiSessionMapper.save(aiSession);
|
|
aiSessionMapper.save(aiSession);
|
|
}
|
|
}
|
|
|
|
|
|
- // 构建消息列表,仅包含角色定义和用户新消息
|
|
|
|
|
|
+ // 构建消息列表,包含角色定义、历史对话记录和用户新消息
|
|
List<Message> messages = new ArrayList<>();
|
|
List<Message> messages = new ArrayList<>();
|
|
|
|
|
|
// 插入角色定义(在对话历史的开头)
|
|
// 插入角色定义(在对话历史的开头)
|
|
@@ -106,6 +107,44 @@ public class AiChatController {
|
|
.build();
|
|
.build();
|
|
messages.add(roleDefinition); // 将角色定义插入到对话历史的开头
|
|
messages.add(roleDefinition); // 将角色定义插入到对话历史的开头
|
|
|
|
|
|
|
|
+ // 从数据库中获取历史对话记录
|
|
|
|
+ List<AiQuestion> questions = aiQuestionMapper.findQuestionsBySessionId(sessionId);
|
|
|
|
+
|
|
|
|
+ // 如果历史记录超过限制,则只取最近的记录
|
|
|
|
+ if (questions.size() > Limit) {
|
|
|
|
+ questions = questions.subList(questions.size() - Limit, questions.size());
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ // 将历史对话记录转换为 AiQuestionItem 列表
|
|
|
|
+ List<AiQuestionItem> itemList = new ArrayList<>();
|
|
|
|
+ for (AiQuestion question : questions) {
|
|
|
|
+ AiQuestionItem userItem = new AiQuestionItem("user", question.getQuestion());
|
|
|
|
+ userItem.setId(question.getId());
|
|
|
|
+ userItem.setSessionId(question.getSessionId());
|
|
|
|
+ userItem.setUserId(question.getUserId());
|
|
|
|
+ userItem.setUserName(question.getUserName());
|
|
|
|
+ userItem.setAskTime(question.getAskTime());
|
|
|
|
+
|
|
|
|
+ AiQuestionItem assistantItem = new AiQuestionItem("assistant", question.getAnswer());
|
|
|
|
+ assistantItem.setId(question.getId());
|
|
|
|
+ assistantItem.setSessionId(question.getSessionId());
|
|
|
|
+ assistantItem.setUserId(question.getUserId());
|
|
|
|
+ assistantItem.setUserName(question.getUserName());
|
|
|
|
+ assistantItem.setAskTime(question.getAskTime());
|
|
|
|
+
|
|
|
|
+ itemList.add(userItem);
|
|
|
|
+ itemList.add(assistantItem);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ // 将 AiQuestionItem 列表转换为消息列表
|
|
|
|
+ for (AiQuestionItem item : itemList) {
|
|
|
|
+ Message message = Message.builder()
|
|
|
|
+ .role(item.getRole().equals("user") ? Role.USER.getValue() : Role.ASSISTANT.getValue())
|
|
|
|
+ .content(item.getContent() != null ? item.getContent() : item.getReasoningContent())
|
|
|
|
+ .build();
|
|
|
|
+ messages.add(message);
|
|
|
|
+ }
|
|
|
|
+
|
|
// 添加用户的新消息
|
|
// 添加用户的新消息
|
|
Message userMessage = Message.builder()
|
|
Message userMessage = Message.builder()
|
|
.role(Role.USER.getValue())
|
|
.role(Role.USER.getValue())
|