2/3 导入同族修改

src/main/java/cn/cslg/pas/service/business/es/EsPatentService.java

@@ -350,14 +350,15 @@ public class EsPatentService {
         //设置查询索引
         builder.index("patent_family");
         //申请号
-        Query q1 = QueryBuilders.term(t -> t.field("app_no.keyword").value(no));
+        Query q1 = QueryBuilders.term(t -> t.field("patent.app_no").value(no));
         //公开号
-        Query q2 = QueryBuilders.term(t -> t.field("public_no.keyword").value(no));
+        Query q2 = QueryBuilders.term(t -> t.field("patent.public_no").value(no));
         //授权号
-        Query q3 = QueryBuilders.term(t -> t.field("grant_no.keyword").value(no));
+        Query q3 = QueryBuilders.term(t -> t.field("patent.grant_no").value(no));
         //同族类型
         Query q4 = QueryBuilders.term(t -> t.field("family_type").value(type));
-        Query bool = QueryBuilders.bool(i -> i.must(q4).should(q1, q2, q3));
+        Query q =QueryBuilders.bool(i->i.should(q1,q2,q3));
+        Query bool = QueryBuilders.bool(i -> i.must(q4,q));
         builder.query(bool);
         //分页
         if (pageNum > 0 && pageSize > 0) {

src/main/java/cn/cslg/pas/service/business/es/EsService.java

@@ -713,14 +713,15 @@ public class EsService {
             //设置查询索引
             builder.index("patent_family");
             //申请号
-            Query q1 = QueryBuilders.term(t -> t.field("app_no").value(no));
+            Query q1 = QueryBuilders.term(t -> t.field("patent.app_no").value(no));
             //公开号
-            Query q2 = QueryBuilders.term(t -> t.field("public_no").value(no));
+            Query q2 = QueryBuilders.term(t -> t.field("patent.public_no").value(no));
             //授权号
-            Query q3 = QueryBuilders.term(t -> t.field("grant_no").value(no));
+            Query q3 = QueryBuilders.term(t -> t.field("patent.grant_no").value(no));
             //类型
             Query q4 = QueryBuilders.term(t -> t.field("family_type").value(type));
-            Query bool = QueryBuilders.bool(i -> i.must(q4).should(q1, q2, q3));
+            Query p  =QueryBuilders.bool(i -> i.should(q1, q2, q3));
+            Query bool = QueryBuilders.bool(i -> i.must(q4,p));
             builder.query(bool);
             SearchResponse<PatentFamilyMessage> response = client.search(builder.build(), PatentFamilyMessage.class);
             long total = response.hits().total().value();

src/main/java/cn/cslg/pas/service/importPatent/GetCataloguingFromWebThread.java

@@ -101,9 +101,9 @@ public class GetCataloguingFromWebThread extends Thread {
 //                添加同族专利
                 String familyPatentNoStr = patentStarApiService.getFamilyByPubNoApi(uploadPatentWebDTO.getPatent().getPublicNo());
                 List<String> familyPatentNos = new ArrayList<>();
-                if (!familyPatentNoStr.equals("no data")) {
+                if (!familyPatentNoStr.equals("no data")&&!familyPatentNoStr.trim().equals("")) {
                     FamilyPatentNo familyPatentNo = JSON.parseObject(familyPatentNoStr, FamilyPatentNo.class);
-                    if (familyPatentNo != null && familyPatentNo.getFamilyinfo() != null) {
+                    if (familyPatentNo != null &&!familyPatentNo.getFamilyinfo().trim().equals("")&& familyPatentNo.getFamilyinfo() != null) {
                         familyPatentNos = Arrays.asList(familyPatentNo.getFamilyinfo().split(";"));
                     }
                 }