接口标准化，支持word文档导入向量库

llm-back/pom.xml

@@ -205,6 +205,13 @@
                 <version>${ruoyi.version}</version>
             </dependency>
 
+            <!-- 大模型-->
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-llm</artifactId>
+                <version>${ruoyi.version}</version>
+            </dependency>
+
             <!-- 智能体-->
             <dependency>
                 <groupId>com.ruoyi</groupId>
@@ -217,6 +224,7 @@
 
     <modules>
         <module>ruoyi-admin</module>
+        <module>ruoyi-llm</module>
         <module>ruoyi-agent</module>
         <module>ruoyi-framework</module>
         <module>ruoyi-system</module>

llm-back/ruoyi-admin/pom.xml

@@ -62,10 +62,10 @@
             <artifactId>ruoyi-generator</artifactId>
         </dependency>
 
-        <!-- 智能体-->
+        <!-- 大模型-->
         <dependency>
             <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-agent</artifactId>
+            <artifactId>ruoyi-llm</artifactId>
         </dependency>
 
     </dependencies>

llm-back/ruoyi-agent/pom.xml

@@ -22,39 +22,12 @@
             <artifactId>ruoyi-common</artifactId>
         </dependency>
 
-        <!-- 向量数据库-->
-        <dependency>
-            <groupId>io.milvus</groupId>
-            <artifactId>milvus-sdk-java</artifactId>
-            <version>2.3.3</version>
-        </dependency>
-
-        <!-- LangChain4j -->
-        <dependency>
-            <groupId>dev.langchain4j</groupId>
-            <artifactId>langchain4j</artifactId>
-            <version>0.35.0</version>
-        </dependency>
-
-        <!-- LangChain4j Milvus 集成 -->
-        <dependency>
-            <groupId>dev.langchain4j</groupId>
-            <artifactId>langchain4j-milvus</artifactId>
-            <version>0.35.0</version> <!-- 版本需与核心一致 -->
-        </dependency>
-
-        <!-- LangChain4j embedding 集成 -->
-        <dependency>
-            <groupId>dev.langchain4j</groupId>
-            <artifactId>langchain4j-embeddings-bge-small-zh-v15</artifactId>
-            <version>0.35.0</version>
-        </dependency>
 
-        <!-- LangChain4j pdfParser 集成 -->
+        <!-- Solon模型上下文协议 -->
         <dependency>
-            <groupId>dev.langchain4j</groupId>
-            <artifactId>langchain4j-document-parser-apache-pdfbox</artifactId>
-            <version>0.35.0</version>
+            <groupId>org.noear</groupId>
+            <artifactId>solon-ai-mcp</artifactId>
+            <version>3.3.1</version>
         </dependency>
 
     </dependencies>

llm-back/ruoyi-agent/src/main/java/com/ruoyi/agent/RuoYiAgentApplication.java

@@ -0,0 +1,22 @@
+package com.ruoyi.agent;
+
+import org.noear.solon.Solon;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+
+/**
+ * 启动程序
+ * 
+ * @author ruoyi
+ */
+@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
+public class RuoYiAgentApplication
+{
+    public static void main(String[] args)
+    {
+        Solon.start(RuoYiAgentApplication.class, args, app -> {
+            app.cfg().setProperty("server.port", "8081");
+        });
+        System.out.println("智能体启动成功 \n");
+    }
+}

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

@@ -1,58 +0,0 @@
-package com.ruoyi.agent.controller;
-
-import com.alibaba.fastjson2.JSONObject;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import okhttp3.*;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.io.IOException;
-import java.util.concurrent.TimeUnit;
-
-/**
- * session对话Controller
- * 
- * @author cmc
- * @date 2025-04-08
- */
-@RestController
-@RequestMapping("/llm/session")
-public class SessionController extends BaseController
-{
-    /**
-     * 生成回答
-     */
-    @GetMapping("/answer")
-    public AjaxResult answer(String question) throws IOException {
-
-        // 1. 调用本地LLM或HTTP服务
-        return success(generateAnswer(question));
-    }
-
-    // 调用LLM生成回答
-    public String generateAnswer(String question) throws IOException {
-        // 构建带动态参数的URL
-        HttpUrl url = HttpUrl.parse("http://192.168.28.188:8000/generate")
-                .newBuilder()
-                .addQueryParameter("prompt", question)
-//                .addQueryParameter("max_token", String.valueOf(1024))
-                .build();
-
-        Request request = new Request.Builder()
-                .url(url)
-                .build();
-
-        OkHttpClient client = new OkHttpClient.Builder()
-                .readTimeout(60, TimeUnit.SECONDS)      // 读取响应超时
-                .build();
-
-        try (Response response = client.newCall(request).execute()) {
-            String responseBody = response.body().string();
-            String responseResult = JSONObject.parseObject(responseBody).getString("generated_text");
-            return responseResult;
-        }
-    }
-
-}

llm-back/ruoyi-agent/src/main/java/com/ruoyi/agent/service/IMcpService.java

@@ -0,0 +1,9 @@
+package com.ruoyi.agent.service;
+
+/**
+ * （通过此接口，自动收集 McpServerEndpoint 组件类）
+ *
+ * @author noear 2025/5/6 created
+ */
+public interface IMcpService {
+}

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

@@ -0,0 +1,47 @@
+package com.ruoyi.agent.service.impl;
+
+import com.ruoyi.agent.service.IMcpService;
+
+import org.noear.solon.ai.annotation.PromptMapping;
+import org.noear.solon.ai.annotation.ResourceMapping;
+import org.noear.solon.ai.annotation.ToolMapping;
+import org.noear.solon.ai.chat.message.ChatMessage;
+import org.noear.solon.ai.mcp.server.annotation.McpServerEndpoint;
+import org.noear.solon.annotation.Param;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+/**
+ * 自动构建服务端点服务（使用 springboot 容器）
+ * */
+@Service
+@McpServerEndpoint(sseEndpoint = "/llm/mcp/sse")
+public class McpServiceImpl implements IMcpService {
+
+    //
+    // 建议开启编译参数：-parameters （否则，最好再配置参数的 name）
+    //
+    @ToolMapping(description = "查询天气预报")
+    public String getWeather(@Param(description = "城市位置") String location) {
+        return "晴，14度";
+    }
+
+    @ResourceMapping(uri = "config://app-version", description = "获取应用版本号")
+    public String getAppVersion() {
+        return "v3.2.0";
+    }
+
+    @ResourceMapping(uri = "db://users/{user_id}/email", description = "根据用户ID查询邮箱")
+    public String getEmail(@Param(description = "用户Id") String user_id) {
+        return user_id + "@example.com";
+    }
+
+    @PromptMapping(description = "生成关于某个主题的提问")
+    public Collection<ChatMessage> askQuestion(@Param(description = "主题") String topic) {
+        return Arrays.asList(
+                ChatMessage.ofUser("请解释一下'" + topic + "'的概念？")
+        );
+    }
+}

llm-back/ruoyi-llm/pom.xml

@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>ruoyi</artifactId>
+        <groupId>com.ruoyi</groupId>
+        <version>3.8.9</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-llm</artifactId>
+
+    <description>
+        cmc大模型
+    </description>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-common</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-framework</artifactId>
+        </dependency>
+
+        <!-- 向量数据库-->
+        <dependency>
+            <groupId>io.milvus</groupId>
+            <artifactId>milvus-sdk-java</artifactId>
+            <version>2.3.3</version>
+        </dependency>
+
+        <!-- LangChain4j -->
+        <dependency>
+            <groupId>dev.langchain4j</groupId>
+            <artifactId>langchain4j</artifactId>
+            <version>0.35.0</version>
+        </dependency>
+
+        <!-- LangChain4j Milvus 集成 -->
+        <dependency>
+            <groupId>dev.langchain4j</groupId>
+            <artifactId>langchain4j-milvus</artifactId>
+            <version>0.35.0</version> <!-- 版本需与核心一致 -->
+        </dependency>
+
+        <!-- LangChain4j embedding 集成 -->
+        <dependency>
+            <groupId>dev.langchain4j</groupId>
+            <artifactId>langchain4j-embeddings-bge-small-zh-v15</artifactId>
+            <version>0.35.0</version>
+        </dependency>
+
+        <!-- LangChain4j pdfParser 集成 -->
+        <dependency>
+            <groupId>dev.langchain4j</groupId>
+            <artifactId>langchain4j-document-parser-apache-pdfbox</artifactId>
+            <version>0.35.0</version>
+        </dependency>
+
+        <!-- Solon模型上下文协议 -->
+        <dependency>
+            <groupId>org.noear</groupId>
+            <artifactId>solon-ai-mcp</artifactId>
+            <version>3.3.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>

llm-back/ruoyi-agent/src/main/java/com/ruoyi/agent/controller/KnowLedgeController.java → llm-back/ruoyi-llm/src/main/java/com/ruoyi/web/llm/controller/KnowLedgeController.java

@@ -1,17 +1,21 @@
-package com.ruoyi.agent.controller;
+package com.ruoyi.web.llm.controller;
 
 import com.alibaba.fastjson2.JSONArray;
-import com.ruoyi.agent.service.LangChainMilvusService;
-import com.ruoyi.common.config.RuoYiConfig;
+import com.ruoyi.web.llm.service.ILangChainMilvusService;
+import com.ruoyi.web.llm.service.IMilvusService;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.agent.service.MilvusService;
 import dev.langchain4j.model.embedding.onnx.bgesmallzhv15.BgeSmallZhV15EmbeddingModel;
 import dev.langchain4j.model.embedding.EmbeddingModel;
+import io.milvus.client.MilvusServiceClient;
+import io.milvus.grpc.MutationResult;
+import io.milvus.param.ConnectParam;
+import io.milvus.param.R;
+import io.milvus.param.RpcStatus;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.File;
 import java.io.IOException;
 import java.util.List;
 
@@ -25,16 +29,27 @@ import java.util.List;
 @RequestMapping("/llm/knowledge")
 public class KnowLedgeController extends BaseController
 {
-    private static final MilvusService milvusService = new MilvusService("192.168.28.188", 19530);
+    @Autowired
+    private IMilvusService milvusService;
+
+    @Autowired
+    private ILangChainMilvusService langChainMilvusService;
+
     private static final EmbeddingModel embeddingModel = new BgeSmallZhV15EmbeddingModel();
 
+    private static final MilvusServiceClient milvusClient = new MilvusServiceClient(
+            ConnectParam.newBuilder()
+                    .withHost("192.168.28.188")
+                    .withPort(19530)
+                    .build());
+
     /**
      * 新建知识库
      */
     @GetMapping("/list")
     public AjaxResult listKnowLedgeCollection()
     {
-        JSONArray collectionNames = milvusService.getCollectionNames();
+        JSONArray collectionNames = milvusService.getCollectionNames(milvusClient);
         return success(collectionNames);
     }
 
@@ -44,8 +59,8 @@ public class KnowLedgeController extends BaseController
     @PostMapping("/create")
     public AjaxResult createKnowLedgeCollection(String collectionName, String description)
     {
-        milvusService.createCollection(collectionName, description, 512);
-        return success();
+        R<RpcStatus> status = milvusService.createCollection(milvusClient, collectionName, description, 512);
+        return success(status);
     }
 
     /**
@@ -54,7 +69,7 @@ public class KnowLedgeController extends BaseController
     @PostMapping("/modify")
     public AjaxResult modifyKnowLedgeCollection(String collectionName, String newCollectionName)
     {
-        milvusService.collectionRename(collectionName, newCollectionName);
+        milvusService.collectionRename(milvusClient, collectionName, newCollectionName);
         return success();
     }
 
@@ -64,7 +79,7 @@ public class KnowLedgeController extends BaseController
     @DeleteMapping("/remove")
     public AjaxResult removeKnowLedgeCollection(String collectionName)
     {
-        milvusService.deleteCollectionName(collectionName);
+        milvusService.deleteCollectionName(milvusClient, collectionName);
         return success();
     }
 
@@ -74,31 +89,23 @@ public class KnowLedgeController extends BaseController
     @GetMapping("/listDocument")
     public AjaxResult listKnowledgeDocument(String collectionName, String fileType)
     {
-        List<String> documentList = milvusService.listDocument(collectionName, fileType);
+        List<String> documentList = milvusService.listDocument(milvusClient, collectionName, fileType);
         return success(documentList);
     }
 
     /**
-     * 插入知识库文件
+     * 导入知识库文件
      */
     @PostMapping("/insertDocument")
-    public AjaxResult insertKnowledgeDocument(MultipartFile file, String collectionName) throws IOException
-    {
-        LangChainMilvusService langChainMilvusService = new LangChainMilvusService(
-                "192.168.28.188",
-                19530,
-                collectionName,
-                embeddingModel);
-
-        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()) {
-            file.transferTo(transferFile);
+    public AjaxResult insertKnowledgeDocument(MultipartFile file, String collectionName) throws IOException {
+        R<MutationResult> insertResult = langChainMilvusService.insertLangchainEmbeddingDocument(milvusClient, file, collectionName, embeddingModel);
+        String message = "文件导入成功";
+        if (insertResult.getStatus() != R.Status.Success.getCode()) {
+            message = "文件导入失败：" + insertResult.getMessage();
+            return error(message);
         }
-        langChainMilvusService.insertLangchainEmbeddingDocument(transferFile);
-        return success();
+        else
+            return success(message);
     }
 
     /**
@@ -107,7 +114,7 @@ public class KnowLedgeController extends BaseController
     @DeleteMapping("/removeDocument")
     public AjaxResult deleteKnowledgeDocument(String fileName, String collectionName)
     {
-        milvusService.removeDocument(collectionName, fileName);
+        milvusService.removeDocument(milvusClient, collectionName, fileName);
         return success();
     }
 

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

@@ -0,0 +1,39 @@
+package com.ruoyi.web.llm.controller;
+
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import org.noear.solon.ai.mcp.client.McpClientProvider;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Collections;
+import java.util.Map;
+
+/**
+ * mcp模型上下文协议Controller
+ * 
+ * @author cmc
+ * @date 2025-04-08
+ */
+@RestController
+@RequestMapping("/llm/mcp")
+public class McpController extends BaseController
+{
+    /**
+     * 生成回答
+     */
+    @GetMapping("/answer")
+    public AjaxResult answer() {
+        McpClientProvider clientProvider = McpClientProvider.builder()
+                .apiUrl("http://localhost:52548/llm/mcp/sse")
+                .build();
+
+        Map<String, Object> map = Collections.singletonMap("location", "杭州");
+        String rst = clientProvider.callToolAsText("getWeather", map).getContent();
+        // 1. 调用本地LLM或HTTP服务
+        return success(rst);
+    }
+
+
+}

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

@@ -1,10 +1,13 @@
-package com.ruoyi.agent.controller;
+package com.ruoyi.web.llm.controller;
 
+import com.ruoyi.web.llm.service.ILangChainMilvusService;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.agent.service.LangChainMilvusService;
 import dev.langchain4j.model.embedding.EmbeddingModel;
 import dev.langchain4j.model.embedding.onnx.bgesmallzhv15.BgeSmallZhV15EmbeddingModel;
+import io.milvus.client.MilvusServiceClient;
+import io.milvus.param.ConnectParam;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -22,24 +25,25 @@ import java.util.List;
 @RequestMapping("/llm/rag")
 public class RagController extends BaseController
 {
+    @Autowired
+    private ILangChainMilvusService langChainMilvusService;
+
     private static final EmbeddingModel embeddingModel = new BgeSmallZhV15EmbeddingModel();
 
+    private static final MilvusServiceClient milvusClient = new MilvusServiceClient(
+            ConnectParam.newBuilder()
+                    .withHost("192.168.28.188")
+                    .withPort(19530)
+                    .build());
+
     /**
      * 增强检索生成回答
      */
     @GetMapping("/answer")
     public AjaxResult answer(String question, String collectionName) throws IOException {
-        LangChainMilvusService langChainMilvusService = new LangChainMilvusService(
-                "192.168.28.188",
-                19530,
-                collectionName,
-                embeddingModel);
-
-        // 1. Milvus检索
-        List<String> contexts = langChainMilvusService.retrieveFromMilvus(question, 1);
-        String result = langChainMilvusService.generateAnswerWithRag(question, contexts);
-        langChainMilvusService.releaseCollectionName();
-        // 2. 调用本地LLM或HTTP服务
+
+        List<String> contexts = langChainMilvusService.retrieveFromMilvus(milvusClient, embeddingModel, collectionName, question, 1);
+        String result = langChainMilvusService.generateAnswerWithRag(question, contexts, "http://192.168.28.188:8080/generate");
         return success(result);
     }
 

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

@@ -0,0 +1,34 @@
+package com.ruoyi.web.llm.controller;
+
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.llm.service.ILangChainMilvusService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.io.IOException;
+
+/**
+ * session对话Controller
+ * 
+ * @author cmc
+ * @date 2025-04-08
+ */
+@RestController
+@RequestMapping("/llm/session")
+public class SessionController extends BaseController
+{
+    @Autowired
+    private ILangChainMilvusService langChainMilvusService;
+
+    /**
+     * 生成回答
+     */
+    @GetMapping("/answer")
+    public AjaxResult answer(String question) throws IOException {
+        return success(langChainMilvusService.generateAnswer(question, "http://192.168.28.188:8000/generate"));
+    }
+
+}

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

@@ -0,0 +1,33 @@
+package com.ruoyi.web.llm.service;
+
+import dev.langchain4j.model.embedding.EmbeddingModel;
+import io.milvus.client.MilvusClient;
+import io.milvus.grpc.MutationResult;
+import io.milvus.param.R;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.util.List;
+
+public interface ILangChainMilvusService {
+
+    /**
+     * 导入知识库文件
+     */
+    public R<MutationResult> insertLangchainEmbeddingDocument(MilvusClient milvusClient, MultipartFile file, String collectionName, EmbeddingModel embeddingModel) throws IOException;
+
+    /**
+     * 从Milvus检索相关文档
+     */
+    public List<String> retrieveFromMilvus(MilvusClient milvusClient, EmbeddingModel embeddingModel, String collectionName, String query, int topK);
+
+    /**
+     * 调用LLM+RAG生成回答
+     */
+    public String generateAnswerWithRag(String question, List<String> contexts, String llmServiceUrl) throws IOException;
+
+    /**
+     * 调用LLM生成回答
+     */
+    public String generateAnswer(String llmServiceUrl, String question) throws IOException;
+}

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

@@ -0,0 +1,41 @@
+package com.ruoyi.web.llm.service;
+
+import com.alibaba.fastjson2.JSONArray;
+import io.milvus.client.MilvusClient;
+import io.milvus.param.R;
+import io.milvus.param.RpcStatus;
+
+import java.util.List;
+
+public interface IMilvusService {
+
+    /**
+     * 新建知识库Collection（含Schema、Field、Index）
+     */
+    public R<RpcStatus> createCollection(MilvusClient milvusClient, String collectionName, String description, int dimension);
+
+    /**
+     * 查询知识库Collection
+     */
+    public JSONArray getCollectionNames(MilvusClient milvusClient);
+
+    /**
+     * 修改知识库Collection
+     */
+    public void collectionRename(MilvusClient milvusClient, String collectionName, String newCollectionName);
+
+    /**
+     * 删除知识库Collection
+     */
+    public void deleteCollectionName(MilvusClient milvusClient, String collectionName);
+
+    /**
+     * 查询知识库文件
+     */
+    public List<String> listDocument(MilvusClient milvusClient, String collectionName, String fileType);
+
+    /**
+     * 删除知识库文件
+     */
+    public void removeDocument(MilvusClient milvusClient, String collectionName, String fileName);
+}

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

@@ -1,29 +1,30 @@
-package com.ruoyi.agent.service;
+package com.ruoyi.web.llm.service.impl;
 
 import com.alibaba.fastjson2.JSONObject;
+import com.ruoyi.common.config.RuoYiConfig;
+import com.ruoyi.web.llm.service.ILangChainMilvusService;
 import dev.langchain4j.data.document.Document;
 import dev.langchain4j.data.document.parser.apache.pdfbox.ApachePdfBoxDocumentParser;
 import dev.langchain4j.data.document.splitter.DocumentByParagraphSplitter;
 import dev.langchain4j.data.segment.TextSegment;
 import dev.langchain4j.model.embedding.EmbeddingModel;
 
-import io.milvus.client.MilvusServiceClient;
+import io.milvus.client.MilvusClient;
 import io.milvus.grpc.MutationResult;
 import io.milvus.grpc.SearchResults;
-import io.milvus.param.ConnectParam;
 import io.milvus.param.MetricType;
 import io.milvus.param.R;
 import io.milvus.param.RpcStatus;
 import io.milvus.param.collection.LoadCollectionParam;
 import io.milvus.param.collection.ReleaseCollectionParam;
-import io.milvus.param.dml.DeleteParam;
 import io.milvus.param.dml.InsertParam;
 import io.milvus.param.dml.SearchParam;
-import io.milvus.param.highlevel.dml.QuerySimpleParam;
-import io.milvus.param.highlevel.dml.response.QueryResponse;
-import io.milvus.response.QueryResultsWrapper;
 import io.milvus.response.SearchResultsWrapper;
 import okhttp3.*;
+import org.apache.poi.xwpf.extractor.XWPFWordExtractor;
+import org.apache.poi.xwpf.usermodel.XWPFDocument;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -33,34 +34,38 @@ import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
-public class LangChainMilvusService {
-    private String LLM_SERVICE_URL;
-    private MilvusServiceClient milvusClient;
-    private String collectionName;
-    private EmbeddingModel embeddingModel;
-
-    /**
-     * 连接milvus知识库指定collection，加入langchain自带emdding
-     */
-    public LangChainMilvusService(String host, int port, String collectionName, EmbeddingModel embeddingModel) {
-        this.milvusClient = new MilvusServiceClient(
-                ConnectParam.newBuilder()
-                        .withHost(host)
-                        .withPort(port)
-                        .build()
-        );
-        this.LLM_SERVICE_URL = "http://" + host + ":8000/generate";
-        this.collectionName = collectionName;
-        this.embeddingModel = embeddingModel;
-    }
-
+@Service
+public class LangChainMilvusServiceImpl implements ILangChainMilvusService
+{
     /**
-     * 插入知识库文件
+     * 导入知识库文件
      */
-    public void insertLangchainEmbeddingDocument(File file) throws IOException {
+    @Override
+    public R<MutationResult> insertLangchainEmbeddingDocument(MilvusClient milvusClient, MultipartFile file, String collectionName, EmbeddingModel embeddingModel) throws IOException
+    {
+        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()) {
+            file.transferTo(transferFile);
+        }
         // 加载文档
-        InputStream fileInputStream = new FileInputStream(file);
-        Document document = new ApachePdfBoxDocumentParser().parse(fileInputStream);
+        Document document;
+        InputStream fileInputStream = new FileInputStream(transferFile);
+        String filename = file.getOriginalFilename().toLowerCase();
+        if (filename.endsWith(".docx")) {
+            XWPFDocument docx = new XWPFDocument(fileInputStream);
+            XWPFWordExtractor extractor = new XWPFWordExtractor(docx);
+            String text = extractor.getText();
+            document = Document.from(text);
+        }
+        else if (filename.endsWith(".pdf")) {
+            document = new ApachePdfBoxDocumentParser().parse(fileInputStream);
+        }
+        else {
+            throw new UnsupportedOperationException("不支持文件类型: " + filename);
+        }
         DocumentByParagraphSplitter splitter = new DocumentByParagraphSplitter(1024,0);;
         List<TextSegment> segments = splitter.split(document);
 
@@ -74,14 +79,14 @@ public class LangChainMilvusService {
             String text = segment.text();
             if (text.trim().isEmpty())
                 continue;
-            fileNames.add(file.getName());
-            String[] fileName = file.getName().split("\\.");
+            fileNames.add(file.getOriginalFilename());
+            String[] fileName = file.getOriginalFilename().split("\\.");
             fileTypes.add(fileName[fileName.length - 1]);
             texts.add(text);
             embeddings.add(embeddingModel.embed(text).content().vectorAsList());
         }
 
-        // 准备插入数据
+        // 准备导入数据
         List<InsertParam.Field> fields = new ArrayList<>();
         fields.add(new InsertParam.Field("file_name", fileNames));
         fields.add(new InsertParam.Field("file_type", fileTypes));
@@ -93,20 +98,27 @@ public class LangChainMilvusService {
                 .withFields(fields)
                 .build();
 
-        // 执行插入
-        R<MutationResult> insertResult = milvusClient.insert(insertParam);
-
-        if (insertResult.getStatus() != R.Status.Success.getCode()) {
-            throw new RuntimeException("插入文件失败: " + insertResult.getMessage());
-        }
+        // 执行导入
+        return milvusClient.insert(insertParam);
     }
 
-    // 从Milvus检索相关文档
-    public List<String> retrieveFromMilvus(String query, int topK) throws IOException {
-        List<List<Float>> queryVector = Arrays.asList(embeddingModel.embed(query).content().vectorAsList());
+    /**
+     * 从Milvus检索相关文档
+     */
+    @Override
+    public List<String> retrieveFromMilvus(MilvusClient milvusClient, EmbeddingModel embeddingModel, String collectionName, String query, int topK) {
+        List<List<Float>> queryVector = Collections.singletonList(embeddingModel.embed(query).content().vectorAsList());
 
         //  加载集合
-        loadCollectionName();
+        LoadCollectionParam loadParam = LoadCollectionParam.newBuilder()
+                .withCollectionName(collectionName)
+                .build();
+
+        R<RpcStatus> loadResponse = milvusClient.loadCollection(loadParam);
+        if (loadResponse.getStatus() != R.Status.Success.getCode()) {
+            System.err.println("加载Collection失败: " + loadResponse.getMessage());
+            milvusClient.close();
+        }
 
         // 构建SearchParam
         SearchParam searchParam = SearchParam.newBuilder()
@@ -122,16 +134,38 @@ public class LangChainMilvusService {
         R<SearchResults> response = milvusClient.search(searchParam);
         SearchResultsWrapper wrapper = new SearchResultsWrapper(response.getData().getResults());
 
+        // 释放集合
+        ReleaseCollectionParam param = ReleaseCollectionParam.newBuilder()
+                .withCollectionName(collectionName)
+                .build();
+        milvusClient.releaseCollection(param);
+
         return wrapper.getRowRecords(0).stream()
                 .map(record -> (String) record.get("content"))
                 .collect(Collectors.toList());
     }
 
-    // 调用LLM+RAG生成回答
-    public String generateAnswerWithRag(String question, List<String> contexts) throws IOException {
-        String prompt = buildPrompt(question, contexts);
+    /**
+     * 调用LLM+RAG生成回答
+     */
+    @Override
+    public String generateAnswerWithRag(String question, List<String> contexts, String llmServiceUrl) throws IOException {
+        StringBuilder sb = new StringBuilder();
+        sb.append("根据以下上下文回答问题：\n\n");
+        for (int i = 0; i < contexts.size(); i++) {
+            sb.append("上下文").append(i+1).append(": ").append(contexts.get(i)).append("\n\n");
+        }
+        sb.append("问题: ").append(question).append("\n回答: ");
         // 构建带动态参数的URL
-        HttpUrl url = HttpUrl.parse(LLM_SERVICE_URL)
+        return generateAnswer(llmServiceUrl, sb.toString());
+    }
+
+    /**
+     * 调用LLM生成回答
+     */
+    @Override
+    public String generateAnswer(String llmServiceUrl, String prompt) throws IOException {
+        HttpUrl url = HttpUrl.parse(llmServiceUrl)
                 .newBuilder()
                 .addQueryParameter("prompt", prompt)
 //                .addQueryParameter("max_token", String.valueOf(1024))
@@ -146,48 +180,12 @@ public class LangChainMilvusService {
                 .build();
 
         try (Response response = client.newCall(request).execute()) {
-            String responseBody = response.body().string();
-            String responseResult = JSONObject.parseObject(responseBody).getString("generated_text");
-            return responseResult;
-        }
-    }
-
-    private String buildPrompt(String question, List<String> contexts) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("根据以下上下文回答问题：\n\n");
-        for (int i = 0; i < contexts.size(); i++) {
-            sb.append("上下文").append(i+1).append(": ").append(contexts.get(i)).append("\n\n");
-        }
-        sb.append("问题: ").append(question).append("\n回答: ");
-        return sb.toString();
-    }
-
-    /**
-     * 加载知识库Collection
-     */
-    public void loadCollectionName() {
-        LoadCollectionParam loadParam = LoadCollectionParam.newBuilder()
-                .withCollectionName(collectionName)
-                .build();
-
-        R<RpcStatus> loadResponse = milvusClient.loadCollection(loadParam);
-        if (loadResponse.getStatus() != R.Status.Success.getCode()) {
-            System.err.println("加载Collection失败: " + loadResponse.getMessage());
-            milvusClient.close();
+            if (response.body() != null) {
+                String responseBody = response.body().string();
+                return JSONObject.parseObject(responseBody).getString("generated_text");
+            }
+            else return null;
         }
     }
 
-    /**
-     * 释放知识库Collection
-     */
-    public void releaseCollectionName() {
-        ReleaseCollectionParam param = ReleaseCollectionParam.newBuilder()
-                .withCollectionName(collectionName)
-                .build();
-        milvusClient.releaseCollection(param);
-    }
-
-    public void close() {
-        milvusClient.close();
-    }
 }

llm-back/ruoyi-agent/src/main/java/com/ruoyi/agent/service/MilvusService.java → llm-back/ruoyi-llm/src/main/java/com/ruoyi/web/llm/service/impl/MilvusServiceImpl.java

@@ -1,12 +1,11 @@
-package com.ruoyi.agent.service;
+package com.ruoyi.web.llm.service.impl;
 
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
-import io.milvus.client.MilvusServiceClient;
+import com.ruoyi.web.llm.service.IMilvusService;
+import io.milvus.client.MilvusClient;
 import io.milvus.grpc.*;
-import io.milvus.param.ConnectParam;
-import io.milvus.param.IndexType;
-import io.milvus.param.MetricType;
+import io.milvus.param.*;
 import io.milvus.param.collection.*;
 import io.milvus.param.dml.DeleteParam;
 import io.milvus.param.highlevel.collection.ListCollectionsParam;
@@ -15,6 +14,7 @@ import io.milvus.param.highlevel.dml.QuerySimpleParam;
 import io.milvus.param.highlevel.dml.response.QueryResponse;
 import io.milvus.param.index.CreateIndexParam;
 import io.milvus.response.QueryResultsWrapper;
+import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -23,25 +23,14 @@ import java.util.List;
 import java.util.TimeZone;
 import java.util.stream.Collectors;
 
-public class MilvusService {
-    private MilvusServiceClient milvusClient;
-
-    /**
-     *  连接milvus知识库
-     */
-    public MilvusService(String host, int port) {
-        this.milvusClient = new MilvusServiceClient(
-                ConnectParam.newBuilder()
-                        .withHost(host)
-                        .withPort(port)
-                        .build()
-        );
-    }
+@Service
+public class MilvusServiceImpl implements IMilvusService {
 
     /**
      * 新建知识库Collection（含Schema、Field、Index）
      */
-    public void createCollection(String collectionName, String description, int dimension) {
+    @Override
+    public R<RpcStatus> createCollection(MilvusClient milvusClient, String collectionName, String description, int dimension) {
         FieldType idField = FieldType.newBuilder()
                 .withName("id")
                 .withDataType(DataType.Int64)
@@ -83,7 +72,7 @@ public class MilvusService {
                 .addFieldType(vectorField)
                 .build();
 
-        milvusClient.createCollection(createCollectionParam);
+        R<RpcStatus> createResult = milvusClient.createCollection(createCollectionParam);
 
         // 创建索引
         CreateIndexParam createIndexParam = CreateIndexParam.newBuilder()
@@ -95,12 +84,13 @@ public class MilvusService {
                 .build();
 
         milvusClient.createIndex(createIndexParam);
+        return createResult;
     }
 
     /**
      * 查询知识库Collection
      */
-    public JSONArray getCollectionNames() {
+    public JSONArray getCollectionNames(MilvusClient milvusClient) {
         JSONArray jsonArray = new JSONArray();
         ListCollectionsParam listParam = ListCollectionsParam.newBuilder().build();
         ListCollectionsResponse listResponse = milvusClient.listCollections(listParam).getData();
@@ -128,7 +118,7 @@ public class MilvusService {
     /**
      * 修改知识库Collection
      */
-    public void collectionRename(String collectionName, String newCollectionName) {
+    public void collectionRename(MilvusClient milvusClient, String collectionName, String newCollectionName) {
         RenameCollectionParam renameCollectionReq = RenameCollectionParam.newBuilder()
                 .withOldCollectionName(collectionName)
                 .withNewCollectionName(newCollectionName)
@@ -140,7 +130,7 @@ public class MilvusService {
     /**
      * 删除知识库Collection
      */
-    public void deleteCollectionName(String collectionName) {
+    public void deleteCollectionName(MilvusClient milvusClient, String collectionName) {
         DropCollectionParam param = DropCollectionParam.newBuilder()
                 .withCollectionName(collectionName)
                 .build();
@@ -150,9 +140,9 @@ public class MilvusService {
     /**
      * 查询知识库文件
      */
-    public List<String> listDocument(String collectionName, String fileType) {
+    public List<String> listDocument(MilvusClient milvusClient, String collectionName, String fileType) {
         List<String> documentList = new ArrayList<>();
-        loadCollectionName(collectionName);
+        loadCollectionName(milvusClient,collectionName);
         QuerySimpleParam queryParam = QuerySimpleParam.newBuilder()        
                 .withCollectionName(collectionName)
                 .withFilter("id > 0")
@@ -174,15 +164,15 @@ public class MilvusService {
                 documentList.add(rowRecord.get("file_name").toString());
             }
         }
-        releaseCollectionName(collectionName);
+        releaseCollectionName(milvusClient, collectionName);
         return documentList.stream().distinct().collect(Collectors.toList());
     }
 
     /**
      * 删除知识库文件
      */
-    public void removeDocument(String collectionName, String fileName) {
-        loadCollectionName(collectionName);
+    public void removeDocument(MilvusClient milvusClient, String collectionName, String fileName) {
+        loadCollectionName(milvusClient, collectionName);
         DeleteParam deleteParam = DeleteParam.newBuilder()
                 .withCollectionName(collectionName)
                 .withExpr(String.format("file_name == \"%s\"", fileName))
@@ -193,7 +183,7 @@ public class MilvusService {
     /**
      * 加载知识库Collection
      */
-    public void loadCollectionName(String collectionName) {
+    public void loadCollectionName(MilvusClient milvusClient, String collectionName) {
         LoadCollectionParam param = LoadCollectionParam.newBuilder()
                 .withCollectionName(collectionName)
                 .build();
@@ -203,14 +193,11 @@ public class MilvusService {
     /**
      * 释放知识库Collection
      */
-    public void releaseCollectionName(String collectionName) {
+    public void releaseCollectionName(MilvusClient milvusClient, String collectionName) {
         ReleaseCollectionParam param = ReleaseCollectionParam.newBuilder()
                 .withCollectionName(collectionName)
                 .build();
         milvusClient.releaseCollection(param);
     }
 
-    public void close() {
-        milvusClient.close();
-    }
 }