累积更新

oa-back/ruoyi-admin/src/main/resources/application.yml

@@ -8,12 +8,16 @@ cmc:
   copyrightYear: 2023
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
 #  profile: /home/cmc/Java-server/综合办公
-  profile: /home/cmc/projects/cmc-oa
-#  profile: D:/ruoyi/uploadPath
+#  profile: /home/cmc/projects/cmc-oa
+  profile: D:/ruoyi/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数字计算 char 字符验证
   captchaType: math
+  llmService:
+    url: http://192.168.28.196:8000/v1/chat/completions
+  milvusService:
+    url: http://192.168.28.196:19530
 
 # 开发环境配置
 server:
@@ -139,8 +143,3 @@ flowable:
   database-schema-update: true
   # 关闭定时任务JOB
   async-executor-activate: false
-
-llmService:
-  url: http://192.168.28.196:8000/v1/chat/completions
-milvusService:
-  url: http://192.168.28.196:19530

oa-back/ruoyi-agent/pom.xml

@@ -17,7 +17,7 @@
     </description>
 
     <properties>
-        <solon.version>3.5.1</solon.version>
+        <solon.version>3.9.5</solon.version>
     </properties>
 
     <dependencies>
@@ -44,6 +44,15 @@
             <artifactId>solon-ai-mcp</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.noear</groupId>
+            <artifactId>solon-ai-agent</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.36</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>

oa-back/ruoyi-agent/src/main/java/com/ruoyi/agent/service/McpServerConfig.java

@@ -2,12 +2,14 @@ package com.ruoyi.agent.service;
 
 import org.noear.solon.Solon;
 import org.noear.solon.ai.chat.tool.MethodToolProvider;
+import org.noear.solon.ai.mcp.server.IMcpServerEndpoint;
 import org.noear.solon.ai.mcp.server.McpServerEndpointProvider;
 import org.noear.solon.ai.mcp.server.annotation.McpServerEndpoint;
-import org.noear.solon.ai.mcp.server.prompt.MethodPromptProvider;
-import org.noear.solon.ai.mcp.server.resource.MethodResourceProvider;
+import org.noear.solon.ai.chat.prompt.MethodPromptProvider;
+import org.noear.solon.ai.chat.resource.MethodResourceProvider;
 import org.noear.solon.web.servlet.SolonServletFilter;
 import org.springframework.aop.support.AopUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -22,9 +24,12 @@ import java.util.List;
  * */
 @Configuration
 public class McpServerConfig {
+    @Autowired(required=false)
+    private List<IMcpServerEndpoint> serverEndpoints;
     @PostConstruct
     public void start() {
         Solon.start(McpServerConfig.class, new String[]{"--cfg=application.yml"});
+        springCom2Endpoint();
     }
 
     @PreDestroy
@@ -34,32 +39,31 @@ public class McpServerConfig {
         }
     }
 
-    @Bean
-    public McpServerConfig init(List<IMcpService> serverEndpoints) {
-        //提取实现容器里 IMcpService 接口的 bean ，并注册为服务端点
-        for (IMcpService serverEndpoint : serverEndpoints) {
-            Class<?> serverEndpointClz = AopUtils.getTargetClass(serverEndpoint);
-            McpServerEndpoint anno = AnnotationUtils.findAnnotation(serverEndpointClz, McpServerEndpoint.class);
+    //Spring 组件转为端点
+    protected void springCom2Endpoint() {
+        if (serverEndpoints != null) {
+            //提取实现容器里 IMcpServerEndpoint 接口的 bean ，并注册为服务端点
+            for (IMcpServerEndpoint serverEndpoint : serverEndpoints) {
+                Class<?> serverEndpointClz = AopUtils.getTargetClass(serverEndpoint);
+                McpServerEndpoint anno = AnnotationUtils.findAnnotation(serverEndpointClz, McpServerEndpoint.class);
 
-            if (anno == null) {
-                continue;
-            }
+                if (anno == null) {
+                    continue;
+                }
 
-            McpServerEndpointProvider serverEndpointProvider = McpServerEndpointProvider.builder()
-                    .from(serverEndpointClz, anno)
-                    .build();
+                McpServerEndpointProvider serverEndpointProvider = McpServerEndpointProvider.builder()
+                        .from(serverEndpointClz, anno)
+                        .build();
 
-            serverEndpointProvider.addTool(new MethodToolProvider(serverEndpointClz, serverEndpoint));
-            serverEndpointProvider.addResource(new MethodResourceProvider(serverEndpointClz, serverEndpoint));
-            serverEndpointProvider.addPrompt(new MethodPromptProvider(serverEndpointClz, serverEndpoint));
+                serverEndpointProvider.addTool(new MethodToolProvider(serverEndpointClz, serverEndpoint));
+                serverEndpointProvider.addResource(new MethodResourceProvider(serverEndpointClz, serverEndpoint));
+                serverEndpointProvider.addPrompt(new MethodPromptProvider(serverEndpointClz, serverEndpoint));
 
-            serverEndpointProvider.postStart();
+                serverEndpointProvider.postStart();
 
-            //可以再把 serverEndpointProvider 手动转入 SpringBoot 容器
+                //可以再把 serverEndpointProvider 手动转入 SpringBoot 容器
+            }
         }
-
-        //为了能让这个 init 能正常运行
-        return this;
     }
 
     @Bean

oa-back/ruoyi-agent/src/main/java/com/ruoyi/agent/service/impl/McpServiceImpl.java

@@ -23,11 +23,14 @@ import io.milvus.v2.service.vector.request.SearchReq;
 import io.milvus.v2.service.vector.request.data.BaseVector;
 import io.milvus.v2.service.vector.request.data.FloatVec;
 import io.milvus.v2.service.vector.response.SearchResp;
+import io.modelcontextprotocol.server.McpServer;
+import io.modelcontextprotocol.spec.McpServerSession;
 import org.apache.poi.hwpf.HWPFDocument;
 import org.apache.poi.hwpf.usermodel.Paragraph;
 import org.apache.poi.hwpf.usermodel.Range;
 import org.apache.poi.xwpf.usermodel.*;
 import org.apache.xmlbeans.XmlCursor;
+import org.noear.solon.Solon;
 import org.noear.solon.ai.annotation.ToolMapping;
 import org.noear.solon.ai.chat.ChatModel;
 import org.noear.solon.ai.chat.ChatResponse;
@@ -42,12 +45,13 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
 import java.io.*;
 import java.sql.*;
 import java.util.*;
 
 @Service
-@McpServerEndpoint(channel = McpChannel.SSE, mcpEndpoint = "/mcp/sse")
+@McpServerEndpoint(channel = McpChannel.STREAMABLE_STATELESS , mcpEndpoint = "/mcp/sse")
 public class McpServiceImpl implements IMcpService {
 
     private static final EmbeddingModel embeddingModel = new BgeSmallZhV15EmbeddingModel();
@@ -58,20 +62,11 @@ public class McpServiceImpl implements IMcpService {
     @Value("${cmc.milvusService.url}")
     private String milvusServiceUrl;
 
-    @Value("${cmc.mysqlService.jdbcUrl}")
-    private String url ;
-
-    @Value("${cmc.mysqlService.username}")
-    private String user;
-
-    @Value("${cmc.mysqlService.password}")
-    private String password;
-
     @Value("${cmc.profile}")
     private String profile;
 
     private MilvusClientV2 milvusClient;
-    
+
     /**
      * 初始化 Milvus 客户端
      */
@@ -80,11 +75,26 @@ public class McpServiceImpl implements IMcpService {
         if (milvusServiceUrl == null || milvusServiceUrl.isEmpty()) {
             throw new IllegalStateException("Milvus service URL 未配置");
         }
-        milvusClient = new MilvusClientV2(
-                ConnectConfig.builder()
-                        .uri(milvusServiceUrl)
-                        .build());
+//        milvusClient = new MilvusClientV2(
+//                ConnectConfig.builder()
+//                        .uri(milvusServiceUrl)
+//                        .build());
+    }    
+
+    @PreDestroy
+    public void destroyMilvusClient() {
+        if (milvusClient != null) {
+            try {
+                // 关闭 Milvus 客户端，释放 gRPC 通道
+                milvusClient.close();
+                System.out.println("Milvus client closed successfully");
+            } catch (Exception e) {
+                System.err.println("Error closing Milvus client: " + e.getMessage());
+                e.printStackTrace();
+            }
+        }
     }
+
     /**
      * 调用LLM+RAG（外部文件+知识库）生成回答
      */
@@ -126,7 +136,7 @@ public class McpServiceImpl implements IMcpService {
             throw new RuntimeException("MySQL 驱动未找到", e);
         }
 
-        try (Connection conn = DriverManager.getConnection(url, user, password);
+        try (Connection conn = DriverManager.getConnection(Solon.cfg().getProperty("cmc.mysqlService.jdbcUrl"),Solon.cfg().getProperty("cmc.mysqlService.username"), Solon.cfg().getProperty("cmc.mysqlService.password"));
              PreparedStatement stmt = conn.prepareStatement(sql)) {
 
             ResultSet rs = stmt.executeQuery();

oa-back/ruoyi-agent/src/main/resources/application.yml

@@ -10,4 +10,6 @@ cmc:
   mysqlService:
     jdbcUrl: jdbc:mysql://localhost:3306/cmc_oa?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
     username: root
-    password: cmcroot
+    password: cmcroot
+server:
+  port: 8087

oa-back/ruoyi-llm/pom.xml

@@ -73,7 +73,7 @@
         <dependency>
             <groupId>org.noear</groupId>
             <artifactId>solon-ai-mcp</artifactId>
-            <version>3.5.1</version>
+            <version>3.9.5</version>
         </dependency>
 
     </dependencies>

oa-back/ruoyi-llm/src/main/java/com/ruoyi/web/llm/controller/McpController.java

@@ -43,10 +43,10 @@ public class McpController extends BaseController
     @Autowired
     private ICmcAgentService cmcAgentService;
 
-    @Value("${llmService.url}")
+    @Value("${cmc.llmService.url}")
     private String llmServiceUrl;
 
-    @Value("${milvusService.url}")
+    @Value("${cmc.milvusService.url}")
     private String milvusServiceUrl;
 
     /**
@@ -56,12 +56,12 @@ public class McpController extends BaseController
     @GetMapping("/answer")
     public AssistantMessage answer(String topicId, String question) throws IOException {
         McpClientProvider clientProvider = McpClientProvider.builder()
-                .channel(McpChannel.SSE)
-                .url("http://localhost:8080/mcp/sse")
+                .channel(McpChannel.STREAMABLE_STATELESS )
+                .url("http://localhost:8087/mcp/sse")
                 .build();
         ChatModel chatModel = ChatModel.of(llmServiceUrl)
                 .model("Qwen")
-                .defaultToolsAdd(clientProvider)
+                .defaultToolAdd(clientProvider)
                 .build();
 
         List<ChatMessage> messages = new ArrayList<>();
@@ -88,7 +88,7 @@ public class McpController extends BaseController
                 arguments.put("agentName", agentName);
                 arguments.put("title", question);
             }
-            resultContent = clientProvider.callToolAsText(name, arguments).getContent();
+            resultContent = clientProvider.callTool(name, arguments).getContent();
             assistantMessage = ChatMessage.ofAssistant(resultContent);
         }
         else

oa-back/ruoyi-llm/src/main/java/com/ruoyi/web/llm/controller/SessionController.java

@@ -1,33 +1,15 @@
 package com.ruoyi.web.llm.controller;
 
-import com.alibaba.fastjson2.JSONObject;
-import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.llm.domain.CmcChat;
-import com.ruoyi.llm.service.ICmcChatService;
-import com.ruoyi.web.llm.service.ILangChainMilvusService;
-import org.noear.solon.ai.chat.ChatModel;
-import org.noear.solon.ai.chat.ChatResponse;
-import org.noear.solon.ai.chat.ChatSession;
+import com.ruoyi.web.llm.service.ISessionService;
 import org.noear.solon.ai.chat.message.AssistantMessage;
-import org.noear.solon.ai.chat.message.ChatMessage;
-import org.noear.solon.ai.chat.session.InMemoryChatSession;
-import org.noear.solon.ai.mcp.McpChannel;
-import org.noear.solon.ai.mcp.client.McpClientProvider;
-import org.reactivestreams.Publisher;
+import org.noear.solon.core.util.MimeType;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import reactor.core.publisher.Flux;
 
-import javax.annotation.PostConstruct;
-import java.io.*;
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * session对话Controller
  *
@@ -39,123 +21,24 @@ import java.util.List;
 public class SessionController extends BaseController
 {
     @Autowired
-    private ICmcChatService cmcChatService;
-
-    @Autowired
-    private ILangChainMilvusService langChainMilvusService;
-
-    @Value("${llmService.url}")
-    private String llmServiceUrl;
-
-    // 复用 ChatModel 实例
-    private ChatModel chatModel;
-    private McpClientProvider clientProvider;
-
-    @PostConstruct
-    public void init() {
-        // 初始化 McpClientProvider
-        clientProvider = McpClientProvider.builder()
-                .channel(McpChannel.SSE)
-                .url("http://localhost:8080/mcp/sse")
-                .build();
-
-        // 初始化 ChatModel
-        chatModel = ChatModel.of(llmServiceUrl)
-                .model("Qwen")
-                .defaultToolsAdd(clientProvider)
-                .build();
-    }
+    private ISessionService sessionService;
 
     /**
      * 生成回答
      */
-    @GetMapping(value = "/answer", produces = MediaType.TEXT_EVENT_STREAM_VALUE)
-    public Flux<AssistantMessage> answer(String topicId, String question) throws IOException {
-        List<ChatMessage> messages = new ArrayList<>();
-        CmcChat cmcChat = new CmcChat();
-        cmcChat.setTopicId(topicId);
-        List<CmcChat> cmcChatList = cmcChatService.selectCmcChatList(cmcChat);
-        for (CmcChat chat : cmcChatList) {
-            messages.add(ChatMessage.ofUser(chat.getInput()));
-            messages.add(ChatMessage.ofAssistant(chat.getOutput()));
-        }
-        StringBuilder sqlContent = new StringBuilder();
-        File sqlStructure = new File(RuoYiConfig.getProfile() + "/cmc_oa.sql");
-        try (BufferedReader br = new BufferedReader(new FileReader(sqlStructure))) {
-            String line;
-
-            while ((line = br.readLine()) != null) {
-                sqlContent.append(line).append("\n");
-            }
-        } catch (IOException e) {
-            System.err.println("读取文件时出错: " + e.getMessage());
-        }
-
-        String prompt = "你是一个MySQL专家。根据以下OA系统表结构信息：  \n" +
-                sqlContent + " \n" +
-                "用户查询：  \n"+
-                question  + " \n"+
-                "你可以使用SQLQuery工具来查询OA系统数据。  \n" +
-                "SQLQuery工具功能：执行SQL查询语句，获取OA系统数据  \n" +
-                "工具参数：sqlString（需要执行的SQL语句，格式为[SQL语句]）  \n" +
-                "要求：  \n" +
-                "1. 根据用户查询需求，决定是否需要查询数据  \n" +
-                "2. 如果需要查询数据，调用SQLQuery工具并传入正确的SQL语句  \n" +
-                "3. 生成标准MYSQL查询语句，根据语义和字段类型使用COUNT/SUM/AVG等聚合函数  \n" +
-                "4. 如果单表字段不满足查询需求，根据OA系统表结构信息进行多张表连接查询  \n" +
-                "5. 如果字段值由逗号隔开，根据OA系统表结构信息进行多张表连接查询，采用concat方式多值匹配  \n" +
-                "6. 给生成的字段取一个简短的中文名称  \n" +
-                "7. 输出格式：使用[]包含sql文本，例如:[select 1 from dual]\n";
-        messages.add(ChatMessage.ofUser(prompt));
-        ChatSession chatSession =  InMemoryChatSession.builder().messages(messages).build();
-
-        Publisher<ChatResponse> responsePublisher = chatModel.prompt(chatSession).stream();
-
-        // 收集完整的响应内容，用于判断是否需要工具调用
-        StringBuilder resultBuilder = new StringBuilder();
-
-        // 先创建一个处理器，用于处理流式响应
-        Flux<AssistantMessage> flux = Flux.from(responsePublisher)
-                .map(chatResponse -> chatResponse.lastChoice().getMessage())
-                .doOnNext(assistantMessage -> {
-                    String content = assistantMessage.getResultContent();
-                    resultBuilder.append(content);
-                });
-
-        // 检查是否需要工具调用（异步处理）
-        return flux.thenMany(Flux.defer(() -> {
-            String resultContent = resultBuilder.toString();
-
-            if (resultContent.contains("<tool_call>")) {
-                // 需要工具调用，解析工具调用内容
-                resultContent = resultContent.split("<tool_call>\n")[1];
-                String content = resultContent.replace("\n</tool_call>", "");
-                JSONObject jsonObject = JSONObject.parseObject(content);
-                String name = jsonObject.getString("name");
-                JSONObject arguments = jsonObject.getJSONObject("arguments");
-
-                // 调用工具
-                resultContent = clientProvider.callToolAsText(name, arguments).getContent();
-                resultContent = "根据查询结果：\n" +
-                        resultContent + "回答问题：\n" +
-                        question + " \n";
-
-                // 再次调用LLM生成最终回答
-                return langChainMilvusService.generateAnswer(topicId, resultContent);
-            } else {
-                // 不需要工具调用，已经通过上面的flux返回了流式内容
-                return Flux.just(ChatMessage.ofAssistant(resultContent));
-            }
-        }));
+    @GetMapping(value = "/answer", produces = MimeType.TEXT_EVENT_STREAM_UTF8_VALUE)
+    public Flux<String> answer(String topicId, String question) {
+        return sessionService.answer(topicId, question);
     }
 
     /**
      * 调用LLM+RAG（外部文件）生成回答
      */
-    @GetMapping(value = "/answerWithDocument", produces = MediaType.TEXT_EVENT_STREAM_VALUE)
+    @GetMapping(value = "/answerWithDocument", produces = MimeType.TEXT_EVENT_STREAM_UTF8_VALUE)
     public Flux<AssistantMessage> answerWithDocument(String topicId, String chatId, String question) throws Exception
     {
-        return langChainMilvusService.generateAnswerWithDocument(topicId, chatId, question);
+        return sessionService.answerWithDocument(topicId, chatId, question);
     }
 
 }
+

oa-back/ruoyi-llm/src/main/java/com/ruoyi/web/llm/service/ISessionService.java

@@ -0,0 +1,18 @@
+package com.ruoyi.web.llm.service;
+
+import org.noear.solon.ai.chat.message.AssistantMessage;
+import reactor.core.publisher.Flux;
+
+public interface ISessionService {
+
+    /**
+     * 生成回答
+     */
+    Flux<String> answer(String topicId, String question);
+
+    /**
+     * 调用LLM+RAG（外部文件）生成回答
+     */
+    Flux<AssistantMessage> answerWithDocument(String topicId, String chatId, String question) throws Exception;
+
+}

oa-back/ruoyi-llm/src/main/java/com/ruoyi/web/llm/service/impl/LangChainMilvusServiceImpl.java

@@ -51,6 +51,7 @@ import org.springframework.web.multipart.MultipartFile;
 import reactor.core.publisher.Flux;
 
 import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
 import java.io.*;
 import java.util.*;
 
@@ -67,10 +68,10 @@ public class LangChainMilvusServiceImpl implements ILangChainMilvusService
 
     private String processValue = "";
 
-    @Value("${llmService.url}")
+    @Value("${cmc.llmService.url}")
     private String llmServiceUrl;
 
-    @Value("${milvusService.url}")
+    @Value("${cmc.milvusService.url}")
     private String milvusServiceUrl;
 
     private MilvusClientV2 milvusClient;
@@ -83,10 +84,10 @@ public class LangChainMilvusServiceImpl implements ILangChainMilvusService
         if (milvusServiceUrl == null || milvusServiceUrl.isEmpty()) {
             throw new IllegalArgumentException("milvusServiceUrl 配置不能为空");
         }
-        milvusClient = new MilvusClientV2(
-                ConnectConfig.builder()
-                        .uri(milvusServiceUrl)
-                        .build());
+//        milvusClient = new MilvusClientV2(
+//                ConnectConfig.builder()
+//                        .uri(milvusServiceUrl)
+//                        .build());
     }
     
     @PostConstruct
@@ -96,6 +97,20 @@ public class LangChainMilvusServiceImpl implements ILangChainMilvusService
                 .model("Qwen")
                 .build();
     }
+    
+    @PreDestroy
+    public void destroyMilvusClient() {
+        if (milvusClient != null) {
+            try {
+                // 关闭 Milvus 客户端，释放 gRPC 通道
+                milvusClient.close();
+                System.out.println("Milvus client closed successfully");
+            } catch (Exception e) {
+                System.err.println("Error closing Milvus client: " + e.getMessage());
+                e.printStackTrace();
+            }
+        }
+    }
 
     /**
      * 上传多文件

oa-back/ruoyi-llm/src/main/java/com/ruoyi/web/llm/service/impl/MilvusServiceImpl.java

@@ -17,6 +17,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -24,7 +25,7 @@ import java.util.stream.Collectors;
 @Service
 public class MilvusServiceImpl implements IMilvusService {
 
-    @Value("${milvusService.url}")
+    @Value("${cmc.milvusService.url}")
     private String milvusServiceUrl;
 
     private MilvusClientV2 milvusClient;
@@ -34,10 +35,24 @@ public class MilvusServiceImpl implements IMilvusService {
         if (milvusServiceUrl == null || milvusServiceUrl.isEmpty()) {
             throw new IllegalArgumentException("milvusServiceUrl 配置不能为空");
         }
-        milvusClient = new MilvusClientV2(
-                ConnectConfig.builder()
-                        .uri(milvusServiceUrl)
-                        .build());
+//        milvusClient = new MilvusClientV2(
+//                ConnectConfig.builder()
+//                        .uri(milvusServiceUrl)
+//                        .build());
+    }
+    
+    @PreDestroy
+    public void destroyMilvusClient() {
+        if (milvusClient != null) {
+            try {
+                // 关闭 Milvus 客户端，释放 gRPC 通道
+                milvusClient.close();
+                System.out.println("Milvus client closed successfully");
+            } catch (Exception e) {
+                System.err.println("Error closing Milvus client: " + e.getMessage());
+                e.printStackTrace();
+            }
+        }
     }
 
     /**

oa-back/ruoyi-llm/src/main/java/com/ruoyi/web/llm/service/impl/SessionServiceImpl.java

@@ -0,0 +1,269 @@
+package com.ruoyi.web.llm.service.impl;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.ruoyi.common.config.RuoYiConfig;
+import com.ruoyi.llm.domain.CmcChat;
+import com.ruoyi.llm.service.ICmcChatService;
+import com.ruoyi.web.llm.service.ILangChainMilvusService;
+import com.ruoyi.web.llm.service.ISessionService;
+import org.noear.solon.ai.chat.ChatModel;
+import org.noear.solon.ai.chat.ChatResponse;
+import org.noear.solon.ai.chat.ChatSession;
+import org.noear.solon.ai.chat.message.AssistantMessage;
+import org.noear.solon.ai.chat.message.ChatMessage;
+import org.noear.solon.ai.chat.prompt.Prompt;
+import org.noear.solon.ai.chat.session.InMemoryChatSession;
+import org.noear.solon.ai.mcp.McpChannel;
+import org.noear.solon.ai.mcp.client.McpClientProvider;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import reactor.core.publisher.Flux;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class SessionServiceImpl implements ISessionService {
+
+    @Autowired
+    private ICmcChatService cmcChatService;
+
+    @Autowired
+    private ILangChainMilvusService langChainMilvusService;
+
+    @Value("${cmc.llmService.url}")
+    private String llmServiceUrl;
+
+    @Override
+    public Flux<String> answer(String topicId, String question) {
+        McpClientProvider clientProvider = McpClientProvider.builder()
+                .channel(McpChannel.STREAMABLE_STATELESS )
+                .url("http://localhost:8087/mcp/sse")
+                .build();
+        ChatModel chatModel = ChatModel.of(llmServiceUrl)
+                .model("Qwen")
+                .defaultToolAdd(clientProvider)
+                .build();
+
+        List<ChatMessage> messages = new ArrayList<>();
+        CmcChat cmcChat = new CmcChat();
+        cmcChat.setTopicId(topicId);
+        List<CmcChat> cmcChatList = cmcChatService.selectCmcChatList(cmcChat);
+        for (CmcChat chat : cmcChatList) {
+            messages.add(ChatMessage.ofUser(chat.getInput()));
+            messages.add(ChatMessage.ofAssistant(chat.getOutput()));
+        }
+
+        // 读取SQL文件
+        StringBuilder sqlContent = new StringBuilder();
+        File sqlStructure = new File(RuoYiConfig.getProfile() + "/cmc_oa.sql");
+        try (BufferedReader br = new BufferedReader(new FileReader(sqlStructure))) {
+            String line;
+            while ((line = br.readLine()) != null) {
+                sqlContent.append(line).append("\n");
+            }
+        } catch (IOException e) {
+            System.out.println("读取SQL文件失败");
+        }
+
+        // 优化prompt：明确要求不输出任何中间标记
+        String prompt = "你是一个MySQL专家。根据以下OA系统表结构信息：  \n" +
+                sqlContent + " \n" +
+                "用户查询：  \n"+
+                question  + " \n"+
+                "你可以使用SQLQuery工具来查询OA系统数据。  \n" +
+                "SQLQuery工具功能：执行SQL查询语句，获取OA系统数据  \n" +
+                "工具参数：sqlString（需要执行的SQL语句，格式为[SQL语句]）  \n" +
+                "要求：  \n" +
+                "1. 根据用户查询需求，决定是否需要查询数据  \n" +
+                "2. 如果需要查询数据，调用SQLQuery工具并传入正确的SQL语句  \n" +
+                "3. 生成标准MYSQL查询语句，根据语义和字段类型使用COUNT/SUM/AVG等聚合函数  \n" +
+                "4. 如果单表字段不满足查询需求，根据OA系统表结构信息进行多张表连接查询  \n" +
+                "5. 如果字段值由逗号隔开，根据OA系统表结构信息进行多张表连接查询，采用concat方式多值匹配  \n" +
+                "6. 给生成的字段取一个简短的中文名称  \n" +
+                "7. **重要：输出格式要求**  \n" +
+                "   - 不要输出任何思考过程  \n" +
+                "   - 所有输出必须是完整的句子  \n" +
+                "   - 不要输出'查询结果'、'正在生成回答'等中间提示  \n" +
+                "   - 直接输出最终回答内容  \n" +
+                "   - 如果使用工具，工具调用和结果处理对用户透明，用户只看到最终答案  \n";
+
+        messages.add(ChatMessage.ofUser(prompt));
+        ChatSession chatSession = InMemoryChatSession.builder().messages(messages).build();
+        Prompt wholePrompt = Prompt.of(prompt).attrPut("session", chatSession);
+
+        Flux<ChatResponse> chatResponse = chatModel.prompt(wholePrompt).stream();
+
+        // 使用StringBuilder缓存完整响应，用于检测工具调用
+        StringBuilder fullResponseBuilder = new StringBuilder();
+        // 标记是否已经处理过工具调用
+        boolean[] toolCallProcessed = {false};
+        // 输出过滤状态：用于抑制 tool_call 区块（对用户不可见）
+        StreamFilterState filterState = new StreamFilterState();
+
+        Flux<String> contentFlux = chatResponse
+                .concatMap(resp -> {
+                    String content = resp.getContent();
+
+                    // 先累积原始内容，用于 tool_call 检测
+                    fullResponseBuilder.append(content);
+                    String currentFullContent = fullResponseBuilder.toString();
+
+                    // 1) 优先处理工具调用：检测到闭合的 <tool_call>...</tool_call> 后，静默调用工具并流式输出最终答案
+                    if (!toolCallProcessed[0]
+                            && currentFullContent.contains("<tool_call>")
+                            && currentFullContent.contains("</tool_call>")) {
+                        toolCallProcessed[0] = true;
+                        // 进入“最终回答阶段”前重置过滤状态
+                        filterState.reset();
+                        try {
+                            // 提取工具调用内容
+                            int start = currentFullContent.indexOf("<tool_call>");
+                            int end = currentFullContent.indexOf("</tool_call>");
+                            if (start < 0 || end < 0 || end <= start) {
+                                throw new IllegalStateException("未找到完整的 <tool_call>...</tool_call> 区块");
+                            }
+                            String toolContent = currentFullContent.substring(start + "<tool_call>".length(), end).trim();
+                            JSONObject jsonObject = JSONObject.parseObject(toolContent);
+                            String name = jsonObject.getString("name");
+                            JSONObject arguments = jsonObject.getJSONObject("arguments");
+                            String toolResult = "";
+                            try {
+                                // 调用工具
+                                toolResult = clientProvider.callTool(name, arguments).getContent();
+                            } catch (Exception e) {
+                                return Flux.just("抱歉，系统执行查询时遇到问题，请稍后重试。");
+                            } finally {
+                                clientProvider.close();
+                            }
+
+                            // 生成最终回答 - 不添加任何中间提示
+                            String finalPrompt = "基于以下查询结果，直接回答用户问题：\n" +
+                                    "查询结果：\n" + toolResult + "\n\n" +
+                                    "用户问题：\n" + question + "\n\n" +
+                                    "要求：\n" +
+                                    "1. 直接给出最终答案，不要输出任何中间过程\n" +
+                                    "2. 不要输出'查询结果'、'根据查询结果'等前缀\n" +
+                                    "3. 用完整的中文句子回答，语言自然流畅\n" +
+                                    "4. 如果查询结果为空，如实说明";
+
+                            return chatModel.prompt(finalPrompt).stream()
+                                    .map(ChatResponse::getContent)
+                                    .filter(answer -> answer != null && !answer.isEmpty());
+
+                        } catch (Exception e) {
+                            return Flux.just("抱歉，系统执行查询时遇到问题，请稍后重试。");
+                        }
+                    }
+
+                    // 2) 对用户可见输出：统一用“容错状态机”剥离<tool_call> 区块
+                    //    不再使用“未闭合 tool_call 就整段屏蔽”的策略，避免吞掉真正回答。
+                    String visible = filterVisibleChunk(content, filterState);
+                    return visible.isEmpty() ? Flux.empty() : Flux.just(visible);
+                });
+
+        // 手工拼接 SSE 帧，绕过 ServerSentEvent 编码差异；并在末尾发送 [DONE]
+        Flux<String> sseFlux = contentFlux
+                .map(this::toSseDataFrame)
+                .concatWith(Flux.just("data: [DONE]\n\n"));
+
+        return sseFlux;
+    }
+
+    @Override
+    public Flux<AssistantMessage> answerWithDocument(String topicId, String chatId, String question) throws Exception {
+        return langChainMilvusService.generateAnswerWithDocument(topicId, chatId, question);
+    }
+
+    private String toSseDataFrame(String data) {
+        if (data == null) {
+            return "data: \n\n";
+        }
+        // SSE 要求每一行都以 data: 开头
+        String normalized = data.replace("\r\n", "\n");
+        StringBuilder sb = new StringBuilder(normalized.length() + 16);
+        sb.append("data: ");
+        int start = 0;
+        while (true) {
+            int idx = normalized.indexOf('\n', start);
+            if (idx < 0) {
+                sb.append(normalized.substring(start));
+                break;
+            }
+            sb.append(normalized, start, idx);
+            sb.append("\n");
+            sb.append("data: ");
+            start = idx + 1;
+        }
+        sb.append("\n\n");
+        return sb.toString();
+    }
+
+    private static final class StreamFilterState {
+        boolean inToolCall = false;
+
+        void reset() {
+            inToolCall = false;
+        }
+    }
+
+    /**
+     * 对用户可见输出过滤：
+     * - 丢弃 <tool_call>...</tool_call> 内容（容错：缺失 </tool_call> 时，遇到空行分隔则自动退出 tool_call）
+     * 说明：工具调用检测/执行仍基于原始累积文本，不依赖该过滤器。
+     */
+    private String filterVisibleChunk(String chunk, StreamFilterState st) {
+        if (chunk == null || chunk.isEmpty()) {
+            return "";
+        }
+        String s = chunk.replace("\r\n", "\n");
+        StringBuilder out = new StringBuilder(s.length());
+        int i = 0;
+        while (i < s.length()) {
+            // 在 tool_call 内：优先寻找 </tool_call>；找不到则容错以空行分隔退出
+            if (st.inToolCall) {
+                int end = s.indexOf("</tool_call>", i);
+                if (end >= 0) {
+                    st.inToolCall = false;
+                    i = end + "</tool_call>".length();
+                    continue;
+                }
+                int sep = s.indexOf("\n\n", i);
+                if (sep >= 0) {
+                    st.inToolCall = false;
+                    i = sep + 2;
+                    continue;
+                }
+                // 剩余都认为在 tool_call 内
+                break;
+            }
+
+            // 不在任何区块内：找下一个起始标签
+            int nextTool = s.indexOf("<tool_call>", i);
+            int next;
+            if (nextTool == -1) {
+                out.append(s.substring(i));
+                break;
+            } else {
+                next = nextTool;
+            }
+
+            if (next > i) {
+                out.append(s, i, next);
+            }
+            st.inToolCall = true;
+            i = next + "<tool_call>".length();
+        }
+
+        // 兜底移除残留标签字面量（避免显示到前端）
+        return out.toString()
+                .replace("<tool_call>", "")
+                .replace("</tool_call>", "");
+    }
+
+}

oa-back/ruoyi-system/pom.xml

@@ -60,7 +60,7 @@
         <dependency>
             <groupId>org.noear</groupId>
             <artifactId>solon-ai</artifactId>
-            <version>3.5.1</version>
+            <version>3.9.5</version>
         </dependency>
 
         <dependency>

oa-back/ruoyi-system/src/main/java/com/ruoyi/llm/service/impl/CmcAgentServiceImpl.java

@@ -48,6 +48,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
 import java.io.*;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -77,10 +78,10 @@ public class CmcAgentServiceImpl implements ICmcAgentService
 
     private static final EmbeddingModel embeddingModel = new BgeSmallZhV15EmbeddingModel();
 
-    @Value("${llmService.url}")
+    @Value("${cmc.llmService.url}")
     private String llmServiceUrl;
 
-    @Value("${milvusService.url}")
+    @Value("${cmc.milvusService.url}")
     private String milvusServiceUrl;
 
     private MilvusClientV2 milvusClient;
@@ -90,10 +91,24 @@ public class CmcAgentServiceImpl implements ICmcAgentService
         if (milvusServiceUrl == null || milvusServiceUrl.isEmpty()) {
             throw new IllegalArgumentException("milvusServiceUrl 配置不能为空");
         }
-        milvusClient = new MilvusClientV2(
-                ConnectConfig.builder()
-                        .uri(milvusServiceUrl)
-                        .build());
+//        milvusClient = new MilvusClientV2(
+//                ConnectConfig.builder()
+//                        .uri(milvusServiceUrl)
+//                        .build());
+    }
+    
+    @PreDestroy
+    public void destroyMilvusClient() {
+        if (milvusClient != null) {
+            try {
+                // 关闭 Milvus 客户端，释放 gRPC 通道
+                milvusClient.close();
+                System.out.println("Milvus client closed successfully");
+            } catch (Exception e) {
+                System.err.println("Error closing Milvus client: " + e.getMessage());
+                e.printStackTrace();
+            }
+        }
     }
 
     /**

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcTrainApproval.java

@@ -39,6 +39,11 @@ public class CmcTrainApproval extends BaseEntity
     @Excel(name = "上报日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date reportTime;
 
+    /** 参培日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "参培日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date trainTime;
+
     /** 培训名称 */
     @Excel(name = "培训名称")
     private String trainName;
@@ -105,6 +110,15 @@ public class CmcTrainApproval extends BaseEntity
     {
         return reportTime;
     }
+    public void setTrainTime(Date trainTime)
+    {
+        this.trainTime = trainTime;
+    }
+
+    public Date getTrainTime()
+    {
+        return trainTime;
+    }
     public void setTrainName(String trainName) 
     {
         this.trainName = trainName;
@@ -199,6 +213,7 @@ public class CmcTrainApproval extends BaseEntity
             .append("participateId", getParticipateId())
             .append("userId", getUserId())
             .append("reportTime", getReportTime())
+            .append("trainTime", getTrainTime())
             .append("trainName", getTrainName())
             .append("content", getContent())
             .append("hours", getHours())

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcCarMapper.xml

@@ -50,6 +50,7 @@
             <if test="remark != null  and remark != ''"> and c.remark = #{remark}</if>
             <if test="status != null  and status != ''"> and c.status = #{status}</if>
         </where>
+        order by c.is_rent, c.car_id
     </select>
 
     <select id="selectCmcCarByCarId" parameterType="Integer" resultMap="CmcCarResult">

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcStudyMapper.xml

@@ -53,6 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="title != null "> and r.title like concat('%', #{title}, '%')</if>
             <if test="type != null "> and r.type like concat('%', #{type}, '%')</if>
         </where>
+        order by s.last_time desc
     </select>
 
     <select id="selectCmcStudyStatistic" parameterType="CmcStudy" resultMap="CmcStudyResult">

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcTrainApprovalMapper.xml

@@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="userId"    column="user_id"    />
         <result property="deptId"    column="dept_id"    />
         <result property="reportTime"    column="report_time"    />
+        <result property="trainTime"    column="train_time"    />
         <result property="trainName"    column="train_name"    />
         <result property="content"    column="content"    />
         <result property="document"    column="document"    />
@@ -37,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCmcTrainApprovalVo">
-        select ta.participate_id, ta.user_id, u.nick_name as report_nick_name, ta.dept_id, d.dept_name, ta.report_time, ta.train_name, ta.content,ta.document, ta.hours, ta.dept_user_id, u1.nick_name as dept_nick_name, ta.dept_time, ta.dept_comment from cmc_train_approval as ta
+        select ta.participate_id, ta.user_id, u.nick_name as report_nick_name, ta.dept_id, d.dept_name, ta.report_time, ta.train_time, ta.train_name, ta.content,ta.document, ta.hours, ta.dept_user_id, u1.nick_name as dept_nick_name, ta.dept_time, ta.dept_comment from cmc_train_approval as ta
         left join sys_user as u on u.user_id = ta.user_id
         left join sys_user as u1 on u1.user_id = ta.dept_user_id
         left join sys_dept as d on d.dept_id = ta.dept_id
@@ -49,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userId != null "> and ta.user_id = #{userId}</if>
             <if test="deptId != null "> and ta.dept_id = #{deptId}</if>
             <if test="reportTime != null "> and YEAR(ta.report_time) = YEAR(#{reportTime})</if>
+            <if test="reportTime != null "> and YEAR(ta.train_time) = YEAR(#{trainTime})</if>
             <if test="trainName != null  and trainName != ''"> and ta.train_name like concat('%', #{trainName}, '%')</if>
             <if test="content != null  and content != ''"> and ta.content = #{content}</if>
             <if test="document != null  and document != ''"> and ta.document = #{document}</if>
@@ -57,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptTime != null "> and ta.dept_time = #{deptTime}</if>
             <if test="deptComment != null  and deptComment != ''"> and ta.dept_comment = #{deptComment}</if>
         </where>
+        order by ta.report_time desc
     </select>
     
     <select id="selectCmcTrainApprovalByParticipateId" parameterType="String" resultMap="CmcTrainApprovalResult">
@@ -71,6 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userId != null">user_id,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="reportTime != null">report_time,</if>
+            <if test="trainTime != null">train_time,</if>
             <if test="trainName != null">train_name,</if>
             <if test="content != null">content,</if>
             <if test="document != null">document,</if>
@@ -84,6 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userId != null">#{userId},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="reportTime != null">#{reportTime},</if>
+            <if test="trainTime != null">#{trainTime},</if>
             <if test="trainName != null">#{trainName},</if>
             <if test="content != null">#{content},</if>
             <if test="document != null">#{document},</if>
@@ -100,6 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userId != null">user_id = #{userId},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="reportTime != null">report_time = #{reportTime},</if>
+            <if test="trainTime != null">train_time = #{trainTime},</if>
             <if test="trainName != null">train_name = #{trainName},</if>
             <if test="content != null">content = #{content},</if>
             <if test="document != null">document = #{document},</if>

oa-ui/src/api/llm/session.js

@@ -1,8 +1,8 @@
 /*
  * @Author: wrh
  * @Date: 2025-04-08 14:23:04
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-07-22 15:42:04
+ * @LastEditors: wrh
+ * @LastEditTime: 2026-03-11 10:29:17
  */
 import request from '@/utils/request'
 import { getToken } from '@/utils/auth'
@@ -25,258 +25,142 @@ export function getAnswerWithDocument(question) {
   })
 }
 
-// 流式回答API - 使用fetch API处理流式响应
-export function getAnswerStream(params, onMessage, onError, onComplete) {
-  const baseURL = process.env.VUE_APP_BASE_API
-  const url = `${baseURL}/llm/session/answer?topicId=${params.topicId}&question=${encodeURIComponent(params.question)}`
-
-  const controller = new AbortController()
-
-  fetch(url, {
-    method: 'GET',
-    headers: {
-      'Authorization': 'Bearer ' + getToken(),
-      'Accept': 'application/json, text/event-stream',
-      'Cache-Control': 'no-cache'
-    },
-    signal: controller.signal
-  }).then(response => {
-    if (!response.ok) {
-      throw new Error(`HTTP error! status: ${response.status}`)
+function parseSseEvents(buffer) {
+  // SSE 事件以空行分隔：\n\n（兼容 \r\n）
+  const events = []
+  const normalized = buffer.replace(/\r\n/g, '\n')
+  const parts = normalized.split('\n\n')
+  // 最后一段可能是不完整事件，留给下次拼接
+  const rest = parts.pop() ?? ''
+
+  for (const part of parts) {
+    if (!part.trim()) continue
+    const lines = part.split('\n')
+    const dataLines = []
+    for (const line of lines) {
+      if (line.startsWith('data:')) {
+        dataLines.push(line.slice(5).trimStart())
+      }
     }
+    const data = dataLines.join('\n')
+    if (data !== '') events.push(data)
+  }
 
-    const reader = response.body.getReader()
-    const decoder = new TextDecoder()
-    let buffer = ''
-
-    function readStream() {
-      return reader.read().then(({ done, value }) => {
-        if (done) {
-          if (buffer.trim()) {
-            const lines = buffer.split(/\r?\n/)
-            lines.forEach(line => {
-              line = line.trim()
-              if (!line || line.startsWith(':')) return
-
-              let jsonData = null
-              if (line.startsWith('data: ')) {
-                try {
-                  jsonData = JSON.parse(line.slice(6))
-                } catch (error) {
-                  console.error('解析剩余SSE数据失败:', error, line)
-                }
-              } else if (line.startsWith('data:')) {
-                try {
-                  jsonData = JSON.parse(line.slice(5))
-                } catch (error) {
-                  console.error('解析剩余SSE数据失败(无空格):', error, line)
-                }
-              } else {
-                try {
-                  jsonData = JSON.parse(line)
-                } catch (error) {
-                  console.error('解析剩余JSON数据失败:', error, line)
-                }
-              }
-
-              if (jsonData) {
-                if (jsonData.resultContent) {
-                  onMessage(jsonData.resultContent)
-                } else if (jsonData.choices && jsonData.choices[0] && jsonData.choices[0].delta && jsonData.choices[0].delta.content) {
-                  onMessage(jsonData.choices[0].delta.content)
-                } else if (typeof jsonData === 'string') {
-                  onMessage(jsonData)
-                }
-              }
-            })
-          }
-
-          onComplete()
-          return
-        }
-
-        const chunk = decoder.decode(value, { stream: true })
-        buffer += chunk
-
-        const lines = buffer.split(/\r?\n/)
-        buffer = lines.pop() || ''
-
-        lines.forEach(line => {
-          line = line.trim()
-          if (!line || line.startsWith(':')) return
-
-          let jsonData = null
-          if (line.startsWith('data: ')) {
-            try {
-              jsonData = JSON.parse(line.slice(6))
-            } catch (error) {
-              console.error('解析SSE数据失败:', error, line)
-            }
-          } else if (line.startsWith('data:')) {
-            try {
-              jsonData = JSON.parse(line.slice(5))
-            } catch (error) {
-              console.error('解析SSE数据失败(无空格):', error, line)
-            }
-          } else {
-            try {
-              jsonData = JSON.parse(line)
-            } catch (error) {
-              console.error('解析JSON数据失败:', error, line)
-            }
-          }
-
-          if (jsonData) {
-            if (jsonData.resultContent) {
-              onMessage(jsonData.resultContent)
-            } else if (typeof jsonData === 'string') {
-              onMessage(jsonData)
-            }
-          }
-        })
+  return { events, rest }
+}
 
-        return readStream()
-      })
-    }
+function normalizeSseData(data) {
+  if (data == null) return ''
+  let s = String(data)
+  // 有些后端会把 payload 自己也带上 "data:"，这里做兼容剥离
+  // 例如：data:data: xxx  ->  xxx
+  while (s.startsWith('data:')) {
+    s = s.slice(5)
+    if (s.startsWith(' ')) s = s.slice(1)
+  }
+  return s
+}
 
-    return readStream()
-  })
-    .catch(error => {
-      if (error.name === 'AbortError') {
-        console.log('请求被取消')
-        return
+function stripToolCallStream(text, state) {
+  if (!text) return ''
+  const s = String(text)
+  let i = 0
+  let out = ''
+  while (i < s.length) {
+    if (!state.inToolCall) {
+      const start = s.indexOf('<tool_call>', i)
+      if (start === -1) {
+        out += s.slice(i)
+        break
       }
-      console.error('流式请求错误:', error)
-      onError(new Error('网络连接失败，请检查网络连接后重试'))
-    })
-
-  return controller
+      out += s.slice(i, start)
+      state.inToolCall = true
+      i = start + '<tool_call>'.length
+    } else {
+      const end = s.indexOf('</tool_call>', i)
+      if (end === -1) {
+        // 剩余都在 tool_call 内，丢弃
+        return out
+      }
+      state.inToolCall = false
+      i = end + '</tool_call>'.length
+    }
+  }
+  return out
 }
 
-// 流式回答API（带文档）- 使用fetch API处理流式响应
-export function getAnswerWithDocumentStream(params, onMessage, onError, onComplete) {
-  const baseURL = process.env.VUE_APP_BASE_API
-  const url = `${baseURL}/llm/session/answerWithDocument?topicId=${params.topicId}&chatId=${params.chatId}&question=${encodeURIComponent(params.question)}`
-
+function streamFetchSse(url, onMessage, onError, onComplete) {
   const controller = new AbortController()
-
+  const toolCallState = { inToolCall: false }
   fetch(url, {
     method: 'GET',
     headers: {
       'Authorization': 'Bearer ' + getToken(),
-      'Accept': 'application/json, text/event-stream',
+      'Accept': 'text/event-stream',
       'Cache-Control': 'no-cache'
     },
     signal: controller.signal
-  }).then(response => {
-    if (!response.ok) {
-      throw new Error(`HTTP error! status: ${response.status}`)
-    }
-
-    const reader = response.body.getReader()
-    const decoder = new TextDecoder()
-    let buffer = ''
-
-    function readStream() {
-      return reader.read().then(({ done, value }) => {
-        if (done) {
-          if (buffer.trim()) {
-            const lines = buffer.split(/\r?\n/)
-            lines.forEach(line => {
-              line = line.trim()
-              if (!line || line.startsWith(':')) return
-
-              let jsonData = null
-              if (line.startsWith('data: ')) {
-                try {
-                  jsonData = JSON.parse(line.slice(6))
-                } catch (error) {
-                  console.error('解析剩余SSE数据失败:', error, line)
-                }
-              } else if (line.startsWith('data:')) {
-                try {
-                  jsonData = JSON.parse(line.slice(5))
-                } catch (error) {
-                  console.error('解析剩余SSE数据失败(无空格):', error, line)
-                }
-              } else {
-                try {
-                  jsonData = JSON.parse(line)
-                } catch (error) {
-                  console.error('解析剩余JSON数据失败:', error, line)
-                }
-              }
-
-              if (jsonData) {
-                if (jsonData.resultContent) {
-                  onMessage(jsonData.resultContent)
-                } else if (jsonData.choices && jsonData.choices[0] && jsonData.choices[0].delta && jsonData.choices[0].delta.content) {
-                  onMessage(jsonData.choices[0].delta.content)
-                } else if (typeof jsonData === 'string') {
-                  onMessage(jsonData)
-                }
-              }
-            })
+  })
+    .then(async (response) => {
+      if (!response.ok) throw new Error(`HTTP error! status: ${response.status}`)
+      if (!response.body) throw new Error('ReadableStream not supported')
+
+      const reader = response.body.getReader()
+      const decoder = new TextDecoder('utf-8')
+      let buffer = ''
+
+      while (true) {
+        const { done, value } = await reader.read()
+        if (done) break
+
+        buffer += decoder.decode(value, { stream: true })
+        const parsed = parseSseEvents(buffer)
+        buffer = parsed.rest
+
+        for (const data of parsed.events) {
+          const normalized = normalizeSseData(data)
+          if (normalized === '[DONE]') {
+            onComplete()
+            controller.abort()
+            return
           }
-
-          onComplete()
-          return
+          const visible = stripToolCallStream(normalized, toolCallState)
+          if (visible !== '') onMessage(visible)
         }
+      }
 
-        const chunk = decoder.decode(value, { stream: true })
-        buffer += chunk
-
-        const lines = buffer.split(/\r?\n/)
-        buffer = lines.pop() || ''
-
-        lines.forEach(line => {
-          line = line.trim()
-          if (!line || line.startsWith(':')) return
-
-          let jsonData = null
-          if (line.startsWith('data: ')) {
-            try {
-              jsonData = JSON.parse(line.slice(6))
-            } catch (error) {
-              console.error('解析SSE数据失败:', error, line)
-            }
-          } else if (line.startsWith('data:')) {
-            try {
-              jsonData = JSON.parse(line.slice(5))
-            } catch (error) {
-              console.error('解析SSE数据失败(无空格):', error, line)
-            }
-          } else {
-            try {
-              jsonData = JSON.parse(line)
-            } catch (error) {
-              console.error('解析JSON数据失败:', error, line)
-            }
-          }
-
-          if (jsonData) {
-            if (jsonData.resultContent) {
-              onMessage(jsonData.resultContent)
-            } else if (typeof jsonData === 'string') {
-              onMessage(jsonData)
-            }
+      // 兜底：流结束但没收到 [DONE]
+      if (buffer.trim()) {
+        const parsed = parseSseEvents(buffer + '\n\n')
+        for (const data of parsed.events) {
+          const normalized = normalizeSseData(data)
+          if (normalized !== '' && normalized !== '[DONE]') {
+            const visible = stripToolCallStream(normalized, toolCallState)
+            if (visible !== '') onMessage(visible)
           }
-        })
-
-        return readStream()
-      })
-    }
-
-    return readStream()
-  })
-    .catch(error => {
-      if (error.name === 'AbortError') {
-        console.log('请求被取消')
-        return
+        }
       }
+      onComplete()
+    })
+    .catch((error) => {
+      if (error.name === 'AbortError') return
       console.error('流式请求错误:', error)
-      onError(new Error('网络连接失败，请检查网络连接后重试'))
+      onError(error)
     })
 
   return controller
+}
+
+// 流式回答API（SSE）
+export function getAnswerStream(params, onMessage, onError, onComplete) {
+  const baseURL = process.env.VUE_APP_BASE_API
+  const url = `${baseURL}/llm/session/answer?topicId=${params.topicId}&question=${encodeURIComponent(params.question)}`
+  return streamFetchSse(url, onMessage, onError, onComplete)
+}
+
+// 流式回答API（带文档）- 简化版
+export function getAnswerWithDocumentStream(params, onMessage, onError, onComplete) {
+  const baseURL = process.env.VUE_APP_BASE_API
+  const url = `${baseURL}/llm/session/answerWithDocument?topicId=${params.topicId}&chatId=${params.chatId}&question=${encodeURIComponent(params.question)}`
+  return streamFetchSse(url, onMessage, onError, onComplete)
 }

oa-ui/src/views/flowable/form/changeForm.vue

@@ -7,19 +7,19 @@
             <el-button type="primary" size="mini" @click="openProject = true" v-if="taskName == '变更登记'">选择项目</el-button>
             <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="2" direction="vertical">
               <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
-                }}</el-descriptions-item>
+              }}</el-descriptions-item>
               <el-descriptions-item label="项目编号" label-class-name="my-label">{{ chooseProject.projectNumber
-                }}</el-descriptions-item>
+              }}</el-descriptions-item>
               <el-descriptions-item label="甲方单位" label-class-name="my-label">{{ chooseProject.partyA.partyAName
-                }}</el-descriptions-item>
+              }}</el-descriptions-item>
               <el-descriptions-item label="项目类型" label-class-name="my-label">{{ chooseProject.projectType
-                }}</el-descriptions-item>
+              }}</el-descriptions-item>
               <el-descriptions-item label="承担部门" label-class-name="my-label">{{
-      chooseProject.undertakingDeptName
-    }}</el-descriptions-item>
+                chooseProject.undertakingDeptName
+              }}</el-descriptions-item>
               <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeaderUser
-      ? chooseProject.projectLeaderUser.nickName : ''
-                }}</el-descriptions-item>=
+                ? chooseProject.projectLeaderUser.nickName : ''
+              }}</el-descriptions-item>=
             </el-descriptions>
           </el-form-item>
           <el-form-item label="变更内容" prop="content">
@@ -260,12 +260,12 @@ export default {
             const params = { taskId: this.taskForm.taskId };
             getNextFlowNode(params).then(res => {
               if (this.taskName == '变更登记') {
-                sendQyMessage(this.leaderList);
                 this.$set(this.taskForm.variables, "approvalList", this.leaderList);
                 complete(this.taskForm).then(response => {
                   this.$modal.msgSuccess(response.msg);
                   this.$emit('goBack')
                 });
+                this.sendQyMessage(this.leaderList);
               } else if (this.taskName == '变更确认') {
                 this.$modal.confirm('最后一个节点，提交将结束流程，是否提交？').then(() => {
                   complete(this.taskForm).then(response => {
@@ -284,12 +284,12 @@ export default {
             });
             const params = { taskId: this.taskForm.taskId };
             getNextFlowNode(params).then(res => {
-              sendQyMessage(this.leaderList);
               this.$set(this.taskForm.variables, "approvalList", this.leaderList);
               complete(this.taskForm).then(response => {
                 this.$modal.msgSuccess(response.msg);
                 this.$emit('goBack')
               });
+              this.sendQyMessage(this.leaderList);
             })
           }
         }
@@ -299,10 +299,10 @@ export default {
     async sendQyMessage(userIds) {
       if (userIds && userIds.length > 0) {
         let formData = new FormData();
-        let message = "经营发展部发起项目变更通知:  \n>" + 
-        "登记人：<font color='info'>" + this.getUserName(this.form.registrant) + "</font> \n>" + 
-        "变更项目：" + this.chooseProject.projectNumber + "-" + this.chooseProject.projectName + " \n>" + 
-        "变更内容：" + this.form.content + " \n>";
+        let message = "经营发展部发起项目变更通知:  \n>" +
+          "登记人：<font color='info'>" + this.getUserName(this.form.registrant) + "</font> \n>" +
+          "变更项目：" + this.chooseProject.projectNumber + "-" + this.chooseProject.projectName + " \n>" +
+          "变更内容：" + this.form.content + " \n>";
         formData.append('message', message);
         let userString = [];
         for (let u of userIds) {

oa-ui/src/views/flowable/form/oa/studyForm.vue

@@ -30,6 +30,12 @@
             </el-col>
           </el-row>
 
+          <el-form-item label="参培日期" prop="trainTime">
+            <el-date-picker clearable v-model="form.trainTime" type="date" value-format="yyyy-MM-dd"
+              placeholder="请选择参培日期" :disabled="taskName != '参培上报'">
+            </el-date-picker>
+          </el-form-item>
+
           <el-form-item label="主要内容" prop="content">
             <el-input v-model="form.content" type="textarea" :rows="4" placeholder="请输入主要内容"
               :disabled="taskName != '参培上报'" />
@@ -66,7 +72,8 @@
 
           <template v-if="taskName != '参培上报'">
             <el-form-item label="部门审核意见" prop="dept_comment">
-              <el-input v-model="form.deptComment" type="textarea" :rows="3" placeholder="请输入部门审核意见" :disabled="taskName != '部门审核'" />
+              <el-input v-model="form.deptComment" type="textarea" :rows="3" placeholder="请输入部门审核意见"
+                :disabled="taskName != '部门审核'" />
             </el-form-item>
 
             <el-row>
@@ -140,6 +147,7 @@ export default {
         userId: '',
         deptId: '',
         reportTime: '',
+        trainTime: '',
         trainName: '',
         content: '',
         document: '',
@@ -156,8 +164,8 @@ export default {
         applierUser: null
       },
       rules: {
-        reportTime: [
-          { required: true, message: '请选择上报日期', trigger: 'change' }
+        trainTime: [
+          { required: true, message: '请选择参培日期', trigger: 'change' }
         ],
         trainName: [
           { required: true, message: '请输入培训名称', trigger: 'blur' }

oa-ui/src/views/llm/chat/index.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2025-04-07 14:14:05
  * @LastEditors: wrh
- * @LastEditTime: 2025-12-17 16:24:24
+ * @LastEditTime: 2026-03-10 22:19:16
 -->
 <template>
   <div class="app-container">
@@ -217,8 +217,8 @@
                   </div>
                 </div>
               </div>
-              <!-- 加载状态 -->
-              <div v-if="isLoading" class="message-item ai">
+              <!-- 加载状态：仅在尚未收到首段流内容时显示，避免出现两个AI气泡 -->
+              <div v-if="isLoading && !streamingStarted" class="message-item ai">
                 <div class="message-avatar">
                   <div class="ai-avatar">
                     <img :src="logoImg" alt="AI" class="ai-logo" />
@@ -227,6 +227,7 @@
                 <div class="message-content">
                   <div class="message-bubble ai">
                     <div class="loading-dots">
+                      <span></span><span></span><span></span>
                     </div>
                   </div>
                 </div>
@@ -296,6 +297,67 @@ import { getAnswer, getAnswerWithDocument, getAnswerStream, getAnswerWithDocumen
 import logoImg from '@/assets/images/logo.png'
 import { marked } from 'marked';
 
+function createTypewriter(appender, options = {}) {
+  const intervalMs = typeof options.intervalMs === 'number' ? options.intervalMs : 25 // 约 40 字/秒
+  const maxCharsPerTick = typeof options.maxCharsPerTick === 'number' ? options.maxCharsPerTick : 1
+
+  let queue = ''
+  let timer = null
+  let ended = false
+  let onDrained = null
+
+  const tick = () => {
+    if (!queue) {
+      if (ended) {
+        if (timer) clearInterval(timer)
+        timer = null
+        if (onDrained) onDrained()
+      }
+      return
+    }
+
+    const n = Math.min(maxCharsPerTick, queue.length)
+    const chunk = queue.slice(0, n)
+    queue = queue.slice(n)
+    appender(chunk)
+  }
+
+  return {
+    push(text) {
+      if (!text) return
+      queue += text
+      if (!timer) timer = setInterval(tick, intervalMs)
+    },
+    end(cb) {
+      ended = true
+      onDrained = cb
+      if (!timer) timer = setInterval(tick, intervalMs)
+    },
+    stop() {
+      ended = true
+      queue = ''
+      if (timer) clearInterval(timer)
+      timer = null
+    }
+  }
+}
+
+function trimToLastSentenceEnd(text) {
+  const s = String(text || '')
+  // 句末标点：中文/英文句号、问号、叹号，或换行
+  const last = Math.max(
+    s.lastIndexOf('。'),
+    s.lastIndexOf('！'),
+    s.lastIndexOf('？'),
+    s.lastIndexOf('.'),
+    s.lastIndexOf('!'),
+    s.lastIndexOf('?'),
+    s.lastIndexOf('\n')
+  )
+  if (last === -1) return s.trim()
+  return s.slice(0, last + 1).trim()
+}
+
 export default {
   name: 'ChatView',
   data() {
@@ -321,6 +383,7 @@ export default {
       isUploading: false,
       documentChatId: '',
       messageFileMap: new Map(), // 存储消息对应的文件列表，key为chartId
+      streamingStarted: false,
       classifiedRecent: {
         today: [],
         yesterday: [],
@@ -512,11 +575,12 @@ export default {
         await this.createNewChat();
       }
       this.showNewChatWelcome = false;
+      this.streamingStarted = false;
       const userMessage = {
         userId: this.$store.state.user.id,
         input: this.inputMessage,
         topicId: this.currentTopicId,
-        inputTime: parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}'),
+        inputTime: this.parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}'),
         chatId: this.documentChatId || null
       };
 
@@ -554,7 +618,7 @@ export default {
         input: '',
         output: '',
         topicId: this.currentTopicId,
-        outputTime: parseTime(new Date(), '{y}-{m}-{d}')
+        outputTime: this.parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}')
       };
       this.chatMessages.push(aiMessage);
 
@@ -562,6 +626,15 @@ export default {
 
       this.isLoading = true;
 
+      const typewriter = createTypewriter((chunk) => {
+        aiMessage.output += chunk
+        aiMessage.outputTime = this.parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}')
+        this.$nextTick(() => this.scrollToBottom())
+      }, {
+        intervalMs: 25,
+        maxCharsPerTick: 1
+      })
+
       const streamParams = {
         topicId: this.currentTopicId,
         question: userMessage.input
@@ -574,12 +647,13 @@ export default {
           streamParams,
           (content) => {
             const that = this;
-            let cleanContent = content.replace(/<\/?think>/g, '');
-            if (!cleanContent.trim()) {
+            if (!that.streamingStarted) that.streamingStarted = true;
+
+            if (!content || !String(content).trim()) {
               return;
             }
-            aiMessage.output += cleanContent;
-            aiMessage.outputTime = parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}');
+
+            typewriter.push(String(content))
 
             if (window.responseTimeout) {
               clearTimeout(window.responseTimeout);
@@ -588,6 +662,7 @@ export default {
               if (that.isLoading) {
                 console.log('=== 响应超时强制结束 ===');
                 that.isLoading = false;
+                typewriter.stop()
                 if (window.responseTimeout) {
                   clearTimeout(window.responseTimeout);
                   window.responseTimeout = null;
@@ -595,9 +670,6 @@ export default {
               }
             }, 300000);
 
-            that.$nextTick(() => {
-              that.scrollToBottom();
-            });
           },
           (error) => {
             const that = this;
@@ -614,6 +686,7 @@ export default {
               aiMessage.output += '\n\n[回答生成中断]';
             }
             that.isLoading = false;
+            typewriter.stop()
 
             that.$nextTick(() => {
               that.scrollToBottom();
@@ -628,57 +701,60 @@ export default {
               window.responseTimeout = null;
             }
 
-            try {
-              // 保存用户消息
-              const savedUserMessage = await addChat({
-                ...that.chatMessages[userMessageIndex],
-                topicId: that.currentTopicId
-              });
-
-              // 保存AI消息
-              const savedMessage = await addChat({
-                ...aiMessage,
-                topicId: that.currentTopicId
-              });
-
-              if (savedUserMessage && savedUserMessage.chatId) {
-                that.$set(that.chatMessages, userMessageIndex, {
+            typewriter.end(async () => {
+              aiMessage.output = trimToLastSentenceEnd(aiMessage.output)
+              try {
+                // 保存用户消息
+                const savedUserMessage = await addChat({
                   ...that.chatMessages[userMessageIndex],
-                  chatId: savedUserMessage.chatId
+                  topicId: that.currentTopicId
                 });
-              }
 
-              if (savedMessage && savedMessage.chatId) {
-                that.$set(that.chatMessages, messageIndex, {
-                  ...that.chatMessages[messageIndex],
-                  chatId: savedMessage.chatId
+                // 保存AI消息
+                const savedMessage = await addChat({
+                  ...aiMessage,
+                  topicId: that.currentTopicId
                 });
-              }
 
-              if (uploadedFileId) {
-                try {
-                  const fileResponse = await listDocument({ chatId: uploadedFileId });
-                  if (fileResponse.rows && fileResponse.rows.length > 0) {
-                    const messageChatId = that.chatMessages[messageIndex].chatId;
-                    const keyToUse = messageChatId || uploadedFileId;
-                    that.messageFileMap.set(keyToUse, fileResponse.rows);
+                if (savedUserMessage && savedUserMessage.chatId) {
+                  that.$set(that.chatMessages, userMessageIndex, {
+                    ...that.chatMessages[userMessageIndex],
+                    chatId: savedUserMessage.chatId
+                  });
+                }
+
+                if (savedMessage && savedMessage.chatId) {
+                  that.$set(that.chatMessages, messageIndex, {
+                    ...that.chatMessages[messageIndex],
+                    chatId: savedMessage.chatId
+                  });
+                }
 
-                    if (!that.chatMessages[messageIndex].chatId) {
-                      that.$set(that.chatMessages[messageIndex], 'chatId', uploadedFileId);
+                if (uploadedFileId) {
+                  try {
+                    const fileResponse = await listDocument({ chatId: uploadedFileId });
+                    if (fileResponse.rows && fileResponse.rows.length > 0) {
+                      const messageChatId = that.chatMessages[messageIndex].chatId;
+                      const keyToUse = messageChatId || uploadedFileId;
+                      that.messageFileMap.set(keyToUse, fileResponse.rows);
+
+                      if (!that.chatMessages[messageIndex].chatId) {
+                        that.$set(that.chatMessages[messageIndex], 'chatId', uploadedFileId);
+                      }
                     }
+                  } catch (error) {
+                    console.error('Failed to load files for new message:', error);
                   }
-                } catch (error) {
-                  console.error('Failed to load files for new message:', error);
                 }
+              } catch (error) {
+                console.error('保存消息失败:', error);
               }
-            } catch (error) {
-              console.error('保存消息失败:', error);
-            }
 
-            that.isLoading = false;
-            that.$nextTick(() => {
-              that.scrollToBottom();
-            });
+              that.isLoading = false;
+              that.$nextTick(() => {
+                that.scrollToBottom();
+              });
+            })
           }
         );
       } else {
@@ -686,12 +762,22 @@ export default {
           streamParams,
           (content) => {
             const that = this;
-            let cleanContent = content.replace(/<\/?think>/g, '');
-            if (!cleanContent.trim()) {
+            if (!that.streamingStarted) that.streamingStarted = true;
+
+            if (!content || !String(content).trim()) {
               return;
             }
-            aiMessage.output += cleanContent;
-            aiMessage.outputTime = parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}');
+
+            // 过滤不完整的句子（以逗号、顿号等结尾）
+            const trimmed = String(content).trim();
+            if (trimmed.length > 0 && trimmed.length < 30) {
+              const lastChar = trimmed.charAt(trimmed.length - 1);
+              if (lastChar === '，' || lastChar === '、' || lastChar === '：' || lastChar === ':') {
+                return;
+              }
+            }
+
+            typewriter.push(trimmed)
 
             if (window.responseTimeout) {
               clearTimeout(window.responseTimeout);
@@ -700,6 +786,7 @@ export default {
               if (that.isLoading) {
                 console.log('=== 响应超时强制结束 ===');
                 that.isLoading = false;
+                typewriter.stop()
                 if (window.responseTimeout) {
                   clearTimeout(window.responseTimeout);
                   window.responseTimeout = null;
@@ -707,9 +794,6 @@ export default {
               }
             }, 300000);
 
-            that.$nextTick(() => {
-              that.scrollToBottom();
-            });
           },
           (error) => {
             const that = this;
@@ -726,6 +810,7 @@ export default {
               aiMessage.output += '\n\n[回答生成中断]';
             }
             that.isLoading = false;
+            typewriter.stop()
 
             that.$nextTick(() => {
               that.scrollToBottom();
@@ -740,46 +825,55 @@ export default {
               window.responseTimeout = null;
             }
 
-            try {
-              // 保存用户消息
-              const savedUserMessage = await addChat({
-                ...that.chatMessages[userMessageIndex],
-                topicId: that.currentTopicId
-              });
-
-              // 保存AI消息
-              const savedMessage = await addChat({
-                ...aiMessage,
-                topicId: that.currentTopicId
-              });
-
-              if (savedUserMessage && savedUserMessage.chatId) {
-                that.$set(that.chatMessages, userMessageIndex, {
+            typewriter.end(async () => {
+              aiMessage.output = trimToLastSentenceEnd(aiMessage.output)
+              try {
+                // 保存用户消息
+                const savedUserMessage = await addChat({
                   ...that.chatMessages[userMessageIndex],
-                  chatId: savedUserMessage.chatId
+                  topicId: that.currentTopicId
                 });
-              }
 
-              if (savedMessage && savedMessage.chatId) {
-                that.$set(that.chatMessages, messageIndex, {
-                  ...that.chatMessages[messageIndex],
-                  chatId: savedMessage.chatId
+                // 保存AI消息
+                const savedMessage = await addChat({
+                  ...aiMessage,
+                  topicId: that.currentTopicId
                 });
+
+                if (savedUserMessage && savedUserMessage.chatId) {
+                  that.$set(that.chatMessages, userMessageIndex, {
+                    ...that.chatMessages[userMessageIndex],
+                    chatId: savedUserMessage.chatId
+                  });
+                }
+
+                if (savedMessage && savedMessage.chatId) {
+                  that.$set(that.chatMessages, messageIndex, {
+                    ...that.chatMessages[messageIndex],
+                    chatId: savedMessage.chatId
+                  });
+                }
+              } catch (error) {
+                console.error('保存消息失败:', error);
               }
-            } catch (error) {
-              console.error('保存消息失败:', error);
-            }
 
-            that.isLoading = false;
-            that.$nextTick(() => {
-              that.scrollToBottom();
-            });
+              that.isLoading = false;
+              that.$nextTick(() => {
+                that.scrollToBottom();
+              });
+            })
           }
         );
       }
 
       window.currentChatController = streamController;
     },
+    //简化formatMessage方法，不再需要复杂的过滤
+    formatMessage(content) {
+      // 直接使用marked解析markdown内容，不需要额外过滤
+      // 因为后端和session.js已经处理干净了
+      return marked(content);
+    },
 
     handleKeyDown(event) {
       if (event.key === 'Enter') {
@@ -853,7 +947,7 @@ export default {
 
     formatMessageTime(time) {
       if (!time) return '';
-      const date = parseTime(new Date(time), '{y}-{m}-{d}');
+      const date = this.parseTime(new Date(time), '{y}-{m}-{d}');
       return date;
     },
 
@@ -1503,7 +1597,8 @@ export default {
 }
 
 /* Markdown样式 */
-.message-bubble >>> .message-text {
+.message-bubble>>>.message-text {
+
   /* 标题样式 */
   h1 {
     font-size: 24px;
@@ -1526,7 +1621,9 @@ export default {
     color: #333;
   }
 
-  h4, h5, h6 {
+  h4,
+  h5,
+  h6 {
     font-size: 16px;
     font-weight: 600;
     margin: 10px 0 6px 0;
@@ -1540,7 +1637,8 @@ export default {
   }
 
   /* 列表样式 */
-  ul, ol {
+  ul,
+  ol {
     margin: 8px 0;
     padding-left: 24px;
   }
@@ -1592,7 +1690,8 @@ export default {
     margin: 12px 0;
   }
 
-  th, td {
+  th,
+  td {
     border: 1px solid #e9ecef;
     padding: 8px 12px;
     text-align: left;

oa-ui/src/views/oa/study/approval.vue

@@ -15,9 +15,9 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="参会日期" prop="reportTime">
-        <el-date-picker clearable v-model="queryParams.reportTime" type="date" value-format="yyyy-MM-dd"
-          placeholder="请选择参会日期">
+      <el-form-item label="参培日期" prop="trainTime">
+        <el-date-picker clearable v-model="queryParams.trainTime" type="date" value-format="yyyy-MM-dd"
+          placeholder="请选择参培日期">
         </el-date-picker>
       </el-form-item>
       <el-form-item>
@@ -43,9 +43,9 @@
       <!-- <el-table-column label="参培id" align="center" prop="participateId" /> -->
       <el-table-column label="参会人" align="center" prop="reportUser.nickName" />
       <el-table-column label="部门" align="center" prop="dept.deptName" />
-      <el-table-column label="参会日期" align="center" prop="reportTime" width="180">
+      <el-table-column label="参培日期" align="center" prop="trainTime" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.reportTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.trainTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="培训名称" align="center" prop="trainName" />
@@ -79,9 +79,9 @@
         <el-form-item label="参会人" prop="userId">
           {{ getUserName(form.userId) }}
         </el-form-item>
-        <el-form-item label="参会日期" prop="reportTime">
-          <el-date-picker clearable v-model="form.reportTime" type="date" value-format="yyyy-MM-dd"
-            placeholder="请选择参会日期">
+        <el-form-item label="参培日期" prop="trainTime">
+          <el-date-picker clearable v-model="form.trainTime" type="date" value-format="yyyy-MM-dd"
+            placeholder="请选择参培日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="培训名称" prop="trainName">
@@ -126,9 +126,9 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="参会日期" prop="reportTime">
-          <el-date-picker clearable v-model="addForm.reportTime" type="date" value-format="yyyy-MM-dd"
-            placeholder="请选择参会日期">
+        <el-form-item label="参培日期" prop="trainTime">
+          <el-date-picker clearable v-model="addForm.trainTime" type="date" value-format="yyyy-MM-dd"
+            placeholder="请选择参培日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="学时" prop="hours">
@@ -198,8 +198,8 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        reportTime: [
-          { required: true, message: "参会日期不能为空", trigger: "change" }
+        trainTime: [
+          { required: true, message: "参培日期不能为空", trigger: "change" }
         ],
         trainName: [
           { required: true, message: "培训名称不能为空", trigger: "blur" }
@@ -223,8 +223,8 @@ export default {
         userIdList: [
           { required: true, type: 'array', min: 1, message: "请至少选择一位参会人", trigger: "change" }
         ],
-        reportTime: [
-          { required: true, message: "参会日期不能为空", trigger: "change" }
+        trainTime: [
+          { required: true, message: "参培日期不能为空", trigger: "change" }
         ],
         trainName: [
           { required: true, message: "培训名称不能为空", trigger: "blur" }
@@ -384,7 +384,7 @@ export default {
               participateId: snowflake.nextId().toString(),
               userId: userId, // 参会人员ID
               deptId: deptId, // 用户的部门ID
-              reportTime: this.addForm.reportTime, // 当前日期作为参会日期
+              trainTime: this.addForm.trainTime, // 当前日期作为参培日期
               trainName: this.addForm.trainName,
               content: this.addForm.content,
               hours: this.addForm.hours,