Merge branch 'work_flow_v3.0' into v3.0.0

# Conflicts:
#	ruoyi-common/ruoyi-common-chat/src/main/java/org/ruoyi/common/chat/Service/IChatService.java
#	ruoyi-modules/ruoyi-aiflow/src/main/java/org/ruoyi/workflow/workflow/WorkflowUtil.java
#	ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/service/chat/impl/AbstractStreamingChatService.java
#	ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/service/chat/impl/ChatServiceFacade.java
#	ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/service/chat/impl/provider/QianWenChatServiceImpl.java

ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/service/chat/impl/AbstractStreamingChatService.java

@@ -26,6 +26,7 @@ import org.ruoyi.agent.tool.QueryAllTablesTool;
 import org.ruoyi.agent.tool.QueryTableSchemaTool;
 import org.ruoyi.common.chat.Service.IChatService;
 import org.ruoyi.common.chat.domain.dto.request.ChatRequest;
+import org.ruoyi.common.chat.domain.entity.chat.ChatContext;
 import org.ruoyi.common.chat.domain.vo.chat.ChatModelVo;
 import org.ruoyi.common.core.utils.ObjectUtils;
 import org.ruoyi.common.core.utils.SpringUtils;
@@ -36,6 +37,7 @@ import org.ruoyi.enums.RoleType;
 import org.ruoyi.service.chat.IChatMessageService;
 import org.ruoyi.service.chat.impl.memory.PersistentChatMemoryStore;
 import org.springframework.util.CollectionUtils;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
 
 import java.util.*;
@@ -55,6 +57,7 @@ import java.util.concurrent.ConcurrentHashMap;
  * @date 2025/12/13
  */
 @Slf4j
+@Validated
 public abstract class AbstractStreamingChatService implements IChatService {
 
     /**
@@ -73,29 +76,23 @@ public abstract class AbstractStreamingChatService implements IChatService {
      */
     private static final Map<Object, MessageWindowChatMemory> memoryCache = new ConcurrentHashMap<>();
 
-
-
-    
     /**
      * 定义聊天流程骨架
      */
     @Override
-    public SseEmitter chat(ChatModelVo chatModelVo, ChatRequest chatRequest, SseEmitter emitter, Long userId, String tokenValue) {
-        return executeChat(chatModelVo, chatRequest, emitter, userId, tokenValue, null);
-    }
-
-    /**
-     * 定义聊天流程骨架（包含流式回调结构）
-     */
-    @Override
-    public SseEmitter chat(ChatModelVo chatModelVo, ChatRequest chatRequest, SseEmitter emitter, Long userId, String tokenValue, StreamingChatResponseHandler handler) {
-        return executeChat(chatModelVo, chatRequest, emitter, userId, tokenValue, handler);
-    }
-
-    /**
-     * 定义聊天流程骨架
-     */
-    public SseEmitter executeChat(ChatModelVo chatModelVo, ChatRequest chatRequest, SseEmitter emitter, Long userId, String tokenValue, StreamingChatResponseHandler handler) {
+    public SseEmitter chat(ChatContext chatContext) {
+        // 获取模型管理视图对象
+        ChatModelVo chatModelVo = chatContext.getChatModelVo();
+        // 获取对话请求对象
+        ChatRequest chatRequest = chatContext.getChatRequest();
+        // 获取SSe连接对象
+        SseEmitter emitter = chatContext.getEmitter();
+        // 获取用户ID
+        Long userId = chatContext.getUserId();
+        // 获取Token
+        String tokenValue = chatContext.getTokenValue();
+        // 获取响应处理器
+        StreamingChatResponseHandler handler = chatContext.getHandler();
         try {
             String content = Optional.ofNullable(chatRequest.getMessages()).filter(messages -> !messages.isEmpty())
                 // 对话逻辑：从 messages 筛选第一个元素
@@ -103,11 +100,11 @@ public abstract class AbstractStreamingChatService implements IChatService {
                 .filter(StringUtils::isNotBlank)
                 // 工作流逻辑：从 chatMessages 筛选 UserMessage 的文本
                 .orElseGet(() -> Optional.ofNullable(chatRequest.getChatMessages()).orElse(List.of()).stream()
-                        .filter(message -> message instanceof UserMessage um)
-                        .map(message -> ((UserMessage) message).singleText())
-                        .filter(StringUtils::isNotBlank)
-                        .findFirst()
-                        .orElse(""));
+                    .filter(message -> message instanceof UserMessage um)
+                    .map(message -> ((UserMessage) message).singleText())
+                    .filter(StringUtils::isNotBlank)
+                    .findFirst()
+                    .orElse(""));
 
             // 保存用户消息
             saveChatMessage(chatRequest, userId, content, RoleType.USER.getName(), chatModelVo);

ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/service/chat/impl/ChatServiceFacade.java

@@ -1,26 +1,27 @@
 package org.ruoyi.service.chat.impl;
 
-import java.util.List;
-
+import cn.dev33.satoken.stp.StpUtil;
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.ruoyi.common.chat.Service.IChatModelService;
 import org.ruoyi.common.chat.Service.IChatService;
 import org.ruoyi.common.chat.domain.dto.ChatMessageDTO;
 import org.ruoyi.common.chat.domain.dto.request.ChatRequest;
+import org.ruoyi.common.chat.domain.entity.chat.ChatContext;
 import org.ruoyi.common.chat.domain.vo.chat.ChatModelVo;
 import org.ruoyi.common.chat.factory.ChatServiceFactory;
 import org.ruoyi.common.satoken.utils.LoginHelper;
 import org.ruoyi.common.sse.core.SseEmitterManager;
 import org.ruoyi.domain.bo.vector.QueryVectorBo;
 import org.ruoyi.domain.vo.knowledge.KnowledgeInfoVo;
+;
 import org.ruoyi.service.knowledge.IKnowledgeInfoService;
 import org.ruoyi.service.vector.VectorStoreService;
 import org.springframework.stereotype.Service;
 import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
 
-import cn.dev33.satoken.stp.StpUtil;
-import jakarta.servlet.http.HttpServletRequest;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
+import java.util.List;
 
 /**
  * 聊天服务业务实现
@@ -71,7 +72,16 @@ public class ChatServiceFacade {
         Long userId = LoginHelper.getUserId();
         String tokenValue = StpUtil.getTokenValue();
         SseEmitter emitter = sseEmitterManager.connect(userId, tokenValue);
-        return chatService.chat(chatModelVo, chatRequest,emitter,userId, tokenValue);
+
+        // 5. 创建对话上下文对象
+        ChatContext chatContext = ChatContext.builder()
+            .chatModelVo(chatModelVo)
+            .chatRequest(chatRequest)
+            .emitter(emitter)
+            .userId(userId)
+            .tokenValue(tokenValue)
+            .build();
+        return chatService.chat(chatContext);
     }
 
     /**

ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/service/chat/impl/provider/QianWenChatServiceImpl.java

@@ -1,18 +1,6 @@
 package org.ruoyi.service.chat.impl.provider;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.ruoyi.agent.EchartsAgent;
-import org.ruoyi.common.chat.domain.dto.request.ChatRequest;
-import org.ruoyi.common.chat.domain.vo.chat.ChatModelVo;
-import org.ruoyi.config.McpSseConfig;
-import org.ruoyi.enums.ChatModeType;
-import org.ruoyi.service.chat.impl.AbstractStreamingChatService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
+import dev.langchain4j.agent.tool.ToolSpecification;
 import dev.langchain4j.agentic.AgenticServices;
 import dev.langchain4j.agentic.supervisor.SupervisorAgent;
 import dev.langchain4j.agentic.supervisor.SupervisorResponseStrategy;
@@ -25,11 +13,23 @@ import dev.langchain4j.mcp.McpToolProvider;
 import dev.langchain4j.mcp.client.DefaultMcpClient;
 import dev.langchain4j.mcp.client.McpClient;
 import dev.langchain4j.mcp.client.transport.McpTransport;
-import dev.langchain4j.mcp.client.transport.stdio.StdioMcpTransport;
+import dev.langchain4j.mcp.client.transport.http.StreamableHttpMcpTransport;
 import dev.langchain4j.model.chat.StreamingChatModel;
 import dev.langchain4j.model.chat.response.StreamingChatResponseHandler;
 import dev.langchain4j.service.tool.ToolProvider;
 import lombok.extern.slf4j.Slf4j;
+import org.ruoyi.agent.McpAgent;
+import org.ruoyi.config.McpSseConfig;
+import org.ruoyi.enums.ChatModeType;
+import org.ruoyi.service.chat.impl.AbstractStreamingChatService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+import org.ruoyi.common.chat.domain.dto.request.ChatRequest;
+import org.ruoyi.common.chat.domain.vo.chat.ChatModelVo;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * qianWenAI服务调用
@@ -41,6 +41,13 @@ import lombok.extern.slf4j.Slf4j;
 @Slf4j
 public class QianWenChatServiceImpl extends AbstractStreamingChatService {
 
+    @Autowired
+    private McpSseConfig mcpSseConfig;
+
+    /**
+     * 千问开发者默认地址
+     */
+    private static final String QWEN_API_HOST = "https://dashscope.aliyuncs.com/api/v1";
 
     // 添加文档解析的前缀字段
     private static final String UPLOAD_FILE_API_PREFIX = "fileid";
@@ -101,45 +108,49 @@ public class QianWenChatServiceImpl extends AbstractStreamingChatService {
      * @return 返回LLM信息
      */
     protected String doAgent(String userMessage,ChatModelVo chatModelVo) {
-   
+        // 判断是否开启MCP服务
+        if (!mcpSseConfig.isEnabled()) {
+            return "";
+        }
+
+        // 步骤1：根据SSE对外暴露端点连接
+        McpTransport httpMcpTransport = new StreamableHttpMcpTransport.Builder().
+            url(mcpSseConfig.getUrl()).
+            logRequests(true).
+            build();
+
+        // 步骤2：开启客户端连接
+        McpClient mcpClient = new DefaultMcpClient.Builder()
+            .transport(httpMcpTransport)
+            .build();
+
+        // 获取所有mcp工具
+        List<ToolSpecification> toolSpecifications = mcpClient.listTools();
+        System.out.println(toolSpecifications);
+
+        // 步骤3：将mcp对象包装
+        ToolProvider toolProvider = McpToolProvider.builder()
+            .mcpClients(List.of(mcpClient))
+            .build();
+
         // 步骤4：加载LLM模型对话
         QwenChatModel qwenChatModel = QwenChatModel.builder()
+            .baseUrl(QWEN_API_HOST)
             .apiKey(chatModelVo.getApiKey())
             .modelName(chatModelVo.getModelName())
             .build();
-        McpTransport echart = new StdioMcpTransport.Builder()
-            .command(List.of("uv",
-                "--directory",
-                "/Users/zhangmingming/data/coder/LLM/MCP/cicd-pipeline-example/",
-                "run",
-                "text2sql-mcp"
-            ))
-            .logEvents(true)
-            .build();
 
-        // 步骤2: 创建MCP客户端
-        McpClient echartClient = new DefaultMcpClient.Builder()
-            .transport(echart)
-            .build();
-
-        // 步骤3: 配置工具提供者
-        ToolProvider echartToolProvider = McpToolProvider.builder()
-            .mcpClients(List.of(
-                        echartClient))
-                .build();
-            
-        EchartsAgent chartGenerationAgent = AgenticServices.agentBuilder(
-                EchartsAgent.class)
+        // 步骤5：将MCP对象由智能体Agent管控
+        McpAgent mcpAgent = AgenticServices.agentBuilder(McpAgent.class)
             .chatModel(qwenChatModel)
-            .toolProvider(echartToolProvider)
+            .toolProvider(toolProvider)
             .build();
 
-
         // 步骤6：将所有MCP对象由超级智能体管控
         SupervisorAgent supervisor = AgenticServices
             .supervisorBuilder()
             .chatModel(qwenChatModel)
-            .subAgents(chartGenerationAgent)
+            .subAgents(mcpAgent)
             .responseStrategy(SupervisorResponseStrategy.LAST)
             .build();