From 41d78b0272bed5e6d9bab4fdf2ff77b1435ba65b Mon Sep 17 00:00:00 2001 From: hanyuqing <1106611654@qq.com> Date: Wed, 17 Sep 2025 10:06:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E5=9B=BE=E8=B0=B1=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/ZhyFileManageController.java | 28 +++++++++++++++++----- .../com/ruoyi/api/controller/EsTestController.java | 3 --- .../com/ruoyi/api/service/impl/BuildService.java | 19 ++++++++------- 3 files changed, 33 insertions(+), 17 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZhyFileManageController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZhyFileManageController.java index fa2fd1f..d795ce0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZhyFileManageController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZhyFileManageController.java @@ -3,7 +3,9 @@ package com.ruoyi.web.controller.system; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.ruoyi.TxtFileReader; +import com.ruoyi.api.domain.ESDao; import com.ruoyi.api.domain.ZhyDocApi; +import com.ruoyi.api.service.impl.ESService; import com.ruoyi.common.config.RuoYiConfig; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; @@ -95,7 +97,8 @@ public class ZhyFileManageController extends BaseController { ZhyArticleMapper zhyArticleMapper; @Autowired ZhyDocmubanMapper zhyDocmubanMapper; - + @Autowired + ESService esService; @PostMapping("/exportList") public void export(HttpServletResponse response) { @@ -519,7 +522,7 @@ public class ZhyFileManageController extends BaseController { // } // } @GetMapping("/reset") - public AjaxResult reset() throws IOException { + public AjaxResult reset() throws Throwable { String url = saveFileWithStructure1(); List nodeList=new ArrayList<>(); @@ -1168,7 +1171,22 @@ public class ZhyFileManageController extends BaseController { test1Mapper.updateGraphStatus(node.getId()); } } + //创建索引 + List esDaos=new ArrayList<>(); + + for (int i=0;i listR = zhyDocRelationMapper.getAllRelation(); @@ -1197,7 +1215,6 @@ public class ZhyFileManageController extends BaseController { neo4jUtil.excuteCypherSql(cql); test1Mapper.updateGraphRelation(listR.get(i)); } - return AjaxResult.success().put("msg", "成功"); } //一键删除方法 @@ -2261,7 +2278,6 @@ public class ZhyFileManageController extends BaseController { return AjaxResult.success().put("data", ll); } - ; @PostMapping("/getTxt") public ResponseEntity getTxt(@RequestBody Map requestBody) { @@ -2330,8 +2346,8 @@ public class ZhyFileManageController extends BaseController { zhyDoc.setDocLevel(docLevelNew); zhyDoc.setProdectName(prodectName); test1Mapper.updateDocById(zhyDoc); - luceneUtil.deleteIndexByUrl(String.valueOf(id)); - luceneUtil.createSingleIndex1(String.valueOf(newPath), id); +// luceneUtil.deleteIndexByUrl(String.valueOf(id)); +// luceneUtil.createSingleIndex1(String.valueOf(newPath), id); String cql = "match (r{docId:'" + id + "'}) SET r.docTitle = '" + name1 + "'"; diff --git a/ruoyi-api/src/main/java/com/ruoyi/api/controller/EsTestController.java b/ruoyi-api/src/main/java/com/ruoyi/api/controller/EsTestController.java index 71967ba..257a9c0 100644 --- a/ruoyi-api/src/main/java/com/ruoyi/api/controller/EsTestController.java +++ b/ruoyi-api/src/main/java/com/ruoyi/api/controller/EsTestController.java @@ -129,9 +129,6 @@ public class EsTestController { return map; } - - - @GetMapping("/getHeightLight/{querypream}") public void getHeightLight(@PathVariable("querypream")String querypream) { System.out.println(querypream); diff --git a/ruoyi-api/src/main/java/com/ruoyi/api/service/impl/BuildService.java b/ruoyi-api/src/main/java/com/ruoyi/api/service/impl/BuildService.java index 8f4b6d4..e219a66 100644 --- a/ruoyi-api/src/main/java/com/ruoyi/api/service/impl/BuildService.java +++ b/ruoyi-api/src/main/java/com/ruoyi/api/service/impl/BuildService.java @@ -219,21 +219,24 @@ public class BuildService { line = line.trim(); if (line.isEmpty()) continue; // 跳过空行 - if (line.startsWith("作者：")) { - // 遇到新的“作者”，说明上一条记录已结束，可以保存 + if (line.startsWith("题名:")) { if (zhyArticle != null) { articles.add(zhyArticle); } // 开始一条新记录 zhyArticle = new ZhyArticle(); - zhyArticle.setAuthors(line.substring(3)); // 去掉"作者：" - } else if (line.startsWith("单位：")) { + zhyArticle.setName(line.substring(3)); + }else if (line.startsWith("作者:")) { + if (zhyArticle != null) { + zhyArticle.setAuthors(line.substring(3)); // 去掉"单位：" + } + } else if (line.startsWith("单位:")) { if (zhyArticle != null) { zhyArticle.setAgencies(line.substring(3)); // 去掉"单位：" } - } else if (line.startsWith("题名：")) { + } else if (line.startsWith("摘要：")) { if (zhyArticle != null) { - zhyArticle.setName(line.substring(3)); // 去掉"题名：" + zhyArticle.setSummary(line.substring(3)); // 去掉"题名：" } } } @@ -351,9 +354,9 @@ public class BuildService { System.out.println("文件路径: " + file.getAbsolutePath()); article.setLocalUrl(file.getAbsolutePath()); article.setAuthors(data.getAuthors()); - article.setKeywords(data.getKeywords()); +// article.setKeywords(data.getKeywords()); article.setSummary(data.getSummary()); - article.setUrls(data.getUrls()); +// article.setUrls(data.getUrls()); article.setSourceId(doc1.getId()); article.setSourceName(doc1.getDocTitle()); article.setTargetId(doc2.getId());