From 20cd63d324aa1b90e25e1f0e7cd0e7fa145fdbb7 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:12:59 +0800 Subject: [PATCH] 'commit' --- .../黄海的个人简历【QA版本】.xlsx | Bin 0 -> 11493 bytes .../Tools/MaxKb/Service/Impl/MaxKbImpl.java | 4 +- .../Tools/MaxKb/Service/MaxKbService.java | 70 +++++++----------- src/main/java/Tools/MaxKb/UploadQA.java | 14 +++- 4 files changed, 40 insertions(+), 48 deletions(-) create mode 100644 Doc/MaxKB/黄海的个人简历【QA版本】.xlsx diff --git a/Doc/MaxKB/黄海的个人简历【QA版本】.xlsx b/Doc/MaxKB/黄海的个人简历【QA版本】.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..bf5bca04ec619413c0dc53d2c454b1840fee83bc GIT binary patch literal 11493 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 list = mm.getDataSetList(dataSetName); + public static String getZskId(String zskName) { + List list = mm.getDataSetList(zskName); if (list.size() > 1) { - System.out.println("数据集:【" + dataSetName + "】名称重复,请检查后重新运行！"); - return; + System.out.println("数据集:【" + zskName + "】名称重复,请检查后重新运行！"); + return null; } if (list.isEmpty()) { - System.out.println("数据集:【" + dataSetName + "】不存在,请检查后重新运行！"); - return; + System.out.println("数据集:【" + zskName + "】不存在,请检查后重新运行！"); + return null; } //数据集ID - String zskId = list.getFirst().getStr("id"); + return list.getFirst().getStr("id"); + } + /** + * 上传文件到知识库 + * + * @param zskName 数据集名称 + * @param uploadFile 文件路径 + */ + public static String uploadQA(String zskName, String uploadFile) { + //数据集ID + String zskId = getZskId(zskName); //在上传文档前，需要删除掉旧的同名文档 File fi = new File(uploadFile); String fileName = fi.getName(); //获取身份识别 String authCode = MaxKbImpl.getAuthorization(); //上传文档 - List listDocuments = mm.getDocumentListByDataSetId(zskId); + List listDocuments = mm.getDocumentListByDataSetId(zskId); for (Record record : listDocuments) { String documentName = record.getStr("name"); if (documentName.equals(fileName)) { @@ -51,12 +61,7 @@ public class MaxKbService { } } //上传新的文档 - String documentId = MaxKbImpl.uploadQA(authCode, zskId, uploadFile); - //2、需要重新生成问题 - String modelName = PropKit.get("modelName"); - String model_id = getModelIdByModelName(modelName); - //生成问题 - MaxKbImpl.generateQuestion(authCode, zskId, model_id, documentId); + return MaxKbImpl.uploadQA(authCode, zskId, uploadFile); } @@ -85,19 +90,9 @@ public class MaxKbService { /** * 上传文档 */ - public static String _bach(String dataSetName, String uploadFile) { - List list = mm.getDataSetList(dataSetName); - if (list.size() > 1) { - System.out.println("数据集:【" + dataSetName + "】名称重复,请检查后重新运行！"); - return null; - } - if (list.isEmpty()) { - System.out.println("数据集:【" + dataSetName + "】不存在,请检查后重新运行！"); - return null; - } + public static String _bach(String zskName, String uploadFile) { //数据集ID - String zskId = list.getFirst().getStr("id"); - + String zskId = getZskId(zskName); //上传文件 JSONObject jo = splitDocument(uploadFile); JSONArray ja = jo.getJSONArray("data"); @@ -113,22 +108,13 @@ public class MaxKbService { /** * 批量生成相关问题 - * @param dataSetName 数据集名称 - * @param documentId 文档id + * + * @param documentId 文档id * @return */ - public static String batch_generate_related(String dataSetName, String documentId) { - List list = mm.getDataSetList(dataSetName); - if (list.size() > 1) { - System.out.println("数据集:【" + dataSetName + "】名称重复,请检查后重新运行！"); - return null; - } - if (list.isEmpty()) { - System.out.println("数据集:【" + dataSetName + "】不存在,请检查后重新运行！"); - return null; - } + public static String batch_generate_related(String zskName, String documentId) { //数据集ID - String zskId = list.getFirst().getStr("id"); + String zskId = getZskId(zskName); return MaxKbImpl.batch_generate_related(MaxKbImpl.getAuthorization(), zskId, documentId); } } diff --git a/src/main/java/Tools/MaxKb/UploadQA.java b/src/main/java/Tools/MaxKb/UploadQA.java index d849ebcb..87e4f6d3 100644 --- a/src/main/java/Tools/MaxKb/UploadQA.java +++ b/src/main/java/Tools/MaxKb/UploadQA.java @@ -1,12 +1,13 @@ package Tools.MaxKb; +import Tools.MaxKb.Service.Impl.MaxKbImpl; import Tools.MaxKb.Service.MaxKbService; import Tools.MaxKb.Util.MaxKbUtil; import com.jfinal.kit.PropKit; public class UploadQA { //要上传的QA知识内容 - static String uploadFile = "D:\\dsWork\\QingLong\\Doc\\MaxKB\\各学校人员和班级统计【结果】.xlsx"; + static String uploadFile = "D:\\dsWork\\QingLong\\Doc\\MaxKB\\黄海的个人简历【QA版本】.xlsx"; public static void main(String[] args) throws Exception { //加载配置文件 @@ -14,9 +15,14 @@ public class UploadQA { //初始化数据库 MaxKbUtil.Init(); //上传文件 - //获取数据集名称 - String dataSetName = "应用【模板】"; - MaxKbService.uploadQA(dataSetName,uploadFile); + String zskName = "知识库【模板】"; + String documentId = MaxKbService.uploadQA(zskName, uploadFile); + + //2、需要重新生成问题 + String modelName = PropKit.get("modelName"); + String model_id = MaxKbService.getModelIdByModelName(modelName); + //生成问题 + MaxKbImpl.generateQuestion(zskName, model_id, documentId); System.out.println("恭喜，所有操作成功完成！"); } } \ No newline at end of file