智能体上传文件返回chatid及助手message

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

@@ -86,7 +86,7 @@ public class CmcAgentController extends BaseController
     @PostMapping("/upload")
     public AjaxResult upload(MultipartFile file, String agentName) throws IOException
     {
-        return success(new AssistantMessage(cmcAgentService.uploadDocument(file, agentName)));
+        return success(cmcAgentService.uploadDocument(file, agentName));
     }
 
     /**

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

@@ -73,9 +73,9 @@ public class CmcDocumentController extends BaseController
      * @return
      */
     @PostMapping("/upload")
-    public AjaxResult upload(MultipartFile[] fileList, String agentName) throws IOException
+    public AjaxResult upload(MultipartFile[] fileList) throws IOException
     {
-        return success(cmcDocumentService.uploadDocument(fileList, agentName));
+        return success(cmcDocumentService.uploadDocument(fileList));
     }
 
     /**

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

@@ -64,7 +64,7 @@ public class LangChainMilvusServiceImpl implements ILangChainMilvusService
         File profilePath = new File( RuoYiConfig.getProfile() + "/upload/rag/knowledge/" + collectionName);
         if (!profilePath.exists())
             profilePath.mkdirs();
-        File transferFile = new File( profilePath + File.separator + file.getOriginalFilename());
+        File transferFile = new File( profilePath + "/" + file.getOriginalFilename());
         if (!transferFile.exists())
             file.transferTo(transferFile);
         List<TextSegment> segments = splitDocument(file.getOriginalFilename(), transferFile);

llm-back/ruoyi-system/src/main/java/com/ruoyi/llm/service/ICmcAgentService.java

@@ -3,6 +3,7 @@ package com.ruoyi.llm.service;
 import java.io.IOException;
 import java.util.List;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.llm.domain.CmcAgent;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -44,7 +45,7 @@ public interface ICmcAgentService
      * @param file 文件
      * @return 结果
      */
-    public String uploadDocument(MultipartFile file, String agentName) throws IOException;
+    public JSONObject uploadDocument(MultipartFile file, String agentName) throws IOException;
 
     /**
      * 上传多文件

llm-back/ruoyi-system/src/main/java/com/ruoyi/llm/service/ICmcDocumentService.java

@@ -35,10 +35,9 @@ public interface ICmcDocumentService
      * 上传外部文件
      *
      * @param fileList 文件
-     * @param agentName 智能体名称
      * @return 结果
      */
-    public JSONObject uploadDocument(MultipartFile[] fileList, String agentName) throws IOException;
+    public JSONObject uploadDocument(MultipartFile[] fileList) throws IOException;
 
     /**
      * 新增cmc聊天附件

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

@@ -6,8 +6,12 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.List;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SnowFlake;
+import com.ruoyi.llm.domain.CmcDocument;
+import com.ruoyi.llm.mapper.CmcDocumentMapper;
 import org.apache.poi.xwpf.usermodel.XWPFDocument;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -28,6 +32,9 @@ public class CmcAgentServiceImpl implements ICmcAgentService
     @Autowired
     private CmcAgentMapper cmcAgentMapper;
 
+    @Autowired
+    private CmcDocumentMapper cmcDocumentMapper;
+
     /**
      * 查询智能体
      * 
@@ -73,15 +80,23 @@ public class CmcAgentServiceImpl implements ICmcAgentService
      * @return 结果
      */
     @Override
-    public String uploadDocument(MultipartFile file, String agentName) throws IOException {
+    public JSONObject uploadDocument(MultipartFile file, String agentName) throws IOException {
         File profilePath = new File( RuoYiConfig.getProfile() + "/upload/agent/" + agentName);
         if (!profilePath.exists())
             profilePath.mkdirs();
-        File transferFile = new File(profilePath + File.separator + file.getOriginalFilename());
+        File transferFile = new File(profilePath + "/" + file.getOriginalFilename());
         if (!transferFile.exists())
             file.transferTo(transferFile);
+        String chatId = new SnowFlake().generateId();
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("chatId", chatId);
         String[] filenameSplit = file.getOriginalFilename().split("\\.");
         String outputFilename = "/upload/agent/" + agentName + "/" + file.getOriginalFilename().replace(filenameSplit[filenameSplit.length - 2], filenameSplit[filenameSplit.length - 2] + "_" + agentName);
+        CmcDocument cmcDocument = new CmcDocument();
+        cmcDocument.setDocumentId(new SnowFlake().generateId());
+        cmcDocument.setChatId(chatId);
+        cmcDocument.setPath(outputFilename);
+        cmcDocumentMapper.insertCmcDocument(cmcDocument);
         String message = "";
         if (agentName.contains("技术")) {
             XWPFDocument doc = new XWPFDocument(new FileInputStream(RuoYiConfig.getProfile() + "/upload/agent/template/technical.docx"));
@@ -105,7 +120,8 @@ public class CmcAgentServiceImpl implements ICmcAgentService
                     "8 职业健康、安全生产及环保水保措施\n\n" +
                     "请问您需要哪些章节撰写的帮助？";
         }
-        return message;
+        jsonObject.put("assistantMessage", message);
+        return jsonObject;
     }
 
     /**

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

@@ -66,15 +66,11 @@ public class CmcDocumentServiceImpl implements ICmcDocumentService
      * 上传外部文件
      *
      * @param fileList 文件
-     * @param agentName 智能体名称
      * @return 结果
      */
     @Override
-    public JSONObject uploadDocument(MultipartFile[] fileList, String agentName) throws IOException {
+    public JSONObject uploadDocument(MultipartFile[] fileList) throws IOException {
         String prefixPath = "";
-        if (!agentName.equals(""))
-            prefixPath = "/upload/agent/" + agentName;
-        else
             prefixPath = "/upload/rag/document";
         File profilePath = new File( RuoYiConfig.getProfile() + prefixPath);
         if (!profilePath.exists())

llm-back/sql/cmc_llm.sql

@@ -57,6 +57,7 @@ CREATE TABLE `cmc_document`  (
 DROP TABLE IF EXISTS `cmc_topic`;
 CREATE TABLE `cmc_topic`  (
   `topic_id` char(19) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '聊天主题id',
+  `agent_id` int DEFAULT 0 COMMENT '智能体id',
   `topic` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '主题',
   `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
   PRIMARY KEY (`topic_id`) USING BTREE
@@ -76,7 +77,6 @@ CREATE TABLE `cmc_agent`  (
   `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述',
   `create_by` bigint NULL DEFAULT NULL COMMENT '创建人',
   `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
-  `role_id` int NULL DEFAULT NULL COMMENT '角色id',
   PRIMARY KEY (`agent_id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '智能体表' ROW_FORMAT = Dynamic;
 
@@ -84,22 +84,6 @@ CREATE TABLE `cmc_agent`  (
 -- Records of cmc_agent
 -- ----------------------------
 
-DROP TABLE IF EXISTS `cmc_agent_tool`;
-CREATE TABLE `cmc_agent_tool`  (
-  `agent_tool_id` int NOT NULL COMMENT '智能体工具id',
-  `tool_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '工具描述',
-  `agent_id` int NULL DEFAULT NULL COMMENT '智能体id',
-  `tool_sort` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '顺序',
-  PRIMARY KEY (`agent_tool_id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '智能体工具表' ROW_FORMAT = Dynamic;
-
-
 -- ----------------------------
 -- Table structure for gen_table
 -- ----------------------------

llm-ui/src/api/llm/document.js

@@ -1,8 +1,8 @@
 /*
  * @Author: ysh
  * @Date: 2025-06-13 10:35:45
- * @LastEditors: 
- * @LastEditTime: 2025-07-22 10:38:57
+ * @LastEditors: wrh
+ * @LastEditTime: 2025-07-29 17:48:55
  */
 import request from '@/utils/request'
 
@@ -51,12 +51,11 @@ export function delDocument(documentId) {
 
 
 // 上传聊天外部文件
-export function uploadDocument(fileList, agentName) {
+export function uploadDocument(fileList) {
   const formData = new FormData()
   for (let f of fileList) {
     formData.append('fileList', f)
   }
-  formData.append('agentName', agentName)
   return request({
     url: '/llm/document/upload',
     method: 'post',

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: wrh
  * @Date: 2025-01-01 00:00:00
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-07-29 16:58:28
+ * @LastEditors: wrh
+ * @LastEditTime: 2025-07-29 17:45:58
 -->
 <template>
   <div class="agent-detail-container" v-loading="loading">
@@ -165,7 +165,7 @@ import { getAgent, opening, uploadFile } from '@/api/llm/agent';
 import { answer } from '@/api/llm/mcp';
 import { listTopic, getTopic, delTopic, addTopic, updateTopic } from "@/api/llm/topic";
 import { listChat, addChat, updateChat } from "@/api/llm/chat";
-import { listDocument, uploadDocument } from "@/api/llm/document";
+import { listDocument } from "@/api/llm/document";
 import useUserStore from '@/store/modules/user'
 
 const { proxy } = getCurrentInstance()
@@ -407,13 +407,12 @@ const submitChatUpload = async () => {
     const file = chatFileList.value[0].raw // 只取第一个文件
     const fileName = file.name;
     const response = await uploadFile(file, agentInfo.value.agentName)
-    const fileRes = await uploadDocument([file]); // 保存上传的文件到数据库
-    const chatId = fileRes.data.chatId; //获取保存后的chatId
+    const chatId = response.data.chatId; //获取保存后的chatId
     // 解析返回的数据
     let assistantContent = '文件上传成功！'
-    if (response.data && response.data.resultContent) {
+    if (response.data && response.data.assistantMessage) {
       // 格式化链接：在href前加上基础API地址
-      assistantContent = formatContentLinks(response.data.resultContent)
+      assistantContent = formatContentLinks(response.data.assistantMessage)
     }
 
     // 添加上传成功的消息到聊天记录

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

@@ -212,7 +212,7 @@
                         <el-icon class="file-icon">
                           <Document />
                         </el-icon>
-                        <span class="file-name">{{ file.path }}</span>
+                        <span class="file-name">{{ file.path.split("/")[file.path.split("/").length - 1] }}</span>
                       </div>
                     </div>
                   </div>
@@ -590,7 +590,7 @@ const handleFileSelect = async (event) => {
     // 立即上传文件
     try {
       isUploading.value = true;
-      let res = await uploadDocument(files, '');
+      let res = await uploadDocument(files);
       documentChatId.value = res.data.chatId;
       // 上传成功后，将文件添加到已上传列表
       selectedFiles.value = [...selectedFiles.value, ...files];