2/18 excel导入修改

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

@@ -50,5 +50,18 @@ public class ElasticSearchClientConfig {
 //                }
 
 
+//        @Bean
+//        public ElasticsearchClient elasticsearchClient() throws Exception {
+//            RestClientBuilder builder = RestClient.builder(new HttpHost("47.101.137.223", 9200, "http"));
+//            CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
+//            credentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials("elastic", "xiaoshi221101"));
+//            SSLContext sslContext = SSLContextBuilder.create()
+//                    .loadTrustMaterial(new TrustSelfSignedStrategy())
+//                    .build();
+//            builder.setHttpClientConfigCallback(f -> f.setDefaultCredentialsProvider(credentialsProvider).setSSLContext(sslContext).setSSLHostnameVerifier(new NoopHostnameVerifier()));
+//            RestClient client =builder.build();
+//            ElasticsearchTransport transport = new RestClientTransport(client,new JacksonJsonpMapper());
+//            return new ElasticsearchClient(transport);
+//        }
     }
 }

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

@@ -6,8 +6,8 @@ import org.springframework.web.socket.server.standard.ServerEndpointExporter;
 
 @Configuration
 public class WebSocketConfig {
-//    @Bean
-//    public ServerEndpointExporter serverEndpointExporter() {
-//        return new ServerEndpointExporter();
-//    }
+    @Bean
+    public ServerEndpointExporter serverEndpointExporter() {
+        return new ServerEndpointExporter();
+    }
 }

src/main/java/cn/cslg/pas/service/business/ReportProjectService.java

@@ -332,8 +332,10 @@ public class ReportProjectService extends ServiceImpl<ReportProjectMapper, Repor
             try {
                 PatentWithIdVO patentWithIdVO = esService.getIdByPatentNo(reportProject.getSignPatentNo());
                 if (patentWithIdVO != null && patentWithIdVO.getPatent() != null) {
-                    reportProject.setPatentType(Integer.parseInt(patentWithIdVO.getPatent().getPatentType()));
-                }
+                    if(patentWithIdVO.getPatent().getPatentType()!=null) {
+                        reportProject.setPatentType(Integer.parseInt(patentWithIdVO.getPatent().getPatentType()));
+                    }
+                    }
             } catch (Exception e) {
                 throw new XiaoShiException("未查询到标的专利");
             }

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

@@ -172,7 +172,7 @@ public class GetRightAndFullTextFromWebThread extends Thread {
             }
             String fullText = "";
             if (fullTexts.size() != 0) {
-                fullText = cn.cslg.pas.common.utils.StringUtils.join(fullTexts, "");
+                fullText = cn.cslg.pas.common.utils.StringUtils.join(fullTexts, "\r");
             }
             Text text =new Text();
             text.setIfOrigin(true);

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

@@ -613,7 +613,7 @@ public class ImportSinglePatentService {
             }
             String fullText = "";
             if (fullTexts.size() != 0) {
-                fullText = cn.cslg.pas.common.utils.StringUtils.join(fullTexts, "");
+                fullText = cn.cslg.pas.common.utils.StringUtils.join(fullTexts, "\r\n");
             }
             Text text = new Text();
             text.setIfOrigin(true);