Ver código fonte

2/21 专利查询修改

lwhhszx 1 ano atrás
pai
commit
b0d8a25ae1

+ 7 - 1
src/main/java/cn/cslg/pas/common/utils/esDataForm/PatentClassifySplitter.java

@@ -31,7 +31,13 @@ public class PatentClassifySplitter {
             patentClassify.setLevel3(level3);
 
             if (length >= 8) {
-                level4 = classify.substring(0, classify.indexOf("/") );
+                Integer s =classify.length();
+
+                if(classify.contains("/"))
+                {
+                    s =classify.indexOf("/");
+                }
+                level4 = classify.substring(0, s);
                 patentClassify.setLevel4(level4);
                 level5 = classify;
                 patentClassify.setLevel5(level5);

+ 6 - 2
src/main/java/cn/cslg/pas/service/business/es/EsPatentService.java

@@ -98,8 +98,12 @@ public class EsPatentService {
         SearchRequest.Builder builder = new SearchRequest.Builder();
         //设置查询索引
         builder.index("patent");
-        Query q = QueryBuilders.term(i -> i.field("patent_no.keyword").value(vo.getPatentNo()));
-        Query query = QueryBuilders.bool(i -> i.must(q));
+        Query q1 = QueryBuilders.term(t -> t.field("app_no.keyword").value(vo.getPatentNo()));
+        //公开号
+        Query q2 = QueryBuilders.term(t -> t.field("public_no.keyword").value(vo.getPatentNo()));
+        //授权号
+        Query q3 = QueryBuilders.term(t -> t.field("grant_no.keyword").value(vo.getPatentNo()));
+        Query query = QueryBuilders.bool(i -> i.should(q1,q2,q3));
         builder.query(query);
         SearchResponse<Patent> response = client.search(builder.build(), Patent.class);
         List<Hit<Patent>> hits = response.hits().hits();

+ 1 - 0
src/main/java/cn/cslg/pas/service/importPatent/SchedulingTaskService.java

@@ -136,6 +136,7 @@ public class SchedulingTaskService {
       if(importTaskAMVO!=null) {
           importTaskAMVO.setState(state);
       }
+
     }
 
     public List<ImportTaskAMVO> getImportTaskAMVOs() {