1/31 导入时添加法律事务

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

@@ -126,31 +126,29 @@ public class EsPatentService {
             }
         }
         dto.setPictureGuid(FormatUtil.getPictureFormat(dto.getAppNo()));
-        List<LegalEvent> legalEvents = this.getLegalEvents(dto.getPublicNo(), dto.getAppNo(), dto.getGrantNo());
+        List<LegalEvent> legalEvents = this.getLegalEvents(dto.getPatentNo());
         dto.setLegalEvents(legalEvents);
         return dto;
     }
 
-    public List<LegalEvent> getLegalEvents(String publicNo, String appNo, String grantNo) throws IOException {
+    public List<LegalEvent> getLegalEvents(String patentNo) throws IOException {
         List<LegalEvent> events = new ArrayList<>();
         SearchRequest.Builder builder = new SearchRequest.Builder();
         //设置查询索引
         builder.index("legal_event");
         List<Query> queries = new ArrayList<>();
-        if (StringUtils.isNotEmpty(appNo)) {
-            Query q1 = QueryBuilders.term(i -> i.field("app_no").value(appNo));
+
+            Query q1 = QueryBuilders.term(i -> i.field("app_no").value(patentNo));
             queries.add(q1);
-        }
-        if (StringUtils.isNotEmpty(publicNo)) {
-            Query q2 = QueryBuilders.term(i -> i.field("public_no").value(publicNo));
+
+            Query q2 = QueryBuilders.term(i -> i.field("public_no").value(patentNo));
             queries.add(q2);
-        }
-        if (StringUtils.isNotEmpty(grantNo)) {
-            Query q3 = QueryBuilders.term(i -> i.field("grant_no").value(grantNo));
+
+            Query q3 = QueryBuilders.term(i -> i.field("grant_no").value(patentNo));
             queries.add(q3);
-        }
+
         if (!CollectionUtils.isEmpty(queries)) {
-            Query query = QueryBuilders.bool(i -> i.must(queries));
+            Query query = QueryBuilders.bool(i -> i.should(queries));
             builder.query(query);
             SearchResponse<LegalEvent> response = client.search(builder.build(), LegalEvent.class);
             List<Hit<LegalEvent>> hits = response.hits().hits();

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

@@ -19,6 +19,7 @@ import cn.cslg.pas.common.utils.parseQueryToTree.operateNode;
 import cn.cslg.pas.common.utils.parseQueryToTree.treeNode;
 import cn.cslg.pas.common.vo.*;
 import cn.cslg.pas.domain.es.*;
+import cn.cslg.pas.exception.XiaoShiException;
 import cn.cslg.pas.service.business.CommonService;
 import cn.cslg.pas.service.common.PatentStarApiService;
 import cn.cslg.pas.service.query.FormatQueryService;
@@ -999,8 +1000,10 @@ public class EsService {
                     legalEvent1.setDescription(item.getLegalStatusInfo());
                     legalEvent1.setName(item.getLegalStatus());
                     try {
-                        this.addLegalEvent(legalEvent1);
+                   String reId =this.addLegalEvent(legalEvent1);
+                   System.out.println(reId);
                     } catch (Exception e) {
+                        throw new XiaoShiException(e.getMessage());
                     }
                 }
 

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

@@ -116,7 +116,7 @@ public class GetCataloguingFromWebThread extends Thread {
                 }
 
                 //添加法律事务
-              //  esService.addEsLegalEvent(uploadPatentWebDTO.getStarPatentVO().getPublicNo());
+                esService.addEsLegalEvent(uploadPatentWebDTO.getStarPatentVO().getApplicationNo());
 
                 //添加引用专利
                 String nos = starPatentVO.getQuoteNos();

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

@@ -98,7 +98,12 @@ public class GetPatentPDFFromWebThread extends Thread {
                             fileManagerService.uploadFileWithGuid(file2, guid2);
                         }
                     } else {  //若只有一个
-                        pdfUrl1 = pdfUrlStr.substring(pdfUrlStr.indexOf("http"), pdfUrlStr.indexOf("?"));
+                        if(pdfUrlStr.contains("?")) {
+                            pdfUrl1 = pdfUrlStr.substring(pdfUrlStr.indexOf("http"), pdfUrlStr.indexOf("?"));
+                        }
+                        else {
+                            pdfUrl1 = pdfUrlStr.substring(pdfUrlStr.indexOf("http"));
+                        }
                         if (pdfUrl1.contains("0A_CN_0.pdf")) {
                             String guid1 = FormatUtil.getPDFFormat(starPatentVO.getApplicationNo(), 0);
                             File file1 = FileUtils.getFileByUrl(pdfUrl1);

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

@@ -658,7 +658,12 @@ public class ImportSinglePatentService {
                         fileManagerService.uploadFileWithGuid(file2, guid2);
                     }
                 } else {  //若只有一个
-                    pdfUrl1 = pdfUrlStr.substring(pdfUrlStr.indexOf("http"), pdfUrlStr.indexOf("?"));
+                    if(pdfUrlStr.contains("?")) {
+                        pdfUrl1 = pdfUrlStr.substring(pdfUrlStr.indexOf("http"), pdfUrlStr.indexOf("?"));
+                    }
+                    else {
+                        pdfUrl1 = pdfUrlStr.substring(pdfUrlStr.indexOf("http"));
+                    }
                     if (pdfUrl1.contains("0A_CN_0.pdf")) {
                         String guid1 = FormatUtil.getPDFFormat(starPatentVO.getApplicationNo(), 0);
                         File file1 = FileUtils.getFileByUrl(pdfUrl1);