From 2fcfbcefee1a6ad5b51e23223ebe77093b847c3a Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 30 Oct 2025 14:45:53 +0800
Subject: [PATCH] feat(ai):优化对话流初始化逻辑 - 调整对话记录查询顺序,确保获取最新进行中的对话 - 在对话不存在时创建新对话并初始化问题 - 若对话已存在,则查询最近的对话项作为标题来源 - 修复可能因查询顺序导致的标题加载异常问题

---
 src/main/java/cc/mrbird/febs/ai/strategy/Impl/AliApplicationLlmStrategyServiceImpl.java |   52 +++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 41 insertions(+), 11 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 7a158ef..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
@@ -39,6 +39,7 @@
     private final String bizParam_1 = "prompt_ai_system";
     private final String bizParam_2 = "question";
     private final String bizParam_3 = "query";
+    private final String bizParam_4 = "messages";
 
     private HashMap getPrompt(List<LlmStrategyDto> dto) {
         HashMap<String, String> bizParamsMap = new HashMap<>();
@@ -52,22 +53,38 @@
             if (StrUtil.equals(dtoItem.getRole(),Role.USER.getValue())){
                 bizParamsMap.put(bizParam_3, dtoItem.getContent());
             }
+            if (StrUtil.equals(dtoItem.getRole(),AiTypeEnum.MESSAGES.getName())){
+                bizParamsMap.put(bizParam_4, JSONUtil.toJsonStr(dtoItem.getMessages()));
+            }
         }
         return bizParamsMap;
     }
 
     private List<Message> getMessages(List<LlmStrategyDto> dto) {
         List<Message> messages = new ArrayList<>();
-        for (LlmStrategyDto dtoItem : dto){
-            if (StrUtil.equals(AiTypeEnum.MESSAGES.getName(), dtoItem.getRole())){
-                List<LlmStrategyDto> messages1 = dtoItem.getMessages();
-                for (LlmStrategyDto dtoItem1 : messages1){
-                    messages.add(Message.builder()
-                            .role(dtoItem1.getRole())
-                            .content(dtoItem1.getContent())
-                            .build());
+        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());
+                    }
                 }
-                break;
             }
         }
         return messages;
@@ -90,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;
             }
         }
@@ -178,9 +206,9 @@
             throw new FebsException("百炼工作流初始化异常");
         }
         HashMap prompt = getPrompt(dto);
-        List<Message> messages = getMessages(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("百炼工作流初始化异常");
         }
@@ -190,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泄露风险。

--
Gitblit v1.9.1