返回向量数据库查询列表

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

@@ -1,5 +1,6 @@
 package com.ruoyi.agent.controller;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.agent.service.LangChainMilvusService;
 import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.core.controller.BaseController;
@@ -33,8 +34,7 @@ public class KnowLedgeController extends BaseController
     @GetMapping("/list")
     public AjaxResult listKnowLedgeCollection()
     {
-        List<String> collectionNames = milvusService.getCollectionNames();
-        milvusService.close();
+        JSONObject collectionNames = milvusService.getCollectionNames();
         return success(collectionNames);
     }
 
@@ -42,10 +42,10 @@ public class KnowLedgeController extends BaseController
      * 新建知识库
      */
     @PostMapping("/create")
-    public AjaxResult createKnowLedgeCollection(String collectionName)
+    public AjaxResult createKnowLedgeCollection(String collectionName, String description)
     {
-        milvusService.createCollection(collectionName, 512);
-        milvusService.close();
+        milvusService.createCollection(collectionName, description, 512);
+        milvusService.releaseCollectionName(collectionName);
         return success();
     }
 
@@ -56,7 +56,7 @@ public class KnowLedgeController extends BaseController
     public AjaxResult modifyKnowLedgeCollection(String collectionName, String newCollectionName)
     {
         milvusService.collectionRename(collectionName, newCollectionName);
-        milvusService.close();
+        milvusService.releaseCollectionName(collectionName);
         return success();
     }
 
@@ -67,7 +67,6 @@ public class KnowLedgeController extends BaseController
     public AjaxResult removeKnowLedgeCollection(String collectionName)
     {
         milvusService.deleteCollectionName(collectionName);
-        milvusService.close();
         return success();
     }
 
@@ -91,7 +90,7 @@ public class KnowLedgeController extends BaseController
             file.transferTo(transferFile);
         }
         langChainMilvusService.insertLangchainEmbeddingDocument(transferFile);
-        langChainMilvusService.close();
+        langChainMilvusService.releaseCollectionName(collectionName);
         return success();
     }
 

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

@@ -13,7 +13,7 @@ import java.io.IOException;
 import java.util.List;
 
 /**
- * cmc知识库Controller
+ * rag增强检索生成对话Controller
  * 
  * @author cmc
  * @date 2025-04-08

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

@@ -12,7 +12,7 @@ import java.io.IOException;
 import java.util.concurrent.TimeUnit;
 
 /**
- * cmc知识库Controller
+ * session对话Controller
  * 
  * @author cmc
  * @date 2025-04-08
@@ -37,7 +37,7 @@ public class SessionController extends BaseController
         HttpUrl url = HttpUrl.parse("http://192.168.28.188:8000/generate")
                 .newBuilder()
                 .addQueryParameter("prompt", question)
-                .addQueryParameter("max_token", String.valueOf(1024))
+//                .addQueryParameter("max_token", String.valueOf(1024))
                 .build();
 
         Request request = new Request.Builder()

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

@@ -15,6 +15,7 @@ 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.InsertParam;
 import io.milvus.param.dml.SearchParam;
 import io.milvus.response.SearchResultsWrapper;
@@ -44,7 +45,7 @@ public class LangChainMilvusService {
                         .withPort(port)
                         .build()
         );
-        this.LLM_SERVICE_URL = "http://" + host + ":8080/generate";
+        this.LLM_SERVICE_URL = "http://" + host + ":8000/generate";
         this.collectionName = collectionName;
         this.embeddingModel = embeddingModel;
     }
@@ -131,7 +132,7 @@ public class LangChainMilvusService {
         HttpUrl url = HttpUrl.parse(LLM_SERVICE_URL)
                 .newBuilder()
                 .addQueryParameter("prompt", prompt)
-                .addQueryParameter("max_token", String.valueOf(1024))
+//                .addQueryParameter("max_token", String.valueOf(1024))
                 .build();
 
         Request request = new Request.Builder()
@@ -159,6 +160,16 @@ public class LangChainMilvusService {
         return sb.toString();
     }
 
+    /**
+     * 释放知识库Collection
+     */
+    public void releaseCollectionName(String collectionName) {
+        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

@@ -1,17 +1,18 @@
 package com.ruoyi.agent.service;
 
+import com.alibaba.fastjson2.JSONObject;
 import io.milvus.client.MilvusServiceClient;
 import io.milvus.grpc.DataType;
 import io.milvus.param.ConnectParam;
 import io.milvus.param.IndexType;
 import io.milvus.param.MetricType;
-import io.milvus.param.collection.CreateCollectionParam;
-import io.milvus.param.collection.DropCollectionParam;
-import io.milvus.param.collection.FieldType;
-import io.milvus.param.collection.RenameCollectionParam;
+import io.milvus.param.collection.*;
 import io.milvus.param.highlevel.collection.ListCollectionsParam;
 import io.milvus.param.index.CreateIndexParam;
+
+import java.text.SimpleDateFormat;
 import java.util.List;
+import java.util.TimeZone;
 
 public class MilvusService {
     private MilvusServiceClient milvusClient;
@@ -31,7 +32,7 @@ public class MilvusService {
     /**
      * 新建知识库Collection（含Schema、Field、Index）
      */
-    public void createCollection(String collectionName, int dimension) {
+    public void createCollection(String collectionName, String description, int dimension) {
         FieldType idField = FieldType.newBuilder()
                 .withName("id")
                 .withDataType(DataType.Int64)
@@ -59,6 +60,7 @@ public class MilvusService {
 
         CreateCollectionParam createCollectionParam = CreateCollectionParam.newBuilder()
                 .withCollectionName(collectionName)
+                .withDescription(description)
                 .addFieldType(idField)
                 .addFieldType(fileNameField)
                 .addFieldType(contentField)
@@ -82,9 +84,21 @@ public class MilvusService {
     /**
      * 查询知识库Collection
      */
-    public List<String> getCollectionNames() {
-        ListCollectionsParam param = ListCollectionsParam.newBuilder().build();
-        return milvusClient.listCollections(param).getData().collectionNames;
+    public JSONObject getCollectionNames() {
+        JSONObject jsonObject = new JSONObject();
+        ListCollectionsParam listParam = ListCollectionsParam.newBuilder().build();
+        List<String> collectionNames = milvusClient.listCollections(listParam).getData().collectionNames;
+        ShowCollectionsParam showParam = ShowCollectionsParam.newBuilder().withCollectionNames(collectionNames).build();
+        int size = milvusClient.showCollections(showParam).getData().getCollectionIdsCount();
+        for (int i = 0; i < size; i++) {
+            jsonObject.put("collectionId", milvusClient.showCollections(showParam).getData().getCollectionIds(i));
+            jsonObject.put("collectionName", milvusClient.showCollections(showParam).getData().getCollectionNames(i));
+            SimpleDateFormat beijingFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            beijingFormat.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
+            String beijingTime = beijingFormat.format(milvusClient.showCollections(showParam).getData().getCreatedUtcTimestamps(i));
+            jsonObject.put("createdTime", beijingTime);
+        }
+        return jsonObject;
     }
 
     /**
@@ -108,6 +122,16 @@ public class MilvusService {
         milvusClient.dropCollection(param);
     }
 
+    /**
+     * 释放知识库Collection
+     */
+    public void releaseCollectionName(String collectionName) {
+        ReleaseCollectionParam param = ReleaseCollectionParam.newBuilder()
+                .withCollectionName(collectionName)
+                .build();
+        milvusClient.releaseCollection(param);
+    }
+
     public void close() {
         milvusClient.close();
     }