From 9e4c8c0bc9b6ceca9ee61ffedb3cfd5393929983 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 13:24:24 +0800
Subject: [PATCH] 'commit'

---
 .../Tools/MaxKb/Service/Impl/MaxKbImpl.java    |  5 +----
 .../java/Tools/MaxKb/Service/MaxKbService.java | 18 +++---------------
 src/main/java/Tools/MaxKb/UploadQA.java        |  2 +-
 3 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/src/main/java/Tools/MaxKb/Service/Impl/MaxKbImpl.java b/src/main/java/Tools/MaxKb/Service/Impl/MaxKbImpl.java
index 0b14a9d0..3c4dcacb 100644
--- a/src/main/java/Tools/MaxKb/Service/Impl/MaxKbImpl.java
+++ b/src/main/java/Tools/MaxKb/Service/Impl/MaxKbImpl.java
@@ -158,7 +158,7 @@ public class MaxKbImpl {
      * @param documentId 文档id
      * @return
      */
-    public static JSONObject generateQuestion(String zskId, String modelId, String documentId) {
+    public static JSONObject genQuestion(String zskId, String modelId, String documentId) {
         String authCode = MaxKbImpl.getAuthorization();
         String url = baseUrl + "/api/dataset/" + zskId + "/document/batch_generate_related";
         JSONObject jo = new JSONObject();
@@ -168,9 +168,6 @@ public class MaxKbImpl {
         list.add(documentId);
         jo.put("document_id_list", list);
 
-        System.out.println("modelId=" + modelId);
-        System.out.println(jo.toString());
-
         HttpResponse response = HttpRequest.put(url)
                 .header("Accept", "application/json, text/plain, */*")
                 .header("Accept-Encoding", "gzip,deflate")
diff --git a/src/main/java/Tools/MaxKb/Service/MaxKbService.java b/src/main/java/Tools/MaxKb/Service/MaxKbService.java
index b539f8e0..1e156413 100644
--- a/src/main/java/Tools/MaxKb/Service/MaxKbService.java
+++ b/src/main/java/Tools/MaxKb/Service/MaxKbService.java
@@ -126,28 +126,16 @@ public class MaxKbService {
      * @param documentId 文档Id
      * @return
      */
-    public JSONObject generateQuestion(String zskName, String modelName, String documentId) throws InterruptedException {
+    public JSONObject genQuestion(String zskName, String modelName, String documentId) throws InterruptedException {
         //等待模型生成问题完毕
         while (true) {
-            boolean finish = autoIndexed(documentId);
+            boolean finish = mm.autoIndexed(documentId);
             if (finish) {
-                //手动生成问题
-                JSONObject res = generateQuestion(zskName, modelName, documentId);
                 break;
             }
             Thread.sleep(500);
             System.out.println(CommonUtil.getCurrentTime() + "    正在等待模型生成问题完毕...");
         }
-        return MaxKbImpl.generateQuestion(getZskId(zskName), getModelIdByModelName(modelName), documentId);
-    }
-
-    /**
-     * 是否完成了自动索引
-     *
-     * @param documentId 文档id
-     * @return
-     */
-    public boolean autoIndexed(String documentId) {
-        return mm.autoIndexed(documentId);
+        return MaxKbImpl.genQuestion(getZskId(zskName), getModelIdByModelName(modelName), documentId);
     }
 }
diff --git a/src/main/java/Tools/MaxKb/UploadQA.java b/src/main/java/Tools/MaxKb/UploadQA.java
index a6c5f4a0..01744c00 100644
--- a/src/main/java/Tools/MaxKb/UploadQA.java
+++ b/src/main/java/Tools/MaxKb/UploadQA.java
@@ -21,7 +21,7 @@ public class UploadQA {
 
         //2、手动生成问题
         String modelName = "DeepSeek";//使用哪个模型
-        service.generateQuestion(zskName, modelName, documentId);
+        service.genQuestion(zskName, modelName, documentId);
 
         System.out.println("恭喜，所有操作成功完成！");
     }