From b7926c241540083349d43ffd4d78e97e1bdf053b 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 11:44:54 +0800 Subject: [PATCH] 'commit' --- .../java/Tools/MaxKb/Model/MaxKbModel.java | 39 +++++++++++++++---- .../Tools/MaxKb/Service/MaxKbService.java | 19 +++++++-- src/main/java/Tools/MaxKb/UploadQA.java | 16 +++++--- .../com/dsideal/QingLong/Util/CommonUtil.java | 10 +++++ 4 files changed, 67 insertions(+), 17 deletions(-) diff --git a/src/main/java/Tools/MaxKb/Model/MaxKbModel.java b/src/main/java/Tools/MaxKb/Model/MaxKbModel.java index 97cff0b7..0df8d58f 100644 --- a/src/main/java/Tools/MaxKb/Model/MaxKbModel.java +++ b/src/main/java/Tools/MaxKb/Model/MaxKbModel.java @@ -89,7 +89,7 @@ public class MaxKbModel { //名称 record.set("name", targetApplicationName); //描述 - record.set("desc","【代码生成】"); + record.set("desc", "【代码生成】"); //增加 Db.save("application", "id", record); @@ -126,7 +126,7 @@ public class MaxKbModel { //名称 record.set("name", targetDatasetName); //描述 - record.set("desc","【代码生成】"); + record.set("desc", "【代码生成】"); //增加 Db.save("dataset", "id", record); return record.getStr("id"); @@ -156,7 +156,7 @@ public class MaxKbModel { /** * 删除代码生成的数据 */ - public void delCodeGenerateApplicationDataSet(){ + public void delCodeGenerateApplicationDataSet() { //通过SQL查询出所有desc=【代码生成】的数据 String sql = "select * from application where \"desc\"='【代码生成】'"; List list = Db.find(sql); @@ -166,20 +166,20 @@ public class MaxKbModel { sql = "delete from application_dataset_mapping where application_id=?"; Db.update(sql, UUID.fromString(application_id)); - sql="delete from application_access_token where application_id=?"; + sql = "delete from application_access_token where application_id=?"; Db.update(sql, UUID.fromString(application_id)); - sql="select * from application_chat where application_id=?"; + sql = "select * from application_chat where application_id=?"; List list1 = Db.find(sql, UUID.fromString(application_id)); for (Record record1 : list1) { String chat_id = record1.getStr("id"); - sql="delete from application_chat_record where chat_id=?"; + sql = "delete from application_chat_record where chat_id=?"; Db.update(sql, UUID.fromString(chat_id)); } - sql="delete from application_chat where application_id=?"; + sql = "delete from application_chat where application_id=?"; Db.update(sql, UUID.fromString(application_id)); - sql="delete from application_api_key where application_id=?"; + sql = "delete from application_api_key where application_id=?"; Db.update(sql, UUID.fromString(application_id)); //删除应用 sql = "delete from application where id=?"; @@ -188,4 +188,27 @@ public class MaxKbModel { sql = "delete from dataset where \"desc\"='【代码生成】'"; Db.update(sql); } + + /** + * 获取文档 + * + * @param documentId + * @return + */ + public Record getDocument(String documentId) { + String sql = "select * from document where id=?"; + return Db.findFirst(sql, UUID.fromString(documentId)); + } + + /** + * 判断文档是否已经自动索引 + * + * @param documentId 文档id + * @return + */ + public boolean autoIndexed(String documentId) { + Record record = getDocument(documentId); + String status = record.getStr("status"); + return status.equals("nn2"); + } } diff --git a/src/main/java/Tools/MaxKb/Service/MaxKbService.java b/src/main/java/Tools/MaxKb/Service/MaxKbService.java index b75311a2..684c8bb4 100644 --- a/src/main/java/Tools/MaxKb/Service/MaxKbService.java +++ b/src/main/java/Tools/MaxKb/Service/MaxKbService.java @@ -109,7 +109,7 @@ public class MaxKbService { /** * 批量生成相关问题 * - * @param documentId 文档id + * @param documentId 文档id * @return */ public static String batch_generate_related(String zskName, String documentId) { @@ -120,12 +120,23 @@ public class MaxKbService { /** * 生成问题 - * @param zskName 知识库名称 - * @param modelName 模型名称 + * + * @param zskName 知识库名称 + * @param modelName 模型名称 * @param documentId 文档Id * @return */ - public static JSONObject generateQuestion(String zskName, String modelName, String documentId){ + public static JSONObject generateQuestion(String zskName, String modelName, String documentId) { return MaxKbImpl.generateQuestion(getZskId(zskName), getModelIdByModelName(modelName), documentId); } + + /** + * 是否完成了自动索引 + * + * @param documentId 文档id + * @return + */ + public static boolean autoIndexed(String documentId) { + return mm.autoIndexed(documentId); + } } diff --git a/src/main/java/Tools/MaxKb/UploadQA.java b/src/main/java/Tools/MaxKb/UploadQA.java index 559f98dd..bb8abbc5 100644 --- a/src/main/java/Tools/MaxKb/UploadQA.java +++ b/src/main/java/Tools/MaxKb/UploadQA.java @@ -1,8 +1,8 @@ package Tools.MaxKb; -import Tools.MaxKb.Service.Impl.MaxKbImpl; import Tools.MaxKb.Service.MaxKbService; import Tools.MaxKb.Util.MaxKbUtil; +import com.dsideal.QingLong.Util.CommonUtil; import com.jfinal.kit.PropKit; public class UploadQA { @@ -23,10 +23,16 @@ public class UploadQA { String model_id = MaxKbService.getModelIdByModelName(modelName); //3、等待模型生成问题完毕 - - - //4、手动生成问题 - MaxKbService.generateQuestion(zskName, model_id, documentId); + while (true) { + boolean finish = MaxKbService.autoIndexed(documentId); + if (finish) { + //手动生成问题 + MaxKbService.generateQuestion(zskName, model_id, documentId); + break; + } + Thread.sleep(1000); + System.out.println(CommonUtil.getCurrentTime() + " 正在等待模型生成问题完毕..."); + } System.out.println("恭喜，所有操作成功完成！"); } } \ No newline at end of file diff --git a/src/main/java/com/dsideal/QingLong/Util/CommonUtil.java b/src/main/java/com/dsideal/QingLong/Util/CommonUtil.java index a1f9b817..fe214b2e 100644 --- a/src/main/java/com/dsideal/QingLong/Util/CommonUtil.java +++ b/src/main/java/com/dsideal/QingLong/Util/CommonUtil.java @@ -23,6 +23,8 @@ import java.nio.charset.StandardCharsets; import java.security.SecureRandom; import java.text.ParseException; import java.text.SimpleDateFormat; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -814,4 +816,12 @@ public class CommonUtil { return year + "-" + month + "-" + day; } + + /** + * 获取当前时间 + * @return + */ + public static String getCurrentTime(){ + return LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + } }