From 5fd2380e0deed2ffb9636d9cc709c494a206855b Mon Sep 17 00:00:00 2001
From: yz <3614508250@qq.com>
Date: Fri, 19 May 2023 15:28:45 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=8D=E6=80=A7=E6=A0=87=E6=B3=A8=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-biemo/pom.xml                                    |  2 ++
 .../biemo/business/controller/DocInfoController.java   |  2 --
 .../ruoyi/biemo/business/service/DocInfoService.java   |  5 +++--
 .../com/ruoyi/biemo/elasticsearch/util/EsService.java  | 10 ++++++++++
 .../com/ruoyi/biemo/nlp/DependencyParserUtils.java     |  4 +---
 ruoyi-hanlp/pom.xml                                    |  6 ++++++
 6 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/ruoyi-biemo/pom.xml b/ruoyi-biemo/pom.xml
index b455f69..7cfc673 100644
--- a/ruoyi-biemo/pom.xml
+++ b/ruoyi-biemo/pom.xml
@@ -31,6 +31,8 @@
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-framework</artifactId>
         </dependency>
+
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-mongodb</artifactId>
diff --git a/ruoyi-biemo/src/main/java/com/ruoyi/biemo/business/controller/DocInfoController.java b/ruoyi-biemo/src/main/java/com/ruoyi/biemo/business/controller/DocInfoController.java
index 3680c6d..98c73b3 100644
--- a/ruoyi-biemo/src/main/java/com/ruoyi/biemo/business/controller/DocInfoController.java
+++ b/ruoyi-biemo/src/main/java/com/ruoyi/biemo/business/controller/DocInfoController.java
@@ -5,8 +5,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.hankcs.hanlp.corpus.document.sentence.Sentence;
 import com.hankcs.hanlp.corpus.document.sentence.word.IWord;
 import com.hankcs.hanlp.corpus.document.sentence.word.Word;
-import com.hankcs.hanlp.seg.common.Term;
-import com.hankcs.hanlp.tokenizer.NotionalTokenizer;
 import com.ruoyi.biemo.business.domain.Category;
 import com.ruoyi.biemo.business.domain.DocInfo;
 import com.ruoyi.biemo.business.service.CategoryService;
diff --git a/ruoyi-biemo/src/main/java/com/ruoyi/biemo/business/service/DocInfoService.java b/ruoyi-biemo/src/main/java/com/ruoyi/biemo/business/service/DocInfoService.java
index e937cef..36f732b 100644
--- a/ruoyi-biemo/src/main/java/com/ruoyi/biemo/business/service/DocInfoService.java
+++ b/ruoyi-biemo/src/main/java/com/ruoyi/biemo/business/service/DocInfoService.java
@@ -15,7 +15,6 @@ import com.ruoyi.biemo.nlp.DependencyParserUtils;
 import com.ruoyi.biemo.nlp.SummaryUtils;
 import com.ruoyi.biemo.utils.MyObjects;
 import com.ruoyi.common.utils.StringUtils;
-import org.elasticsearch.action.admin.indices.analyze.AnalyzeRequestBuilder;
 import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.elasticsearch.search.sort.SortOrder;
@@ -71,7 +70,9 @@ public class DocInfoService extends EsService<DocInfo> {
         if(id==null||id.trim().length()==0){
             return null;
         }
-        List<DocInfo> docInfos = esLambdaQuery().eq(DocInfo::getId,id).query();
+//        List<DocInfo> docInfos = esLambdaQuery().eq(DocInfo::getId,id).query();
+        List<DocInfo> docInfos = esLambdaQuery().getDoc_InfoBy_Id(DocInfo::getId,id).query();
+
         return docInfos!=null&&docInfos.size()>0?docInfos.get(0):null;
     }
 
diff --git a/ruoyi-biemo/src/main/java/com/ruoyi/biemo/elasticsearch/util/EsService.java b/ruoyi-biemo/src/main/java/com/ruoyi/biemo/elasticsearch/util/EsService.java
index 13cbada..b0318fe 100644
--- a/ruoyi-biemo/src/main/java/com/ruoyi/biemo/elasticsearch/util/EsService.java
+++ b/ruoyi-biemo/src/main/java/com/ruoyi/biemo/elasticsearch/util/EsService.java
@@ -661,6 +661,16 @@ public abstract class EsService<T> {
             this.boolQueryBuilder.filter(QueryBuilders.termQuery(field, value));
             return this;
         }
+
+        public EsQueryBuilder getDoc_InfoBy_Id(GFunction<? extends T, Object> gFunction, Object value) {
+            String field = gFunction.field();
+            field="_"+field;
+            this.searchSourceBuilder.postFilter(QueryBuilders.termQuery(field, value));
+            this.boolQueryBuilder.filter(QueryBuilders.termQuery(field, value));
+            return this;
+        }
+
+
         public EsQueryBuilder eqAll(T t) {
             Field[] fields = t.getClass().getDeclaredFields();
             if(fields!=null&&fields.length>0){
diff --git a/ruoyi-biemo/src/main/java/com/ruoyi/biemo/nlp/DependencyParserUtils.java b/ruoyi-biemo/src/main/java/com/ruoyi/biemo/nlp/DependencyParserUtils.java
index 75411f9..b1685c4 100644
--- a/ruoyi-biemo/src/main/java/com/ruoyi/biemo/nlp/DependencyParserUtils.java
+++ b/ruoyi-biemo/src/main/java/com/ruoyi/biemo/nlp/DependencyParserUtils.java
@@ -27,9 +27,7 @@ public class DependencyParserUtils {
     }
 
     public static Sentence nerAnalysis(String text) throws IOException {
-                    PerceptronLexicalAnalyzer analyzer = new PerceptronLexicalAnalyzer(HanLP.Config.PerceptronCWSModelPath,
-                    HanLP.Config.PerceptronPOSModelPath,
-                    HanLP.Config.PerceptronNERModelPath);
+                    PerceptronLexicalAnalyzer analyzer = new PerceptronLexicalAnalyzer(HanLP.Config.PerceptronCWSModelPath, HanLP.Config.PerceptronPOSModelPath, HanLP.Config.PerceptronNERModelPath);
         //return NLPTokenizer.analyze(text);
         return analyzer.analyze(text);
     }
diff --git a/ruoyi-hanlp/pom.xml b/ruoyi-hanlp/pom.xml
index 06bcf89..8ff6ba1 100644
--- a/ruoyi-hanlp/pom.xml
+++ b/ruoyi-hanlp/pom.xml
@@ -24,6 +24,12 @@
             <artifactId>classmate</artifactId>
             <version>1.3.4</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <version>5.3.20</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <properties>
         <java.version>1.8</java.version>