From ff82084c84f588de78c294fcbe3cbfd006436371 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 25 Aug 2025 17:03:50 +0800
Subject: [PATCH] refactor(ai): 优化消息记录处理逻辑

---
 src/main/java/cc/mrbird/febs/ai/service/impl/AiServiceImpl.java |   42 +++++++++++++++++++++++-------------------
 1 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/ai/service/impl/AiServiceImpl.java b/src/main/java/cc/mrbird/febs/ai/service/impl/AiServiceImpl.java
index b059230..4d6fd3d 100644
--- a/src/main/java/cc/mrbird/febs/ai/service/impl/AiServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/ai/service/impl/AiServiceImpl.java
@@ -15,6 +15,7 @@
 import cc.mrbird.febs.ai.service.AiTalkItemService;
 import cc.mrbird.febs.common.entity.FebsResponse;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -425,31 +426,34 @@
     @Override
     public Flux<FebsResponse> answerStreamV2(AiTalkAnswerStream dto) {
         String question = dto.getQuestion();
-        //获取消息记录
-        List<AiTalkItem> aiTalkItems = aiTalkItemService.getListByTalkId(dto.getTalkId());
         log.info("----- standard request -----");
 
+
+        List<ChatMessage> messages = new ArrayList<>();
         final ChatMessage systemMessage = ChatMessage.builder()
                 .role(ChatMessageRole.SYSTEM)
                 .content("你是豆包,是由字节跳动开发的 AI 人工智能助手")
                 .build();
-
-        List<ChatMessage> messages = Arrays.asList(systemMessage);
-        if(CollUtil.isNotEmpty(aiTalkItems)){
-            for (AiTalkItem aiTalkItem : aiTalkItems){
-                if (aiTalkItem.getType() == 1){
-                    ChatMessage userMessage = ChatMessage.builder()
-                            .role(ChatMessageRole.USER)
-                            .content(aiTalkItem.getContext())
-                            .build();
-                    messages.add(userMessage);
-                }
-                if (aiTalkItem.getType() == 2){
-                    ChatMessage assistantMessage = ChatMessage.builder()
-                            .role(ChatMessageRole.ASSISTANT)
-                            .content(aiTalkItem.getContext())
-                            .build();
-                    messages.add(assistantMessage);
+        messages.add(systemMessage);
+        //获取消息记录
+        if (StrUtil.isNotEmpty(dto.getTalkId())){
+            List<AiTalkItem> aiTalkItems = aiTalkItemService.getListByTalkId(dto.getTalkId());
+            if(CollUtil.isNotEmpty(aiTalkItems)){
+                for (AiTalkItem aiTalkItem : aiTalkItems){
+                    if (aiTalkItem.getType() == 1){
+                        ChatMessage memberMessage = ChatMessage.builder()
+                                .role(ChatMessageRole.USER)
+                                .content(aiTalkItem.getContext())
+                                .build();
+                        messages.add(memberMessage);
+                    }
+                    if (aiTalkItem.getType() == 2){
+                        ChatMessage assistantMessage = ChatMessage.builder()
+                                .role(ChatMessageRole.ASSISTANT)
+                                .content(aiTalkItem.getContext())
+                                .build();
+                        messages.add(assistantMessage);
+                    }
                 }
             }
         }

--
Gitblit v1.9.1