Merge remote-tracking branch 'origin/master'

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/es/EsService.java

@@ -1346,13 +1346,6 @@ public class EsService {
     public List<PatentColumnDTO> loadCoulumnDTO(List<PatentColumnDTO> patentColumnDTOS) {
         patentColumnDTOS.forEach(item -> {
             item.setPictureGuid(FormatUtil.getPictureFormat(item.getAppNo()));
-              if(item.getSimpleStatus()!=null){
-                  if(item.getSimpleStatus().equals("1")){
-                      item.setSimpleStatus("3");
-                  }
-                  else if(item.getSimpleStatus().equals("3"))
-                  {item.setSimpleStatus("1");}
-              }
         });
 
         return patentColumnDTOS;

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

@@ -320,13 +320,13 @@ public class GetCataloguingFromWebThread extends Thread {
         if (status != null) {
             //有效（有权）
             if (status == 1) {
-                patent.setSimpleStatus("3");
+                patent.setSimpleStatus("1");
                 //失效（无权）
             } else if (status == 2) {
                 patent.setSimpleStatus("2");
                 //审中（审中）
             } else if (status == 3) {
-                patent.setSimpleStatus("1");
+                patent.setSimpleStatus("3");
             }
         }
 

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

@@ -381,16 +381,16 @@ public class GetPatentFromExcelThread extends Thread {
 
                 switch (status) {
                     case "有效":
-                        patent.setSimpleStatus("3");
+                        patent.setSimpleStatus("1");
                         break;
                     case "审中":
-                        patent.setSimpleStatus("1");
+                        patent.setSimpleStatus("3");
                         break;
                     case "失效":
                         patent.setSimpleStatus("2");
                         break;
                     default:
-                        patent.setSimpleStatus("3");
+                        patent.setSimpleStatus("1");
                         break;
                 }
             }
@@ -409,13 +409,13 @@ public class GetPatentFromExcelThread extends Thread {
                 switch (status) {
                     case "公开":
                     case "授权":
-                        patent.setSimpleStatus("3");
+                        patent.setSimpleStatus("1");
                         break;
                     case "实质审查":
-                        patent.setSimpleStatus("1");
+                        patent.setSimpleStatus("3");
                         break;
                     default:
-                        patent.setSimpleStatus("3");
+                        patent.setSimpleStatus("1");
                 }
             }
 

src/main/java/cn/cslg/pas/service/query/FormatQueryService.java

@@ -540,7 +540,7 @@ public class FormatQueryService {
         }
       else if(operate1.gettype()==enuType.Logic)
         {
-      return "("+ this.webQueryToString2(Left,tableName)+" "+this.getNodeStrCode(operate1)+" "+this.webQueryToString2(Right,tableName)+")";
+      return "("+ this.webQueryToString2(Left,tableName)+this.getNodeStrCode(operate1)+this.webQueryToString2(Right,tableName)+")";
         }
       return null;
     }
@@ -562,7 +562,7 @@ public class FormatQueryService {
             treeNode Left = operatenode.getLeft();
             treeNode Right = operatenode.getRight();
             operate operate1 =  operatenode.getoperate();
-      return "("+this.getQueryValue(Left,tableName,field,option)+" "+this.getNodeStrCode(operate1)+" "+this.getQueryValue(Right,tableName,field,option)+")";
+      return "("+this.getQueryValue(Left,tableName,field,option)+this.getNodeStrCode(operate1)+this.getQueryValue(Right,tableName,field,option)+")";
         }
 
     }

src/main/resources/application-dev.yml

@@ -61,8 +61,8 @@ spring:
     #初始化表结构
     jdbc:
       initialize-schema: always
-authorUrl: http://localhost:8880
-PCSUrl: http://localhost:8880
+authorUrl: http://localhost:8885
+PCSUrl: http://localhost:8885
 #OPSUrl: http://192.168.2.24:g5001
 OPSUrl: http://139.224.24.90:5001
 PASUrl: http://localhost:8879