From a92bdeadf6b3fccb6fb89d73753f0b8b1b7245c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Tue, 31 Dec 2024 08:28:55 +0800
Subject: [PATCH] 'commit'

---
 .../java/Tools/MaxKb/Service/Impl/MaxKbImpl.java |  1 +
 .../java/Tools/MaxKb/Service/MaxKbService.java   | 16 ++++++++++++++--
 src/main/java/Tools/MaxKb/UploadDocument.java    |  6 ++++++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/main/java/Tools/MaxKb/Service/Impl/MaxKbImpl.java b/src/main/java/Tools/MaxKb/Service/Impl/MaxKbImpl.java
index b6fec4fa..fa7903ea 100644
--- a/src/main/java/Tools/MaxKb/Service/Impl/MaxKbImpl.java
+++ b/src/main/java/Tools/MaxKb/Service/Impl/MaxKbImpl.java
@@ -179,6 +179,7 @@ public class MaxKbImpl {
     }
 
     public static String _bach(String authCode, String zskId, String body) {
+        System.out.println("发送的body="+body);
         String url = baseUrl + "/api/dataset/" + zskId + "/document/_bach";
         HttpResponse response = HttpRequest.put(url)
                 .header("Accept", "application/json, text/plain, */*")
diff --git a/src/main/java/Tools/MaxKb/Service/MaxKbService.java b/src/main/java/Tools/MaxKb/Service/MaxKbService.java
index a480e56f..0221e4b4 100644
--- a/src/main/java/Tools/MaxKb/Service/MaxKbService.java
+++ b/src/main/java/Tools/MaxKb/Service/MaxKbService.java
@@ -20,7 +20,7 @@ public class MaxKbService {
      * @param uploadFile  文件路径
      */
     public static void uploadQA(String dataSetName, String uploadFile) {
-        List<com.jfinal.plugin.activerecord.Record> list = mm.getDataSetList(dataSetName);
+        List<Record> list = mm.getDataSetList(dataSetName);
         if (list.size() > 1) {
             System.out.println("数据集:【" + dataSetName + "】名称重复,请检查后重新运行！");
             return;
@@ -79,7 +79,19 @@ public class MaxKbService {
     /**
      * 上传文档
      */
-    public static String _bach(String zskId, String uploadFile) {
+    public static String _bach(String dataSetName, String uploadFile) {
+        List<Record> list = mm.getDataSetList(dataSetName);
+        if (list.size() > 1) {
+            System.out.println("数据集:【" + dataSetName + "】名称重复,请检查后重新运行！");
+            return null;
+        }
+        if (list.isEmpty()) {
+            System.out.println("数据集:【" + dataSetName + "】不存在,请检查后重新运行！");
+            return null;
+        }
+        //数据集ID
+        String zskId = list.getFirst().getStr("id");
+
         //上传文件
         cn.hutool.json.JSONObject jo = uploadDocumentSplit(uploadFile);
         JSONArray ja = jo.getJSONArray("data");
diff --git a/src/main/java/Tools/MaxKb/UploadDocument.java b/src/main/java/Tools/MaxKb/UploadDocument.java
index b788ab5f..8f689ee9 100644
--- a/src/main/java/Tools/MaxKb/UploadDocument.java
+++ b/src/main/java/Tools/MaxKb/UploadDocument.java
@@ -1,5 +1,6 @@
 package Tools.MaxKb;
 
+import Tools.MaxKb.Service.MaxKbService;
 import Tools.MaxKb.Util.MaxKbUtil;
 import com.jfinal.kit.PropKit;
 
@@ -12,5 +13,10 @@ public class UploadDocument {
         PropKit.use("MaxKb.properties");
         //初始化数据库
         MaxKbUtil.Init();
+
+        //测试上传
+        String dataSetName = "XXX的知识库";
+        String res = MaxKbService._bach(dataSetName, uploadFile);
+        System.out.println(res);
     }
 }
\ No newline at end of file