6/24 韶音修改

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/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/factorys/getSqlFactorys/GetProofNameSql.java

@@ -50,7 +50,7 @@ public class GetProofNameSql implements GetSqlObject {
             }
             LambdaQueryWrapper<CompareLiterature> queryWrapper = new LambdaQueryWrapper();
             queryWrapper.like(CompareLiterature::getName, value)
-                    .eq(CompareLiterature::getType, 2);
+                    .eq(CompareLiterature::getType, 1);
             List<CompareLiterature> compareLiteratures = compareLiteratureService.list(queryWrapper);
 
             if (compareLiteratures.size() != 0) {

src/main/resources/application-dev.yml

@@ -61,8 +61,8 @@ spring:
     #初始化表结构
     jdbc:
       initialize-schema: always
-authorUrl: http://localhost:8885
-PCSUrl: http://localhost:8885
+authorUrl: http://localhost:8880
+PCSUrl: http://localhost:8880
 #OPSUrl: http://192.168.2.24:g5001
 OPSUrl: http://139.224.24.90:5001
 PASUrl: http://localhost:8879
@@ -71,4 +71,4 @@ FileSource: 1
 ES:
   patentVector: patent_vector
   patent: wxpatent
-  config: es-cn-em93o8856000ho9e7.public.elasticsearch.aliyuncs.com
+  config: 192.168.2.24

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

@@ -5,8 +5,12 @@ import cn.cslg.pas.common.dto.business.LiteratureQueryDTO;
 import cn.cslg.pas.common.dto.invalidDTO.UpdateLiteratureOrderDTO;
 import cn.cslg.pas.common.model.cronModel.Records;
 import cn.cslg.pas.controller.AvoidDesignController;
+import cn.cslg.pas.domain.business.ReportProject;
 import cn.cslg.pas.service.business.AvoidDesignService;
 import cn.cslg.pas.service.business.CompareLiteratureService;
+import cn.cslg.pas.service.business.InvalidStatutesService;
+import cn.cslg.pas.service.business.ReportProjectService;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.junit.jupiter.api.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,7 +32,10 @@ public class CompareLiteratureServiceTests {
     @Autowired
     private CompareLiteratureService compareLiteratureService;
 
-
+    @Autowired
+    private FinalInvalidStatueService finalInvalidStatueService;
+    @Autowired
+    private ReportProjectService reportProjectService;
     @Test
     public void addNoPatent() throws Exception {
         CompareLiteratureDTO compareLiteratureDTO =new CompareLiteratureDTO();
@@ -67,4 +74,16 @@ List<UpdateLiteratureOrderDTO> updateLiteratureOrderDTOList=new ArrayList<>();
     compareLiteratureService.updateLiteratureOrder(updateLiteratureOrderDTOList);
 System.out.println("1");
 }
+@Test
+    public  void addAsso(){
+
+    LambdaQueryWrapper<ReportProject> queryWrapper =new LambdaQueryWrapper<>();
+    queryWrapper.eq(ReportProject::getReportType,7);
+ List<ReportProject> reportProjects =   reportProjectService.list(queryWrapper);
+ System.out.println(reportProjects);
+ for (ReportProject reportProject: reportProjects) {
+     finalInvalidStatueService.importFinalInvalidStatutes(reportProject.getProjectId());
+ }
+
+}
 }