From 8fd8e2f7c84446ab6bf84fe252053b85d9b20d30 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 30 Oct 2025 10:45:44 +0800
Subject: [PATCH] feat(ai): 简化AI对话项创建逻辑并新增连续对话类型 - 移除复杂的对话项更新逻辑,统一通过add方法创建新项 - 新增AiTalkOutputEnum枚举值CONTEXT_TALK用于AI陪练连续对话 - 更新ApiMemberTalkAnswerSavaDto注释以包含新的对话类型 - 修复对话项创建时类型参数未正确传递的问题 - 优化代码结构,减少冗余的条件判断和数据转换操作

---
 src/main/java/cc/mrbird/febs/ai/strategy/Impl/AliApplicationLlmStrategyServiceImpl.java |   47 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 46 insertions(+), 1 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/ai/strategy/Impl/AliApplicationLlmStrategyServiceImpl.java b/src/main/java/cc/mrbird/febs/ai/strategy/Impl/AliApplicationLlmStrategyServiceImpl.java
index 6b5f9e7..2ccbf79 100644
--- a/src/main/java/cc/mrbird/febs/ai/strategy/Impl/AliApplicationLlmStrategyServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/ai/strategy/Impl/AliApplicationLlmStrategyServiceImpl.java
@@ -60,6 +60,36 @@
         return bizParamsMap;
     }
 
+    private List<Message> getMessages(List<LlmStrategyDto> dto) {
+        List<Message> messages = new ArrayList<>();
+        for (LlmStrategyDto item : dto){
+            if (StrUtil.equals(item.getRole(),AiTypeEnum.MESSAGES.getName())){
+                List<LlmStrategyDto> messagesList = item.getMessages();
+                for (LlmStrategyDto dtoItem : messagesList){
+                    if (StrUtil.equals(dtoItem.getRole(),Role.SYSTEM.getValue())){
+                        messages.add(Message.builder()
+                                .role(Role.SYSTEM.getValue())
+                                .content(dtoItem.getContent())
+                                .build());
+                    }
+                    if (StrUtil.equals(dtoItem.getRole(),Role.USER.getValue())){
+                        messages.add(Message.builder()
+                                .role(Role.USER.getValue())
+                                .content(dtoItem.getContent())
+                                .build());
+                    }
+                    if (StrUtil.equals(dtoItem.getRole(),Role.ASSISTANT.getValue())){
+                        messages.add(Message.builder()
+                                .role(Role.ASSISTANT.getValue())
+                                .content(dtoItem.getContent())
+                                .build());
+                    }
+                }
+            }
+        }
+        return messages;
+    }
+
     private String getQuery(List<LlmStrategyDto> dto) {
         String query = null;
         for (LlmStrategyDto dtoItem : dto){
@@ -77,6 +107,17 @@
             if (StrUtil.equals(dtoItem.getRole(),Role.TOOL.getValue())){
                 int code = Integer.parseInt(dtoItem.getContent());
                 appId = LlmApplicationAppIdEnum.HIGH_LIGHT.getAppIdByCode(code);
+                break;
+            }
+        }
+        return appId;
+    }
+
+    private String getAppIdV2(List<LlmStrategyDto> dto) {
+        String appId = null;
+        for (LlmStrategyDto dtoItem : dto){
+            if (StrUtil.equals(dtoItem.getRole(),Role.TOOL.getValue())){
+                appId = dtoItem.getContent();
                 break;
             }
         }
@@ -166,7 +207,8 @@
         }
         HashMap prompt = getPrompt(dto);
         String query = getQuery(dto);
-        String appId = getAppId(dto);
+//        String appId = getAppId(dto);
+        String appId = getAppIdV2(dto);
         if (prompt == null || prompt.size() == 0){
             throw new FebsException("百炼工作流初始化异常");
         }
@@ -176,6 +218,8 @@
         if (appId == null){
             throw new FebsException("百炼工作流初始化异常");
         }
+
+        List<Message> messages = getMessages(dto);
         long startTime = System.currentTimeMillis();
         ApplicationParam param = ApplicationParam.builder()
                 // 若没有配置环境变量,可用百炼API Key将下行替换为:.apiKey("sk-xxx")。但不建议在生产环境中直接将API Key硬编码到代码中,以减少API Key泄露风险。
@@ -183,6 +227,7 @@
                 .appId(appId) //替换为实际的应用 ID
                 .flowStreamMode(FlowStreamMode.MESSAGE_FORMAT)
                 .prompt(query)
+                .messages( messages)
                 .bizParams(JsonUtils.toJsonObject( prompt))
                 .build();
 

--
Gitblit v1.9.1