8/27 定时更新修改

src/main/java/cn/cslg/pas/common/config/ElasticSearchClientConfig.java

@@ -56,7 +56,7 @@ public class  ElasticSearchClientConfig {
         public ElasticsearchClient elasticsearchClient() throws Exception {
             RestClientBuilder builder = RestClient.builder(new HttpHost(config, 9200, "http"));
             CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
-            credentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials("elastic", "xiaoshi221101"));
+            credentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials("elastic", "Xiaoshi221101"));
             SSLContext sslContext = SSLContextBuilder.create()
                     .loadTrustMaterial(new TrustSelfSignedStrategy())
                     .build();

src/main/java/cn/cslg/pas/service/common/PatentStarApiService.java

@@ -121,7 +121,7 @@ public class PatentStarApiService {
         records.setRetrieveRecordId(retrieveRecord.getId());
         records.setCurrent(Long.parseLong(map.get("current").toString()));
         records.setSize(Long.parseLong(map.get("size").toString()));
-        records.setData(this.loadPatent(starPatentVOS));
+        records.setData(this.loadPatent(starPatentVOS,patentStarListDTO.getDBType()));
         records.setTotal(Long.parseLong(map.get("total").toString()));
         return records;
     }
@@ -873,7 +873,7 @@ public class PatentStarApiService {
     }
 
 
-    private List<PatentColumnDTO> loadPatent(List<StarPatentVO> starPatentVOS) {
+    private List<PatentColumnDTO> loadPatent(List<StarPatentVO> starPatentVOS,String dbType) {
 
         List<PatentColumnDTO> patentColumnDTOS = new ArrayList<>();
         starPatentVOS.forEach(item -> {
@@ -882,6 +882,14 @@ public class PatentStarApiService {
             Patent patent = new Patent();
             uploadPatentWebDTO.setPatent(patent);
       webVOTransformService.loadPatent(uploadPatentWebDTO,false);
+      if(dbType!=null&&dbType.equals("CN"))
+      {
+          webVOTransformService.loadCNPatentNo(uploadPatentWebDTO.getPatent());
+      }
+      else {
+          webVOTransformService.loadWorldPatentNo(uploadPatentWebDTO.getPatent());
+
+      }
             PatentColumnDTO patentColumnDTO = new PatentColumnDTO();
             BeanUtils.copyProperties(patent,patentColumnDTO);
             //装载权利要求
@@ -925,6 +933,7 @@ public class PatentStarApiService {
             } else {
                 patentColumnDTO.setRightHolder(new ArrayList<>());
             }
+            patentColumnDTOS.add(patentColumnDTO);
         });
 
         return patentColumnDTOS;

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

@@ -94,7 +94,6 @@ public class WebVOTransformService {
         this.loadPublicNo(patent, starPatentVO.getPN(), starPatentVO.getGN());
 
         this.loadCountry(patent, ifCn);
-
         //装载申请人地址
         this.loadApplicantAddr(patent, starPatentVO.getDZ(), starPatentVO.getCO());