合同内项目信息路由跳转问题

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -89,7 +89,7 @@ public class SysUserController extends BaseController
             List<Long> userPostList = postService.selectPostListByUserId(sysUser.getUserId());
             if (userPostList.size() > 0) {
                 for (Long post : userPostList)
-                    postName.append(postService.selectPostById(post).getPostName()).append("、");
+                    postName.append(postService.selectPostById(post).getPostName()).append("/");
                 sysUser.setPostNames(postName.substring(0, postName.length() - 1));
             }
         }
@@ -108,7 +108,7 @@ public class SysUserController extends BaseController
             StringBuilder postName = new StringBuilder();
             List<Long> userPostList = postService.selectPostListByUserId(sysUser.getUserId());
             for (Long post : userPostList)
-                postName.append(postService.selectPostById(post).getPostName()).append("、");
+                postName.append(postService.selectPostById(post).getPostName()).append("/");
             if (!postName.toString().equals(""))
                 sysUser.setPostNames(postName.substring(0, postName.length() - 1));
             sysUser.setUserId(sysUser.getUserId() - 1);

oa-back/ruoyi-agent/pom.xml

@@ -83,6 +83,12 @@
             <artifactId>langchain4j-document-parser-apache-pdfbox</artifactId>
             <version>0.35.0</version>
         </dependency>
+        <!-- MySQL 驱动依赖 -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>8.0.33</version>
+        </dependency>
     </dependencies>
 
     <dependencyManagement>

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

@@ -1,5 +1,6 @@
 package com.ruoyi.agent.service.impl;
 
+import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.agent.service.IMcpService;
 import dev.langchain4j.data.document.Document;
@@ -26,7 +27,6 @@ import org.apache.poi.extractor.POITextExtractor;
 import org.apache.poi.extractor.ExtractorFactory;
 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;
@@ -40,6 +40,7 @@ import org.noear.solon.annotation.Param;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.PostConstruct;
 import java.io.*;
 import java.sql.*;
 import java.util.*;
@@ -50,24 +51,39 @@ public class McpServiceImpl implements IMcpService {
 
     private static final EmbeddingModel embeddingModel = new BgeSmallZhV15EmbeddingModel();
 
-    @Value("${llmService.url}")
-    private static String llmServiceUrl;
+    @Value("${cmc.llmService.url}")
+    private String llmServiceUrl;
 
-    @Value("${lmilvusService.url}")
-    private static String milvusServiceUrl;
+    @Value("${cmc.milvusService.url}")
+    private String milvusServiceUrl;
 
-    @Value("${mysqlService.jdbcUrl}")
-    private static String url ;
+    @Value("${cmc.mysqlService.jdbcUrl}")
+    private String url ;
 
-    @Value("${mysqlService.username}")
-    private static String user;
+    @Value("${cmc.mysqlService.username}")
+    private String user;
 
-    @Value("${mysqlService.password}")
-    private static String password;
+    @Value("${cmc.mysqlService.password}")
+    private String password;
 
     @Value("${cmc.profile}")
-    private static String profile;
+    private String profile;
 
+    private MilvusClientV2 milvusClient;
+    
+    /**
+     * 初始化 Milvus 客户端
+     */
+    @PostConstruct
+    public void initMilvusClient() {
+        if (milvusServiceUrl == null || milvusServiceUrl.trim().isEmpty()) {
+            throw new IllegalStateException("Milvus service URL 未配置");
+        }
+//        this.milvusClient = new MilvusClientV2(
+//                ConnectConfig.builder()
+//                        .uri(milvusServiceUrl)
+//                        .build());
+    }
     /**
      * 调用LLM+RAG（外部文件+知识库）生成回答
      */
@@ -92,34 +108,32 @@ public class McpServiceImpl implements IMcpService {
     /**
      * 查询OA数据生成回答
      */
-    @ToolMapping(description = "数据查询")
-    public AssistantMessage SQLQuery(@Param(description = "sql语句") String sqlString) throws Exception
+    @ToolMapping(description = "执行SQL查询")
+    public JSONArray SQLQuery(@Param(description = "sql语句") String sqlString)
     {
-            try {
-                List<Map<String, Object>> data = executeQuery(sqlString, 100.0);
-                return ChatMessage.ofAssistant(generateAnswer(sqlString));
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
+            sqlString = sqlString.replace("[","").replace("]","");
+            return executeQuery(sqlString);
     }
 
-    public static List<Map<String, Object>> executeQuery(String sql, Object... params) {
-        List<Map<String, Object>> result = new ArrayList<>();
+    public JSONArray executeQuery(String sql) {
+        JSONArray result = new JSONArray();
+
+        try {
+            // 显式加载 MySQL 驱动
+            Class.forName("com.mysql.cj.jdbc.Driver");
+        } catch (ClassNotFoundException e) {
+            throw new RuntimeException("MySQL 驱动未找到", e);
+        }
 
         try (Connection conn = DriverManager.getConnection(url, user, password);
              PreparedStatement stmt = conn.prepareStatement(sql)) {
 
-            // 设置参数
-            for (int i = 0; i < params.length; i++) {
-                stmt.setObject(i + 1, params[i]);
-            }
-
             ResultSet rs = stmt.executeQuery();
             ResultSetMetaData metaData = rs.getMetaData();
             int columnCount = metaData.getColumnCount();
 
             while (rs.next()) {
-                Map<String, Object> row = new HashMap<>();
+                JSONObject row = new JSONObject();
                 for (int i = 1; i <= columnCount; i++) {
                     String columnName = metaData.getColumnLabel(i);
                     Object value = rs.getObject(i);
@@ -362,10 +376,6 @@ public class McpServiceImpl implements IMcpService {
      * @return
      */
     private List<List<SearchResp.SearchResult>> retrieve(String collectionName, String query, int topK) {
-        MilvusClientV2 milvusClient = new MilvusClientV2(
-                ConnectConfig.builder()
-                        .uri(milvusServiceUrl)
-                        .build());
         List<BaseVector> queryVector = Collections.singletonList(new FloatVec(embeddingModel.embed(query).content().vector()));
 
         //  加载集合

oa-back/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -192,6 +192,9 @@ public class SysUser extends BaseEntity
     })
     private SysDept dept;
 
+    @Excel(name = "备注")
+    private String remark;
+
     private CmcPostSalary salary;
 
     /** 角色对象 */
@@ -692,6 +695,16 @@ public class SysUser extends BaseEntity
     {
         return telephone;
     }
+    public String getRemark()
+    {
+        return remark;
+    }
+
+    public void setRemark(String remark)
+    {
+        this.remark = remark;
+    }
+
 
     @Override
     public String toString() {

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

@@ -27,16 +27,13 @@ public class RagController extends BaseController
     @Autowired
     private ILangChainMilvusService langChainMilvusService;
 
-    @Value("${llmService.url}")
-    private String llmServiceUrl;
-
     /**
      * 调用LLM+RAG（知识库）生成回答
      */
     @GetMapping("/answer")
     public Flux<AssistantMessage> answerWithCollection(String collectionName, String topicId, String question) throws IOException {
         List<JSONObject> contexts = langChainMilvusService.retrieveFromMilvus(collectionName, question, 10);
-        return langChainMilvusService.generateAnswerWithCollection(topicId, question, contexts, llmServiceUrl);
+        return langChainMilvusService.generateAnswerWithCollection(topicId, question, contexts);
     }
 
     /**

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

@@ -1,8 +1,20 @@
 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 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.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -10,11 +22,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import reactor.core.publisher.Flux;
 
-import java.io.IOException;
+import java.io.*;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * session对话Controller
- * 
+ *
  * @author cmc
  * @date 2025-04-08
  */
@@ -22,6 +36,9 @@ import java.io.IOException;
 @RequestMapping("/llm/session")
 public class SessionController extends BaseController
 {
+    @Autowired
+    private ICmcChatService cmcChatService;
+
     @Autowired
     private ILangChainMilvusService langChainMilvusService;
 
@@ -32,8 +49,72 @@ public class SessionController extends BaseController
      * 生成回答
      */
     @GetMapping("/answer")
-    public Flux<AssistantMessage> answer(String topicId, String question) {
-        return langChainMilvusService.generateAnswer(topicId, question, llmServiceUrl);
+    public Flux<AssistantMessage> answer(String topicId, String question) throws IOException {
+        McpClientProvider clientProvider = McpClientProvider.builder()
+                .channel(McpChannel.SSE)
+                .url("http://localhost:8080/mcp/sse")
+                .build();
+        ChatModel chatModel = ChatModel.of(llmServiceUrl)
+                .model("Qwen2.5-7B-Instruct")
+                .defaultToolsAdd(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()));
+        }
+        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. 给生成的字段取一个简短的中文名称  \n" +
+                "6. 输出格式：使用[]包含sql文本，例如:[select 1 from dual]\n";
+        messages.add(ChatMessage.ofUser(prompt));
+        ChatSession chatSession =  InMemoryChatSession.builder().messages(messages).build();
+        ChatResponse response = chatModel.prompt(chatSession).call();
+        String resultContent = response.lastChoice().getMessage().getResultContent();
+
+        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";
+            return langChainMilvusService.generateAnswer(topicId, resultContent);
+        } else {
+            // 不需要调用工具，直接返回原始响应，避免重复调用大模型
+            // 创建一个包含原始响应内容的 AssistantMessage 并返回 Flux
+            AssistantMessage assistantMessage = ChatMessage.ofAssistant(resultContent);
+            return Flux.just(assistantMessage);
+        }
     }
 
     /**
@@ -42,7 +123,7 @@ public class SessionController extends BaseController
     @GetMapping("/answerWithDocument")
     public Flux<AssistantMessage> answerWithDocument(String topicId, String chatId, String question) throws Exception
     {
-        return langChainMilvusService.generateAnswerWithDocument(topicId, chatId, question, llmServiceUrl);
+        return langChainMilvusService.generateAnswerWithDocument(topicId, chatId, question);
     }
 
 }

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

@@ -5,7 +5,6 @@ import org.noear.solon.ai.chat.message.AssistantMessage;
 import org.springframework.web.multipart.MultipartFile;
 import reactor.core.publisher.Flux;
 
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.List;
 
@@ -40,25 +39,25 @@ public interface ILangChainMilvusService {
      * 调用LLM生成回答
      * @return
      */
-    public Flux<AssistantMessage> generateAnswer(String topicId, String question, String llmServiceUrl);
+    public Flux<AssistantMessage> generateAnswer(String topicId, String question);
 
     /**
      * 调用LLM+RAG（知识库）生成回答
      * @return
      */
-    public Flux<AssistantMessage> generateAnswerWithCollection(String topicId, String question, List<JSONObject> contexts, String llmServiceUrl);
+    public Flux<AssistantMessage> generateAnswerWithCollection(String topicId, String question, List<JSONObject> contexts);
 
     /**
      * 调用LLM+RAG（外部文件）生成回答
      * @return
      */
-    public Flux<AssistantMessage> generateAnswerWithDocument(String topicId, String chatId, String question, String llmServiceUrl) throws Exception;
+    public Flux<AssistantMessage> generateAnswerWithDocument(String topicId, String chatId, String question) throws Exception;
 
     /**
      * 调用LLM+RAG（外部文件+知识库）生成回答
      * @return
      */
-    public Flux<AssistantMessage> generateAnswerWithDocumentAndCollection(String topicId, String question,  List<JSONObject> requests, String llmServiceUrl) throws Exception;
+    public Flux<AssistantMessage> generateAnswerWithDocumentAndCollection(String topicId, String question,  List<JSONObject> requests) throws Exception;
 
     /**
      * 获取二级标题下三级标题列表

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

@@ -49,6 +49,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 import reactor.core.publisher.Flux;
 
+import javax.annotation.PostConstruct;
 import java.io.*;
 import java.util.*;
 
@@ -71,6 +72,19 @@ public class LangChainMilvusServiceImpl implements ILangChainMilvusService
     @Value("${milvusService.url}")
     private String milvusServiceUrl;
 
+    private MilvusClientV2 milvusClient;
+
+    @PostConstruct
+    public void initMilvusClient() {
+        if (milvusServiceUrl == null || milvusServiceUrl.isEmpty()) {
+            throw new IllegalArgumentException("milvusServiceUrl 配置不能为空");
+        }
+//        milvusClient = new MilvusClientV2(
+//                ConnectConfig.builder()
+//                        .uri(milvusServiceUrl)
+//                        .build());
+    }
+
     /**
      * 上传多文件
      *
@@ -87,20 +101,20 @@ public class LangChainMilvusServiceImpl implements ILangChainMilvusService
     @Override
     public int insertLangchainEmbeddingDocument(MultipartFile[] fileList, String collectionName)
     {
-        MilvusClientV2 milvusClient = new MilvusClientV2(
-                ConnectConfig.builder()
-                        .uri(llmServiceUrl)
-                        .build());
         processValue = "";
         int successfullyInsertedFiles = 0;
 
         for (int i = 0; i < fileList.length; i++) {
             MultipartFile file = fileList[i];
             try {
-                File profilePath = new File( RuoYiConfig.getProfile() + "/upload/rag/knowledge/" + collectionName);
+                // 构建上传目录路径
+                String uploadDir = RuoYiConfig.getProfile() + "/upload/rag/knowledge/" + collectionName;
+                File profilePath = new File(uploadDir);
+                
+                // 确保目录存在，创建目录并设置权限
                 if (!profilePath.exists())
                     profilePath.mkdirs();
-                File transferFile = new File( profilePath + "/" + file.getOriginalFilename());
+                File transferFile = new File(profilePath, file.getOriginalFilename());
                 if (!transferFile.exists())
                     file.transferTo(transferFile);
                 List<TextSegment> segments = splitDocument(transferFile);
@@ -213,7 +227,7 @@ public class LangChainMilvusServiceImpl implements ILangChainMilvusService
      * @return
      */
     @Override
-    public Flux<AssistantMessage> generateAnswer(String topicId, String prompt, String llmServiceUrl) {
+    public Flux<AssistantMessage> generateAnswer(String topicId, String prompt) {
         ChatModel chatModel = ChatModel.of(llmServiceUrl)
 
                 .model("Qwen2.5-7B-Instruct")
@@ -241,7 +255,7 @@ public class LangChainMilvusServiceImpl implements ILangChainMilvusService
      * @return
      */
     @Override
-    public Flux<AssistantMessage> generateAnswerWithCollection(String topicId, String question, List<JSONObject> contexts, String llmServiceUrl) {
+    public Flux<AssistantMessage> generateAnswerWithCollection(String topicId, String question, List<JSONObject> contexts) {
         StringBuilder sb = new StringBuilder();
         sb.append("问题: ").append(question).append("\n\n");
         sb.append("根据以下上下文回答问题：\n\n");
@@ -251,14 +265,14 @@ public class LangChainMilvusServiceImpl implements ILangChainMilvusService
                     .append("上下文").append(": ")
                     .append(context.getString("content")).append("\n\n");
         }
-        return generateAnswer(topicId, sb.toString(), llmServiceUrl);
+        return generateAnswer(topicId, sb.toString());
     }
 
     /**
      * 调用LLM生成回答
      */
     @Override
-    public Flux<AssistantMessage> generateAnswerWithDocument(String topicId, String chatId, String question, String llmServiceUrl) throws Exception {
+    public Flux<AssistantMessage> generateAnswerWithDocument(String topicId, String chatId, String question) throws Exception {
         CmcDocument cmcDocument = new CmcDocument();
         cmcDocument.setChatId(chatId);
         List<CmcDocument> documentList = cmcDocumentService.selectCmcDocumentList(cmcDocument);
@@ -284,14 +298,14 @@ public class LangChainMilvusServiceImpl implements ILangChainMilvusService
                         .append(contexts).append("\n\n");
             }
         }
-        return generateAnswer(topicId, sb.toString(), llmServiceUrl);
+        return generateAnswer(topicId, sb.toString());
     }
 
     /**
      * 调用LLM生成回答
      */
     @Override
-    public Flux<AssistantMessage> generateAnswerWithDocumentAndCollection(String topicId, String question, List<JSONObject> contexts, String llmServiceUrl) throws Exception {
+    public Flux<AssistantMessage> generateAnswerWithDocumentAndCollection(String topicId, String question, List<JSONObject> contexts) throws Exception {
         StringBuilder sb = new StringBuilder("招标文件内容：\n\n");
         CmcChat cmcChat = new CmcChat();
         cmcChat.setTopicId(topicId);
@@ -328,7 +342,7 @@ public class LangChainMilvusServiceImpl implements ILangChainMilvusService
 //                    .append("段落格式").append(": ")
 //                    .append(context.getString("content")).append("\n\n");
 //        }
-        return generateAnswer(topicId, sb.toString(), llmServiceUrl);
+        return generateAnswer(topicId, sb.toString());
     }
 
     /**
@@ -374,10 +388,6 @@ public class LangChainMilvusServiceImpl implements ILangChainMilvusService
      * @return
      */
     private List<List<SearchResp.SearchResult>> retrieve(String collectionName, String query, int topK) {
-        MilvusClientV2 milvusClient = new MilvusClientV2(
-                ConnectConfig.builder()
-                        .uri(milvusServiceUrl)
-                        .build());
         List<BaseVector> queryVector = Collections.singletonList(new FloatVec(embeddingModel.embed(query).content().vector()));
 
         //  加载集合

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

@@ -16,6 +16,7 @@ import io.milvus.v2.service.vector.response.QueryResp;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.PostConstruct;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -26,15 +27,24 @@ public class MilvusServiceImpl implements IMilvusService {
     @Value("${milvusService.url}")
     private String milvusServiceUrl;
 
+    private MilvusClientV2 milvusClient;
+
+    @PostConstruct
+    public void initMilvusClient() {
+        if (milvusServiceUrl == null || milvusServiceUrl.isEmpty()) {
+            throw new IllegalArgumentException("milvusServiceUrl 配置不能为空");
+        }
+//        milvusClient = new MilvusClientV2(
+//                ConnectConfig.builder()
+//                        .uri(milvusServiceUrl)
+//                        .build());
+    }
+
     /**
      * 新建知识库Collection（含Schema、Field、Index）
      */
     @Override
     public void createCollection(String collectionName, String description, int dimension) {
-        MilvusClientV2 milvusClient = new MilvusClientV2(
-                ConnectConfig.builder()
-                        .uri(milvusServiceUrl)
-                        .build());
         CreateCollectionReq.CollectionSchema schema = MilvusClientV2.CreateSchema();
 
         schema.addField(AddFieldReq.builder()
@@ -93,10 +103,6 @@ public class MilvusServiceImpl implements IMilvusService {
      */
     @Override
     public JSONArray getCollectionNames() {
-        MilvusClientV2 milvusClient = new MilvusClientV2(
-                ConnectConfig.builder()
-                        .uri(milvusServiceUrl)
-                        .build());
         JSONArray jsonArray = new JSONArray();
         ListCollectionsResp listResponse = milvusClient.listCollections();
         if (listResponse != null) {
@@ -126,10 +132,6 @@ public class MilvusServiceImpl implements IMilvusService {
      */
     @Override
     public JSONArray listKnowLedgeByCollectionName(String collectionName) {
-        MilvusClientV2 milvusClient = new MilvusClientV2(
-                ConnectConfig.builder()
-                        .uri(milvusServiceUrl)
-                        .build());
         JSONArray jsonArray = new JSONArray();
         ListCollectionsResp listResponse = milvusClient.listCollections();
 
@@ -161,10 +163,6 @@ public class MilvusServiceImpl implements IMilvusService {
      */
     @Override
     public void collectionRename(String collectionName, String newCollectionName) {
-        MilvusClientV2 milvusClient = new MilvusClientV2(
-                ConnectConfig.builder()
-                        .uri(milvusServiceUrl)
-                        .build());
         RenameCollectionReq renameCollectionReq = RenameCollectionReq.builder()
                 .collectionName(collectionName)
                 .newCollectionName(newCollectionName)
@@ -178,10 +176,6 @@ public class MilvusServiceImpl implements IMilvusService {
      */
     @Override
     public void deleteCollectionName(String collectionName) {
-        MilvusClientV2 milvusClient = new MilvusClientV2(
-                ConnectConfig.builder()
-                        .uri(milvusServiceUrl)
-                        .build());
         DropCollectionReq dropCollectionReq = DropCollectionReq.builder()
                 .collectionName(collectionName)
                 .build();
@@ -193,10 +187,6 @@ public class MilvusServiceImpl implements IMilvusService {
      */
     @Override
     public List<String> listDocument(String collectionName, String fileType) {
-        MilvusClientV2 milvusClient = new MilvusClientV2(
-                ConnectConfig.builder()
-                        .uri(milvusServiceUrl)
-                        .build());
         List<String> documentList = new ArrayList<>();
         LoadCollectionReq loadCollectionReq = LoadCollectionReq.builder()
                 .collectionName(collectionName)
@@ -233,10 +223,6 @@ public class MilvusServiceImpl implements IMilvusService {
      */
     @Override
     public void removeDocument(String collectionName, String fileName) {
-        MilvusClientV2 milvusClient = new MilvusClientV2(
-                ConnectConfig.builder()
-                        .uri(milvusServiceUrl)
-                        .build());
         LoadCollectionReq loadCollectionReq = LoadCollectionReq.builder()
                 .collectionName(collectionName)
                 .build();
@@ -253,10 +239,6 @@ public class MilvusServiceImpl implements IMilvusService {
      */
     @Override
     public void removeAllDocument(String collectionName) {
-        MilvusClientV2 milvusClient = new MilvusClientV2(
-                ConnectConfig.builder()
-                        .uri(milvusServiceUrl)
-                        .build());
         LoadCollectionReq loadCollectionReq = LoadCollectionReq.builder()
                 .collectionName(collectionName)
                 .build();

oa-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java

@@ -1,6 +1,5 @@
 package com.ruoyi.quartz.task;
 
-import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.system.service.ISysLogininforService;
 import com.ruoyi.system.service.ISysOperLogService;
 import org.springframework.beans.factory.annotation.Autowired;

oa-ui/src/views/contractStatistic/components/projectStatistic.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-12-17 10:32:27
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-12-19 16:25:46
+ * @LastEditors: wrh
+ * @LastEditTime: 2026-01-08 14:56:17
 -->
 <template>
   <div>
@@ -85,9 +85,25 @@ export default {
     rowClickFn(row) {
       this.$router.replace({ query: { ...this.$route.query, projectId: row.projectId } });
       this.drawerOpen = true;
+      // 找到当前tab并修改当前tab显示的标题
+      let currentView = this.$store.state.tagsView.visitedViews.find(item => item.path === this.$route.path);
+      if (currentView != null) {
+        currentView.title = row.projectName;
+      }
     },
     closeDrawerFn(){
-      this.$router.replace({ path: '/statistics/contractStatistic' }); 
+      this.drawerOpen = false;
+      // 只需要删除 query 中的 projectId参数，保留其他参数
+      const { projectId, ...otherQuery } = this.$route.query;
+      this.$router.replace({ 
+        path: this.$route.path, 
+        query: otherQuery 
+      });
+      // 找到当前tab并修改当前tab显示的标题为"合同统计"
+      let currentView = this.$store.state.tagsView.visitedViews.find(item => item.path === this.$route.path);
+      if (currentView != null) {
+        currentView.title = '合同统计';
+      }
     }
   },
 }

oa-ui/src/views/flowable/form/business/contractForm.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-05-10 15:31:57
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-08-15 09:38:15
+ * @LastEditors: wrh
+ * @LastEditTime: 2026-01-08 14:57:18
 -->
 <template>
   <div class="app-container">
@@ -392,7 +392,7 @@
     <el-dialog :visible.sync="subOpen" title="选择分包合同" :size="'70%'" append-to-body>
       <choose-subcontract @choose="confirmSubContract"></choose-subcontract>
     </el-dialog>
-    <el-drawer :visible.sync="drawerOpen" title="" :size="'70%'" append-to-body>
+    <el-drawer :visible.sync="drawerOpen" title="" :size="'70%'" append-to-body @close="closeDrawerFn">
       <projectInfo :needReturn="false"></projectInfo>
     </el-drawer>
     <el-drawer :visible.sync="subInfoOpen" title="" :size="'55%'" append-to-body>
@@ -1217,6 +1217,25 @@ export default {
     clickProjectFn(row) {
       this.$router.replace({ query: { ...this.$route.query, projectId: row.projectId } });
       this.drawerOpen = true;
+      // 找到当前tab并修改当前tab显示的标题
+      let currentView = this.$store.state.tagsView.visitedViews.find(item => item.path === this.$route.path);
+      if (currentView != null) {
+        currentView.title = row.projectName;
+      }
+    },
+    closeDrawerFn() {
+      this.drawerOpen = false;
+      // 只需要删除 query 中的 projectId参数，保留其他参数
+      const { projectId, ...otherQuery } = this.$route.query;
+      this.$router.replace({ 
+        path: this.$route.path, 
+        query: otherQuery 
+      });
+      // 找到当前tab并修改当前tab显示的标题为"承接合同"
+      let currentView = this.$store.state.tagsView.visitedViews.find(item => item.path === this.$route.path);
+      if (currentView != null) {
+        currentView.title = '承接合同';
+      }
     },
     clickSubFn(row) {
       this.subContractId.formId = row.subContractId

oa-ui/src/views/llm/agent/AgentDetail.vue

@@ -531,9 +531,14 @@ export default {
 
     // 滚动到底部
     scrollToBottom() {
-      if (this.messagesContainer) {
-        this.messagesContainer.scrollTop = this.messagesContainer.scrollHeight
-      }
+      // 确保在 DOM 更新后执行滚动操作
+      this.$nextTick(() => {
+        // 直接从 $refs 中获取滚动容器，确保每次都能获取到最新的 DOM 元素
+        const container = this.$refs.messagesContainer;
+        if (container) {
+          container.scrollTop = container.scrollHeight;
+        }
+      });
     },
 
     // 聊天内文件上传相关方法

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

@@ -675,7 +675,10 @@ export default {
     scrollToBottom() {
       if (this.$refs.messageScrollbar) {
         const scrollbar = this.$refs.messageScrollbar;
-        scrollbar.scrollTop = scrollbar.scrollHeight;
+        // Element UI的el-scrollbar组件内部的滚动容器是wrap DOM元素
+        if (scrollbar && scrollbar.wrap) {
+          scrollbar.wrap.scrollTop = scrollbar.wrap.scrollHeight;
+        }
       }
     },
 

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

@@ -716,10 +716,13 @@ export default {
 
     /** 滚动到底部 */
     scrollToBottom() {
-      const container = this.$refs.chatMessagesRef;
-      if (container) {
-        container.scrollTop = container.scrollHeight;
-      }
+      // 确保在 DOM 更新后执行滚动操作
+      this.$nextTick(() => {
+        const container = this.$refs.chatMessagesRef;
+        if (container) {
+          container.scrollTop = container.scrollHeight;
+        }
+      });
     },
 
     /** 处理Enter键 */

oa-ui/src/views/oa/project/info.vue

@@ -288,8 +288,8 @@
                 <el-input disabled type="textarea" v-model="projectComment.jyComment"></el-input>
                 <div class="sign mt10">
                   <div class="mr20">签名：<span class="auditor">{{ projectComment.jyUser ? projectComment.jyUser.nickName :
-        ''
-                      }}</span>
+                    ''
+                  }}</span>
                   </div>
                   <div class="ml20"><span>审核时间：{{ projectComment.jyApprovalTime }}</span></div>
                 </div>
@@ -304,7 +304,7 @@
                 <el-input disabled type="textarea" v-model="projectComment.manageComment"></el-input>
                 <div class="sign mt10">
                   <div class="mr20">签名：<span class="auditor">{{ projectComment.managerUser ?
-        projectComment.managerUser.nickName : '' }}</span>
+                    projectComment.managerUser.nickName : '' }}</span>
                   </div>
                   <div class="ml20"><span>审核时间：{{ projectComment.manageApprovalTime }}</span></div>
                 </div>
@@ -345,7 +345,7 @@
               </template>
               <el-select v-model="devices" multiple disabled style="width:100%">
                 <el-option v-for="item in deviceList" :key="item.deviceId" :label="item.name + '【' + (item.brand != null ? item.brand : '') + (item.series != null ? '-' + item.series + '】' : '')
-        + (item.code != null ? '（设备编号：' + item.code + '）' : '')" :value="item.deviceId">
+                  + (item.code != null ? '（设备编号：' + item.code + '）' : '')" :value="item.deviceId">
                 </el-option>
               </el-select>
             </el-descriptions-item>
@@ -355,8 +355,9 @@
                 使用车辆
               </template>
               <el-select v-model="cars" multiple disabled style="width:100%">
-                <el-option v-for="item in carList" :label="item.licensePlate + (item.brand ? item.brand : '') + (item.series ? item.series : '')" :value="item.carId"
-                  :key="item.carId">
+                <el-option v-for="item in carList"
+                  :label="item.licensePlate + (item.brand ? item.brand : '') + (item.series ? item.series : '')"
+                  :value="item.carId" :key="item.carId">
                 </el-option>
               </el-select>
             </el-descriptions-item>
@@ -572,8 +573,6 @@ export default {
     }
   },
   beforeCreate() {
-    // 可有可无，在面包屑中展示
-    this.$route.meta.title = this.$route.query.projectName
     // 找到当前tab并修改当前tab显示的标题
     let currentView = this.$store.getters.visitedViews[this.$store.getters.visitedViews.findIndex(
       (item) => item.path === this.$route.path
@@ -599,6 +598,31 @@ export default {
       this.goBack();
     }
   },
+  watch: {
+    '$route.query.projectId'(newProjectId, oldProjectId) {
+      if (newProjectId && newProjectId !== oldProjectId) {
+        // 重置数据
+        this.project = {};
+        this.deptLeaderList = [];
+        this.projectComment = {};
+        this.projectChangeList = [];
+        this.workList = [];
+        this.progressList = [];
+        this.actualList = [];
+        
+        // 更新任务表单ID
+        this.taskForm.formId = newProjectId;
+        
+        // 重新加载数据
+        this.getProjectInfo(newProjectId);
+        this.getProjectWorkList(newProjectId);
+        this.getProjectCommentList(newProjectId);
+        this.getProjectProgressList(newProjectId);
+        this.getActualList(newProjectId);
+        this.getProjectChangeList(newProjectId);
+      }
+    }
+  },
   data() {
     return {
       baseUrl: process.env.VUE_APP_BASE_API,
@@ -657,6 +681,17 @@ export default {
           if (this.project.projectLeader == this.$store.state.user.id) {
             this.isProjectLeader = true;
           }
+          // 更新标签页标题
+          if (this.project.projectNumber && this.project.projectName) {
+            const newTitle = `【${this.project.projectNumber}】${this.project.projectName}`;
+            this.$store.dispatch('tagsView/updateVisitedView', {
+              ...this.$route,
+              meta: {
+                ...this.$route.meta,
+                title: newTitle
+              }
+            });
+          }
           let deptArr = [];
           if (this.project.undertakingDept && this.project.undertakingDept.trim() !== '') {
             deptArr = (this.project.undertakingDept.split(',')).map(Number)