Merge remote-tracking branch 'origin/master' into prod_test

pom.xml

@@ -251,6 +251,11 @@
             <artifactId>commons-beanutils</artifactId>
             <version>1.9.3</version>
         </dependency>
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>alimt20181012</artifactId>
+            <version>1.3.1</version>
+        </dependency>
     </dependencies>
 
     <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/common/utils/DataUtils.java

@@ -3,8 +3,13 @@ package cn.cslg.pas.common.utils;
 
 import cn.dev33.satoken.secure.SaSecureUtil;
 import jakarta.annotation.Resource;
+import org.apache.logging.log4j.util.Base64Util;
 import org.springframework.stereotype.Component;
+import org.springframework.util.Base64Utils;
 
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
+import java.security.MessageDigest;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
@@ -195,4 +200,39 @@ public class DataUtils {
         return null;
     }
 
+    public static String MD5Base64(String s) {
+        if (s == null)
+            return null;
+        String encodeStr = "";
+        byte[] utfBytes = s.getBytes();
+        MessageDigest mdTemp;
+        try {
+            mdTemp = MessageDigest.getInstance("MD5");
+            mdTemp.update(utfBytes);
+            byte[] md5Bytes = mdTemp.digest();
+            byte[] by =  Base64.getEncoder().encode(md5Bytes);
+
+            encodeStr = Base64Utils.encodeToString(by);
+        } catch (Exception e) {
+            throw new Error("Failed to generate MD5 : " + e.getMessage());
+        }
+        return encodeStr;
+    }
+    /*
+     * 计算 HMAC-SHA1
+     */
+    public static String HMACSha1(String data, String key) {
+        String result;
+        try {
+            SecretKeySpec signingKey = new SecretKeySpec(key.getBytes(), "HmacSHA1");
+            Mac mac = Mac.getInstance("HmacSHA1");
+            mac.init(signingKey);
+            byte[] rawHmac = mac.doFinal(data.getBytes());
+            byte[] by =Base64.getEncoder().encode(rawHmac);
+            result = Base64Utils.encodeToString(by);
+        } catch (Exception e) {
+            throw new Error("Failed to generate HMAC : " + e.getMessage());
+        }
+        return result;
+    }
 }

src/main/java/cn/cslg/pas/common/utils/DateUtils.java

@@ -755,4 +755,14 @@ public class DateUtils {
             return "";
         }
     }
+
+
+    /*
+     * 获取时间
+     */
+    public static String toGMTString(Date date) {
+        SimpleDateFormat df = new SimpleDateFormat("E, dd MMM yyyy HH:mm:ss z", Locale.UK);
+        df.setTimeZone(new java.util.SimpleTimeZone(0, "GMT"));
+        return df.format(date);
+    }
 }

src/main/java/cn/cslg/pas/common/utils/PatentRightUtils.java

@@ -1,6 +1,7 @@
 package cn.cslg.pas.common.utils;
 
 
+import cn.cslg.pas.common.utils.ClaimUtils.ClaimSplitUtils;
 import cn.cslg.pas.common.vo.PatentRightParams;
 import cn.cslg.pas.common.vo.RePatentClaim;
 import org.springframework.stereotype.Component;
@@ -21,56 +22,59 @@ import java.util.stream.Collectors;
 @Component
 public class PatentRightUtils {
 
-    public static List<RePatentClaim> formatPatentRight(PatentRightParams params) {
-        try {
-            //国家
-            String country = params.getCountry();
-            if (country == null) {
-                country = params.getPatentNo().substring(0, 2);
-            }
-            //原文
-            String content = params.getContent();
-
-            //创建一个权要集合
-            ArrayList<RePatentClaim> patentRights = new ArrayList<>();
-
-            //若原文为null或空串，则直接结束并返回空集合；若译文为null，则置为空串
-            if (content == null || content.equals("")) {
-                return patentRights;
-            }
-
-
-            //将原文和译文的所有换行符 "\r\n"或是"\n" 替换成 "@"，这样首先可以使得全文连在一起，其次再根据特殊符号@拆分权要
-            if (content.contains("\r\n")) {
-                content = content.replaceAll("\r\n", "@");
-            }
-
-            if (content.contains("\n")) {
-                content = content.replaceAll("\n", "@");
-            }
-
-
-            //中日韩权要↓
-            if (country.equals("CN") || country.equals("JP") || country.equals("KR") || content.contains("权利要求")) {
-                getChinaRights(content, params.getPatentNo(), patentRights);
-                //英文专利的权要拆分 ↓
-            } else if (country.equals("FR")) {
-                getFRRight(content, params.getPatentNo(), patentRights);
-            } else {
-                getForeignRights(content, params.getPatentNo(), patentRights);
-            }
-
-            return patentRights;
-        } catch (Exception e) {
-            e.printStackTrace();
-            ArrayList<RePatentClaim> patentRights = new ArrayList<>();
-            patentRights.add(new RePatentClaim().setPatentNo(params.getPatentNo()).setContent(params.getContent()).setContentOut(params.getContentOut()).setType(1).setSort(0).setParentSort("-1"));
-            return patentRights;
-        }
-
+//    public static List<RePatentClaim> formatPatentRight(PatentRightParams params) {
+//        try {
+//            //国家
+//            String country = params.getCountry();
+//            if (country == null) {
+//                country = params.getPatentNo().substring(0, 2);
+//            }
+//            //原文
+//            String content = params.getContent();
+//
+//            //创建一个权要集合
+//            ArrayList<RePatentClaim> patentRights = new ArrayList<>();
+//
+//            //若原文为null或空串，则直接结束并返回空集合；若译文为null，则置为空串
+//            if (content == null || content.equals("")) {
+//                return patentRights;
+//            }
+//
+//
+//            //将原文和译文的所有换行符 "\r\n"或是"\n" 替换成 "@"，这样首先可以使得全文连在一起，其次再根据特殊符号@拆分权要
+//            if (content.contains("\r\n")) {
+//                content = content.replaceAll("\r\n", "@");
+//            }
+//
+//            if (content.contains("\n")) {
+//                content = content.replaceAll("\n", "@");
+//            }
+//
+//
+//            //中日韩权要↓
+//            if (country.equals("CN") || country.equals("JP") || country.equals("KR") || content.contains("权利要求")) {
+//                getChinaRights(content, params.getPatentNo(), patentRights);
+//                //英文专利的权要拆分 ↓
+//            } else if (country.equals("FR")) {
+//                getFRRight(content, params.getPatentNo(), patentRights);
+//            } else {
+//                getForeignRights(content, params.getPatentNo(), patentRights);
+//            }
+//
+//            return patentRights;
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            ArrayList<RePatentClaim> patentRights = new ArrayList<>();
+//            patentRights.add(new RePatentClaim().setPatentNo(params.getPatentNo()).setContent(params.getContent()).setContentOut(params.getContentOut()).setType(1).setSort(0).setParentSort("-1"));
+//            return patentRights;
+//        }
+//
+//
+//    }
 
+    public static List<RePatentClaim> formatPatentRight(PatentRightParams params) {
+      return   ClaimSplitUtils.formatPatentRight(params);
     }
-
     public static String getFormatClaim(String claim, String country) {
         String reStr = "";
         PatentRightParams params = new PatentRightParams();
@@ -79,7 +83,7 @@ public class PatentRightUtils {
         }
         params.setContent(claim);
         params.setCountry(country);
-        List<RePatentClaim> rePatentClaims = PatentRightUtils.formatPatentRight(params);
+        List<RePatentClaim> rePatentClaims = ClaimSplitUtils.formatPatentRight(params);
         if (rePatentClaims.size() > 0) {
             List<String> claims = rePatentClaims.stream().map(RePatentClaim::getContent).collect(Collectors.toList());
             reStr = StringUtils.join(claims, "\t");

src/main/java/cn/cslg/pas/factorys/EsBuilderFactory/LGKeyWordQueryBuilder.java

@@ -0,0 +1,68 @@
+package cn.cslg.pas.factorys.EsBuilderFactory;
+
+
+import co.elastic.clients.elasticsearch._types.query_dsl.Query;
+import co.elastic.clients.elasticsearch._types.query_dsl.QueryBuilders;
+import org.springframework.stereotype.Component;
+
+@Component
+public class LGKeyWordQueryBuilder implements IQueryBuilder {
+    private String field = "";
+    private String value = "";
+    private String operator = "";
+    public String path = "";
+    public Integer projectId = null;
+
+    @Override
+    public Query creteQuery() {
+        if (value.equals("3")) {
+            value = "1";
+        } else if (value.equals("1")) {
+            value = "3";
+        }
+//        QueryBuilders.matchQueryAsQuery(field, value, null, null);
+        return QueryBuilders.term(i -> i.field(field).value(value));
+    }
+
+    public String getField() {
+        return field;
+    }
+
+    public void setField(String field) {
+        this.field = field;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public String getOperator() {
+        return operator;
+    }
+
+    public void setOperator(String operator) {
+        this.operator = operator;
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    public void setPath(String path) {
+        this.path = path;
+    }
+
+    @Override
+    public Integer getProjectId() {
+        return projectId;
+    }
+
+    @Override
+    public void setProjectId(Integer projectId) {
+        this.projectId = projectId;
+    }
+}

src/main/java/cn/cslg/pas/factorys/getSqlFactorys/GetWebLGQuerySql.java

@@ -0,0 +1,37 @@
+package cn.cslg.pas.factorys.getSqlFactorys;
+
+import cn.cslg.pas.common.model.cronModel.SqlObject;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+
+@Slf4j
+@Component
+public class GetWebLGQuerySql implements GetSqlObject {
+
+    private SqlObject sqlObject;
+
+    @Override
+    public String getSql(String value) {
+        String filed = sqlObject.getSqlField();
+        String option = sqlObject.getOption();
+        String trueOption = "";
+        if (option.equals("=")) {
+            option = "/";
+        }
+        if (value.equals("1")) {
+            value = "3";
+        } else if (value.equals("3")) {
+            value = "1";
+        }
+        return value + option + filed;
+    }
+
+    public void setSqlObject(SqlObject sqlObject) {
+        this.sqlObject = sqlObject;
+    }
+
+    public SqlObject getSqlObject() {
+        return sqlObject;
+    }
+}

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

@@ -956,7 +956,7 @@ public class FTOCompareRecordService extends ServiceImpl<FTOCompareRecordMapper,
                     if (item.getTortVOS() != null && item.getTortVOS().size() > 0) {
                         compareMessageVOS.addAll((item.getTortVOS()));
                     }
-                    if (item.getType().equals(0)) {
+                    if (item.getType().equals(1)) {
                         mainRightNum++;
                     }
                     rightNum++;

src/main/java/cn/cslg/pas/service/business/es/EsService.java

@@ -1340,7 +1340,13 @@ 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/common/FileManagerService.java

@@ -86,7 +86,6 @@ public class FileManagerService {
 
     /**
      * 调用文件系统取出文件接口（获得文件流）
-     *
      * @param fieldId 文件id
      */
     public byte[] downloadSystemFileFromFMS(String fieldId) throws IOException {

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

@@ -0,0 +1,77 @@
+package cn.cslg.pas.service.common;
+
+import cn.cslg.pas.common.dto.OPS.GetSearchBiblioParamsDTO;
+import cn.cslg.pas.common.utils.DataUtils;
+import cn.cslg.pas.common.utils.DateUtils;
+import cn.hutool.crypto.SecureUtil;
+import cn.hutool.crypto.digest.HMac;
+import com.aliyun.alimt20181012.models.TranslateGeneralResponse;
+import com.aliyun.tea.TeaException;
+import okhttp3.MediaType;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import java.io.IOException;
+import java.util.Base64;
+import java.util.Date;
+import java.util.Objects;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+import java.util.Base64.Encoder;
+
+@Service
+public class TranslateService {
+
+
+    public static com.aliyun.alimt20181012.Client createClient() throws Exception {
+
+        String key = "LTAI5tGyG1Q7fKprgg1nWhXj";
+        String sercet = "Y6Erboh5lEFiRPR4XK8oCPMvUzYGLN";
+        // 工程代码泄露可能会导致 AccessKey 泄露，并威胁账号下所有资源的安全性。以下代码示例仅供参考。
+        // 建议使用更安全的 STS 方式，更多鉴权访问方式请参见：https://help.aliyun.com/document_detail/378657.html。
+        com.aliyun.teaopenapi.models.Config config = new com.aliyun.teaopenapi.models.Config()
+                // 必填，请确保代码运行环境设置了环境变量 ALIBABA_CLOUD_ACCESS_KEY_ID。
+                .setAccessKeyId(key)
+                // 必填，请确保代码运行环境设置了环境变量 ALIBABA_CLOUD_ACCESS_KEY_SECRET。
+                .setAccessKeySecret(sercet);
+        // Endpoint 请参考 https://api.aliyun.com/product/alimt
+        config.endpoint = "mt.aliyuncs.com";
+        return new com.aliyun.alimt20181012.Client(config);
+    }
+
+    public String translateGeneral() throws Exception {
+        com.aliyun.alimt20181012.Client client = TranslateService.createClient();
+        com.aliyun.alimt20181012.models.TranslateGeneralRequest translateGeneralRequest = new com.aliyun.alimt20181012.models.TranslateGeneralRequest()
+                .setFormatType("text")
+                .setSourceLanguage("auto")
+                .setTargetLanguage("zh")
+                .setSourceText("my name is limeimei")
+                .setScene("general");
+        com.aliyun.teautil.models.RuntimeOptions runtime = new com.aliyun.teautil.models.RuntimeOptions();
+        try {
+            // 复制代码运行请自行打印 API 的返回值
+            TranslateGeneralResponse translateGeneralResponse = client.translateGeneralWithOptions(translateGeneralRequest, runtime);
+      String re= translateGeneralResponse.getBody().getData().translated;
+            return re;
+        } catch (TeaException error) {
+            // 此处仅做打印展示，请谨慎对待异常处理，在工程项目中切勿直接忽略异常。
+            // 错误 message
+            System.out.println(error.getMessage());
+            // 诊断地址
+            System.out.println(error.getData().get("Recommend"));
+            com.aliyun.teautil.Common.assertAsString(error.message);
+        } catch (Exception _error) {
+            TeaException error = new TeaException(_error.getMessage(), _error);
+            // 此处仅做打印展示，请谨慎对待异常处理，在工程项目中切勿直接忽略异常。
+            // 错误 message
+            System.out.println(error.getMessage());
+            // 诊断地址
+            System.out.println(error.getData().get("Recommend"));
+            com.aliyun.teautil.Common.assertAsString(error.message);
+        }
+        return "";
+    }
+}

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

@@ -253,10 +253,12 @@ public class GetCataloguingFromWebThread extends Thread {
         //装载公开号
         if (starPatentVO.getPublicNo() != null && !starPatentVO.getPublicNo().equals("")) {
             patent.setPublicNo(starPatentVO.getPublicNo());
+            country = starPatentVO.getApplicationNo().substring(0, 2);
         }
 
         if (starPatentVO.getPublicAccreditNo() != null && !starPatentVO.getPublicAccreditNo().equals("")) {
             patent.setGrantNo(starPatentVO.getPublicAccreditNo());
+            country = starPatentVO.getApplicationNo().substring(0, 2);
         }
 
         //装载申请人
@@ -332,9 +334,8 @@ public class GetCataloguingFromWebThread extends Thread {
         }
 
 
-        //装载受理局
-        if (starPatentVO.getBureau() != null && !starPatentVO.getBureau().equals("")) {
-            patent.setAppCountry(starPatentVO.getBureau().substring(0, starPatentVO.getBureau().indexOf("(")));
+        if(patent.getAppCountry()==null){
+            patent.setAppCountry(country);
         }
     }
 

src/main/resources/jsons/patent.json

@@ -1030,7 +1030,7 @@
     "value": "simpleStatus",
     "field": "SS",
     "esField": "simple_status",
-    "esClass": "keyWordQueryBuilder",
+    "esClass": "LgKeyWordQueryBuilder",
     "ifSearch": "true",
     "ifGroup": "true",
     "ifShow": "true",

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

@@ -10,6 +10,7 @@ import cn.cslg.pas.common.vo.RePatentClaim;
 import cn.cslg.pas.domain.es.Text;
 import cn.cslg.pas.service.business.CommonService;
 import cn.cslg.pas.service.business.es.EsService;
+import cn.cslg.pas.service.common.TranslateService;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import org.junit.jupiter.api.Test;
@@ -24,6 +25,8 @@ import java.util.List;
 public class ClaimTextTests {
     @Autowired
     private EsService esService;
+    @Autowired
+    private TranslateService translateService;
 
     @Test
     public void test() throws Exception {
@@ -63,12 +66,12 @@ public class ClaimTextTests {
             if (claims == null || claims.size() == 0) {
                 continue;
             }
-            Text text =claims.stream().filter(item->item.getIfOrigin().equals(true)).findFirst().orElse(null);
-            if(text==null){
+            Text text = claims.stream().filter(item -> item.getIfOrigin().equals(true)).findFirst().orElse(null);
+            if (text == null) {
                 continue;
             }
             PatentRightParams rightParams = new PatentRightParams();
-            String content =text.getTextContent();
+            String content = text.getTextContent();
             rightParams.setPatentNo(pn);
             rightParams.setContent(content);
             List<RePatentClaim> rePatentClaims = ClaimSplitUtils.formatPatentRight(rightParams);
@@ -84,4 +87,14 @@ public class ClaimTextTests {
 
 
     }
+
+    @Test
+    public void testTranslate() {
+        try {
+            String a = translateService.translateGeneral();
+            System.out.println(a);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 }