智能体上传文件

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

@@ -1,7 +1,9 @@
 package com.ruoyi.web.llm.controller;
 
+import java.io.IOException;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -19,6 +21,7 @@ import com.ruoyi.llm.domain.CmcAgent;
 import com.ruoyi.llm.service.ICmcAgentService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 智能体Controller
@@ -65,6 +68,26 @@ public class CmcAgentController extends BaseController
         return success(cmcAgentService.selectCmcAgentByAgentId(agentId));
     }
 
+    /**
+     * 上传单文件
+     * @return
+     */
+    @PostMapping("/upload")
+    public AjaxResult upload(MultipartFile file, String agentName) throws IOException
+    {
+        return success(cmcAgentService.uploadDocument(file, agentName));
+    }
+
+    /**
+     * 上传多文件
+     * @return
+     */
+    @PostMapping("/uploadList")
+    public AjaxResult uploadList(MultipartFile[] fileList, String agentName) throws IOException
+    {
+        return success(cmcAgentService.uploadDocumentList(fileList, agentName));
+    }
+
     /**
      * 新增智能体
      */

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

@@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletResponse;
 import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.utils.SnowFlake;
+import com.ruoyi.llm.domain.CmcChat;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -77,29 +78,10 @@ public class CmcDocumentController extends BaseController
      * 上传外部文件
      * @return
      */
-    @GetMapping("/upload")
-    public JSONObject upload(MultipartFile[] fileList) throws IOException {
-        File profilePath = new File( RuoYiConfig.getProfile() + "/upload/rag/document" );
-        if (!profilePath.exists())
-            profilePath.mkdirs();
-        String chatId = new SnowFlake().generateId();
-        JSONObject jsonObject = new JSONObject();
-        jsonObject.put("chatId", chatId);
-        List<String> filenames = new ArrayList<>();
-        for (MultipartFile file : fileList) {
-            File transferFile = new File(profilePath + File.separator + file.getOriginalFilename());
-            if (!transferFile.exists()) {
-                file.transferTo(transferFile);
-            }
-            CmcDocument cmcDocument = new CmcDocument();
-            cmcDocument.setDocumentId(new SnowFlake().generateId());
-            cmcDocument.setChatId(chatId);
-            cmcDocument.setPath(file.getOriginalFilename());
-            cmcDocumentService.insertCmcDocument(cmcDocument);
-            filenames.add(file.getOriginalFilename());
-        }
-        jsonObject.put("filenames", filenames);
-        return jsonObject;
+    @PostMapping("/upload")
+    public AjaxResult upload(MultipartFile[] fileList) throws IOException
+    {
+        return success(cmcDocumentService.uploadDocument(fileList));
     }
 
     /**

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

@@ -46,7 +46,6 @@ public class McpController extends BaseController
         ChatModel chatModel = ChatModel.of("http://192.168.28.188:8000/v1/chat/completions")
                 .provider("openai")
                 .model("Qwen2.5-1.5B-Instruct")
-                .apiKey("1")
                 .defaultToolsAdd(clientProvider)
                 .build();
         ChatResponse response = chatModel.prompt(question).call();
@@ -106,16 +105,14 @@ public class McpController extends BaseController
         ChatModel chatModel = ChatModel.of("http://192.168.28.188:8000/v1/chat/completions")
                 .provider("openai")
                 .model("DeepSeek-R1-Distill-Qwen-1.5B")
-                .apiKey("1")
                 .defaultToolsAdd(clientProvider)
                 .build();
         File profilePath = new File( RuoYiConfig.getProfile() + "/upload/knowledge");
         if (!profilePath.exists())
             profilePath.mkdirs();
         File transferFile = new File( profilePath + File.separator + file.getOriginalFilename());
-        if (!transferFile.exists()) {
+        if (!transferFile.exists())
             file.transferTo(transferFile);
-        }
         Map<String,Object> path = new HashMap<>();
         path.put("document", transferFile.getPath());
         String content = clientProvider.callToolAsText("openDocument", path).getContent();

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

@@ -40,9 +40,9 @@ public class SessionController extends BaseController
      * 调用LLM+RAG（外部文件）生成回答
      */
     @GetMapping("/answerWithDocument")
-    public Flux<AssistantMessage> answerWithDocument(String chatId, String question) throws IOException
+    public Flux<AssistantMessage> answerWithDocument(String topicId, String chatId, String question) throws IOException
     {
-        return langChainMilvusService.generateAnswerWithDocument(embeddingModel, chatId, question, "http://192.168.28.188:8000/v1/chat/completions");
+        return langChainMilvusService.generateAnswerWithDocument(embeddingModel, topicId, chatId, question, "http://192.168.28.188:8000/v1/chat/completions");
     }
 
 }

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

@@ -47,6 +47,6 @@ public interface ILangChainMilvusService {
      * 调用LLM+RAG（外部文件）生成回答
      * @return
      */
-    public Flux<AssistantMessage> generateAnswerWithDocument(EmbeddingModel embeddingModel, String chatId, String question, String llmServiceUrl) throws IOException;
+    public Flux<AssistantMessage> generateAnswerWithDocument(EmbeddingModel embeddingModel, String topicId, String chatId, String question, String llmServiceUrl) throws IOException;
 
 }

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

@@ -63,9 +63,8 @@ public class LangChainMilvusServiceImpl implements ILangChainMilvusService
         if (!profilePath.exists())
             profilePath.mkdirs();
         File transferFile = new File( profilePath + File.separator + file.getOriginalFilename());
-        if (!transferFile.exists()) {
+        if (!transferFile.exists())
             file.transferTo(transferFile);
-        }
         List<TextSegment> segments = splitDocument(file.getOriginalFilename(), transferFile);
 
         // 提取文本和生成嵌入
@@ -148,7 +147,6 @@ public class LangChainMilvusServiceImpl implements ILangChainMilvusService
         ChatModel chatModel = ChatModel.of(llmServiceUrl)
                 .provider("openai")
                 .model("Qwen2.5-1.5B-Instruct")
-                .apiKey("1")
                 .build();
 
         if (topicId != null) {
@@ -191,8 +189,7 @@ public class LangChainMilvusServiceImpl implements ILangChainMilvusService
      * 调用LLM生成回答
      */
     @Override
-    public Flux<AssistantMessage> generateAnswerWithDocument(EmbeddingModel embeddingModel, String chatId, String question, String llmServiceUrl) throws IOException {
-        String topicId = cmcChatService.selectCmcChatByChatId(chatId).getTopicId();
+    public Flux<AssistantMessage> generateAnswerWithDocument(EmbeddingModel embeddingModel, String topicId, String chatId, String question, String llmServiceUrl) throws IOException {
         CmcDocument cmcDocument = new CmcDocument();
         cmcDocument.setChatId(chatId);
         List<CmcDocument> documentList = cmcDocumentService.selectCmcDocumentList(cmcDocument);

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

@@ -1,7 +1,11 @@
 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;
 
 /**
  * 智能体Service接口
@@ -27,6 +31,22 @@ public interface ICmcAgentService
      */
     public List<CmcAgent> selectCmcAgentList(CmcAgent cmcAgent);
 
+    /**
+     * 上传单文件
+     *
+     * @param file 文件
+     * @return 结果
+     */
+    public String uploadDocument(MultipartFile file, String agentName) throws IOException;
+
+    /**
+     * 上传多文件
+     *
+     * @param fileList 文件
+     * @return 结果
+     */
+    public String uploadDocumentList(MultipartFile[] fileList, String agentName) throws IOException;
+
     /**
      * 新增智能体
      * 

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

@@ -1,7 +1,11 @@
 package com.ruoyi.llm.service;
 
+import java.io.IOException;
 import java.util.List;
+
+import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.llm.domain.CmcDocument;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * cmc聊天附件Service接口
@@ -27,6 +31,14 @@ public interface ICmcDocumentService
      */
     public List<CmcDocument> selectCmcDocumentList(CmcDocument cmcDocument);
 
+    /**
+     * 上传外部文件
+     *
+     * @param fileList 文件
+     * @return 结果
+     */
+    public JSONObject uploadDocument(MultipartFile[] fileList) throws IOException;
+
     /**
      * 新增cmc聊天附件
      * 

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

@@ -1,12 +1,17 @@
 package com.ruoyi.llm.service.impl;
 
+import java.io.File;
+import java.io.IOException;
 import java.util.List;
+
+import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.llm.mapper.CmcAgentMapper;
 import com.ruoyi.llm.domain.CmcAgent;
 import com.ruoyi.llm.service.ICmcAgentService;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 智能体Service业务层处理
@@ -44,6 +49,43 @@ public class CmcAgentServiceImpl implements ICmcAgentService
         return cmcAgentMapper.selectCmcAgentList(cmcAgent);
     }
 
+    /**
+     * 上传单文件
+     *
+     * @param file 文件
+     * @return 结果
+     */
+    @Override
+    public String 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());
+        if (!transferFile.exists())
+            file.transferTo(transferFile);
+        String[] filenameSplit = file.getOriginalFilename().split("\\.");
+        return "/upload/agent/" + agentName + File.separator + file.getOriginalFilename().replace(filenameSplit[filenameSplit.length - 2], filenameSplit[filenameSplit.length - 2] + "_" + agentName);
+    }
+
+    /**
+     * 上传多文件
+     *
+     * @param fileList 文件
+     * @return 结果
+     */
+    @Override
+    public String uploadDocumentList(MultipartFile[] fileList, String agentName) throws IOException {
+        File profilePath = new File( RuoYiConfig.getProfile() + "/upload/agent/" + agentName);
+        if (!profilePath.exists())
+            profilePath.mkdirs();
+        for (MultipartFile file : fileList) {
+            File transferFile = new File(profilePath + File.separator + file.getOriginalFilename());
+            if (!transferFile.exists())
+                file.transferTo(transferFile);
+        }
+        return "上传成功";
+    }
+
     /**
      * 新增智能体
      * 

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

@@ -1,11 +1,18 @@
 package com.ruoyi.llm.service.impl;
 
+import java.io.File;
+import java.io.IOException;
 import java.util.List;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.ruoyi.common.config.RuoYiConfig;
+import com.ruoyi.common.utils.SnowFlake;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.llm.mapper.CmcDocumentMapper;
 import com.ruoyi.llm.domain.CmcDocument;
 import com.ruoyi.llm.service.ICmcDocumentService;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * cmc聊天附件Service业务层处理
@@ -55,6 +62,33 @@ public class CmcDocumentServiceImpl implements ICmcDocumentService
         return cmcDocumentMapper.insertCmcDocument(cmcDocument);
     }
 
+    /**
+     * 上传外部文件
+     *
+     * @param fileList 文件
+     * @return 结果
+     */
+    @Override
+    public JSONObject uploadDocument(MultipartFile[] fileList) throws IOException {
+        File profilePath = new File( RuoYiConfig.getProfile() + "/upload/rag/document" );
+        if (!profilePath.exists())
+            profilePath.mkdirs();
+        String chatId = new SnowFlake().generateId();
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("chatId", chatId);
+        for (MultipartFile file : fileList) {
+            File transferFile = new File(profilePath + File.separator + file.getOriginalFilename());
+            if (!transferFile.exists())
+                file.transferTo(transferFile);
+            CmcDocument cmcDocument = new CmcDocument();
+            cmcDocument.setDocumentId(new SnowFlake().generateId());
+            cmcDocument.setChatId(chatId);
+            cmcDocument.setPath(file.getOriginalFilename());
+            cmcDocumentMapper.insertCmcDocument(cmcDocument);
+        }
+        return jsonObject;
+    }
+
     /**
      * 修改cmc聊天附件
      * 

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2025-04-07 14:14:05
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-07-22 16:07:39
+ * @LastEditors: wrh
+ * @LastEditTime: 2025-07-22 17:44:45
 -->
 <template>
   <div class="app-container">
@@ -321,7 +321,7 @@ const showNewChatWelcome = ref(false);
 const fileInput = ref(null);
 const selectedFiles = ref([]);
 const isUploading = ref(false);
-const documentChartId = ref('');
+const documentChatId = ref('');
 const messageFileMap = ref(new Map()); // 存储消息对应的文件列表，key为chartId
 
 const classifiedRecent = ref({
@@ -466,7 +466,7 @@ const sendMessage = async () => {
     input: inputMessage.value,
     topicId: currentTopicId.value,
     inputTime: proxy.parseTime(new Date(), '{y}-{m}-{d}'),
-    chatId: documentChartId.value || null
+    chatId: documentChatId.value || null
   };
 
   // 添加用户消息到聊天记录
@@ -475,10 +475,10 @@ const sendMessage = async () => {
   inputMessage.value = '';
 
   // 暂存文件上传ID，用于后续查询
-  const uploadedFileId = documentChartId.value;
+  const uploadedFileId = documentChatId.value;
 
   // 清空文档chartId，确保每次上传只对下一条消息有效
-  documentChartId.value = '';
+  documentChatId.value = '';
 
   // 清空已上传的文件列表
   selectedFiles.value = [];
@@ -590,7 +590,7 @@ const handleFileSelect = async (event) => {
     try {
       isUploading.value = true;
       let res = await uploadDocument(files);
-      documentChartId.value = res.chatId;
+      documentChatId.value = res.data.chatId;
       // 上传成功后，将文件添加到已上传列表
       selectedFiles.value = [...selectedFiles.value, ...files];
       ElMessage.success(`成功上传 ${files.length} 个文件`);