7/30 外部检索逻辑更改

pom.xml

@@ -259,7 +259,7 @@
     </dependencies>
 
     <build>
-        <finalName>PAS_PROD_TEST</finalName>
+        <finalName>NEW_PAS_PROD_IMPORT</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>

src/main/java/cn/cslg/pas/service/exportProject/SavePatentToEsService.java

@@ -26,6 +26,7 @@ public class SavePatentToEsService {
     public void savePatentToEs(UploadPatentWebDTO uploadPatentWebDTO) {
 
         Patent patent = uploadPatentWebDTO.getPatent();
+
         try {
             //根据专利号查询专利
             PatentWithIdVO patentWithIdVO = esService.getIdByPatentNo(patent.getPatentNo());
@@ -35,9 +36,11 @@ public class SavePatentToEsService {
             if (patentWithIdVO != null) {
                 patentId = patentWithIdVO.getId();
                 orgPatent = patentWithIdVO.getPatent();
+                patent =this.formPatent(patent,orgPatent);
                 BeanUtils.copyProperties(patent, orgPatent, FormatUtil.getNullPropertyNames(patent));
                 esService.updatePatent(orgPatent, patentWithIdVO.getId());
             } else {
+                patent =this.formPatent(patent,orgPatent);
                 PatentJoin patentJoin = new PatentJoin();
                 patentJoin.setName("patent");
                 patent.setPatentJoin(patentJoin);
@@ -105,12 +108,13 @@ public class SavePatentToEsService {
             patent.setPublicNo(publicNo);
             patent.setGrantNo(grantNo);
 
-            if (orgPatent.getClaim() != null && orgPatent.getClaim().size() > 0 && orgPatent.getGrantNo() != null && patent.getGrantNo() == null) {
-                patent.setClaim(orgPatent.getClaim());
-            }
-            if(orgPatent.getGrantNo()!=null){
-                patent.setGrantFullText(patent.getPublicFullText());
-                patent.setPublicFullText(null);
+            if(orgPatent!=null) {
+                if (orgPatent.getClaim() != null && orgPatent.getClaim().size() > 0 && orgPatent.getGrantNo() != null && patent.getGrantNo() == null) {
+                    patent.setClaim(orgPatent.getClaim());
+                }
+                if (orgPatent.getGrantNo() != null) {
+                    patent.setGrantFullText(patent.getPublicFullText());
+                }
             }
         }
 

src/test/java/cn/cslg/pas/service/AvoidDesignServiceTests.java

@@ -32,7 +32,7 @@ public class AvoidDesignServiceTests {
 
     @Test
     public void test() throws Exception {
-
+       System.out.println("date");
     }
 
     @Test