推代码同步

PAS/src/main/java/cn/cslg/pas/common/model/vo/UploadParamsVO.java

@@ -93,6 +93,9 @@ public class UploadParamsVO {
      * 分类号关联
      */
     private String mainUpc;
+    /**
+     * 主分类号
+     */
     private String mainIpc;
     private List<String> cpcList;
     private List<String> locList;

PAS/src/main/java/cn/cslg/pas/common/model/vo/outApi/StarPatentVO.java

@@ -15,22 +15,64 @@ import java.util.List;
 @Data
 public class StarPatentVO implements Serializable {
     /**
+     * 原始申请号
+     */
+    @JSONField(name = "ANO")
+    private String rowApplicationNo;
+    /**
+     * 专利类型（1和8为发明 2和9为新型 3为外观）
+     */
+    @JSONField(name = "PT")
+    private Integer patentType;
+    /**
+     * 申请人地址
+     */
+    @JSONField(name = "DZ")
+    private String applicationAddress;
+    /**
+     * 主分类号
+     */
+    @JSONField(name = "MC")
+    private String mainIpc;
+    /**
+     * IPC分类号
+     */
+    @JSONField(name = "IC")
+    private String ipcListStr;
+    /**
+     * 公告日
+     */
+    @JSONField(name = "GD")
+    private String publicAccreditDate;
+    /**
+     * 摘要
+     */
+    @JSONField(name = "AB")
+    private String abstractStr;
+    /**
+     * 申请日
+     */
+    @JSONField(name = "AD")
+    private String applicationDate;
+    /**
+     * 发明人
+     */
+    @JSONField(name = "IN")
+    private String inventorStr;
+
+
+
+    /**
      * 专利号
      */
     @JSONField(name = "PN")
     private String patentNo;
-
     /**
      * 公告号
      */
     @JSONField(name = "GN")
     private String announceNo;
     /**
-     * 摘要
-     */
-    @JSONField(name = "AB")
-    private String abstractStr;
-    /**
      * 申请号
      */
     @JSONField(name = "AN")
@@ -41,26 +83,11 @@ public class StarPatentVO implements Serializable {
     @JSONField(name = "TI")
     private String name;
     /**
-     * 申请日
-     */
-    @JSONField(name = "AD")
-    private String applicationDate;
-    /**
      * 申请人
      */
     @JSONField(name = "PA")
     private String applicantStr;
     /**
-     * IPC分类号
-     */
-    @JSONField(name = "IC")
-    private String ipcListStr;
-    /**
-     * 陈宇 -> 公告日
-     */
-    @JSONField(name = "GD")
-    private String publicAccreditDate;
-    /**
      * 公开日
      */
     @JSONField(name = "PD")
@@ -70,11 +97,7 @@ public class StarPatentVO implements Serializable {
      */
     @JSONField(name = "PN")
     private String publicNo;
-    /**
-     * 发明人
-     */
-    @JSONField(name = "IN")
-    private String inventorStr;
+
     private List<PatentInventor> inventor;
     /**
      * 权利人
@@ -96,11 +119,6 @@ public class StarPatentVO implements Serializable {
      */
     @JSONField(name = "LG")
     private Integer LG;
-    /**
-     * 专利类型（1和8为发明 2和9为新型 3为外观）
-     */
-    @JSONField(name = "PT")
-    private Integer patentType;
     private List<String> ipcList;
     private List<PatentApplicant> applicant;
     private PatentAgency agency;

PAS/src/main/java/cn/cslg/pas/common/utils/RemoveHtmlTagsUtils.java

@@ -21,6 +21,7 @@ public class RemoveHtmlTagsUtils {
         String htmlRegex = "<[^>]+>";
         //定义空格,回车,换行符,制表符
         //String spaceRegex = "\\s*|\t|\r|\n";
+        String spaceRegex = "\\s*|\t";
         // 过滤script标签
         xmlText = xmlText.replaceAll(scriptRegex, "");
         // 过滤style标签
@@ -28,7 +29,7 @@ public class RemoveHtmlTagsUtils {
         // 过滤html标签
         xmlText = xmlText.replaceAll(htmlRegex, "");
         // 过滤空格,回车,换行符,制表符等
-        //instructionText = instructionText.replaceAll(spaceRegex, "");
+        xmlText = xmlText.replaceAll(spaceRegex, "");
         // 过滤空格&nbsp;、&nbsp、&NBSP
         xmlText = xmlText.replace("&nbsp;", "");
         xmlText = xmlText.replace("&nbsp", " ");

PAS/src/main/java/cn/cslg/pas/controller/outApi/PatentStarController.java

@@ -32,8 +32,6 @@ public class PatentStarController {
     public String getAreaList(@RequestBody @Validated PatentStarListDto patentStarListDto) throws IOException {
         Map<String, Object> map = patentStarApiService.patentStarSearchLocal(patentStarListDto);
         return Response.success(map);
-//        patentStarApiService.test(patentStarListDto);
-//        return Response.success();
     }
 
     @GetMapping("/getCnBib")

PAS/src/main/java/cn/cslg/pas/service/outApi/PatentStarApiService.java

@@ -287,10 +287,10 @@ public class PatentStarApiService {
 
     public Map<String, Object> patentStarSearchApi(PatentStarListDto patentStarListDto) throws IOException {
         try {
-if(patentStarListDto.getFormed()==null||patentStarListDto.getFormed()==false) {
-    String formQuery = patentStarListDto.getCurrentQuery();
-    patentStarListDto.setCurrentQuery(PatentStarApiService.formatQuery(formQuery));
-}
+            if (patentStarListDto.getFormed() == null || patentStarListDto.getFormed() == false) {
+                String formQuery = patentStarListDto.getCurrentQuery();
+                patentStarListDto.setCurrentQuery(PatentStarApiService.formatQuery(formQuery));
+            }
         } catch (Exception e) {
             return null;
         }
@@ -333,7 +333,7 @@ if(patentStarListDto.getFormed()==null||patentStarListDto.getFormed()==false) {
                 Map<String, Object> reMap = new HashMap<>();
                 reMap.put("size", patentStarListDto.getRowCount());
                 reMap.put("current", patentStarListDto.getPageNum());
-                reMap.put("records", starPatentVOS);
+                reMap.put("records", Data.get("List"));
                 reMap.put("total", Data.get("HitCount"));
                 return reMap;
             }
@@ -390,12 +390,12 @@ if(patentStarListDto.getFormed()==null||patentStarListDto.getFormed()==false) {
 
     public void setConditions(PatentStarListDto patentStarListDto) {
         DateTimeFormatter formatter = DateTimeFormat.forPattern("yyyyMMdd");
-        String startStr =formatter.print(patentStarListDto.getStartTime());
-        String endStr =formatter.print(patentStarListDto.getEndTime());
-        String cond = "*(" + startStr+ ">" + endStr + "/" + "AD)";
-        Integer len =patentStarListDto.getOrginCondition().length();
-        StringBuilder stringBuilder =new StringBuilder(patentStarListDto.getOrginCondition());
-        stringBuilder.insert(len-1,cond);
+        String startStr = formatter.print(patentStarListDto.getStartTime());
+        String endStr = formatter.print(patentStarListDto.getEndTime());
+        String cond = "*(" + startStr + ">" + endStr + "/" + "AD)";
+        Integer len = patentStarListDto.getOrginCondition().length();
+        StringBuilder stringBuilder = new StringBuilder(patentStarListDto.getOrginCondition());
+        stringBuilder.insert(len - 1, cond);
         patentStarListDto.setCurrentQuery(stringBuilder.toString());
     }
 
@@ -450,8 +450,10 @@ if(patentStarListDto.getFormed()==null||patentStarListDto.getFormed()==false) {
      */
     public String getPictureApi(String appNo) {
         String url = "https://api.patentstar.com.cn/api/Patent/CnMainImage/" + appNo;
-        String appId = "2000041";
-        String appkey = "F0E183D5F02C48E391F5FADF1B646F54";
+        //String appId = "2000041";
+        //String appkey = "F0E183D5F02C48E391F5FADF1B646F54";
+        String appId = "1000046";
+        String appkey = "6AE6D4DC6AF94F26862501EDEE9E27A2";
         Long currentTimeMillis = System.currentTimeMillis() / 1000;
         String Sign = appId + appkey + currentTimeMillis.toString();
         String signMd5 = FormatUtil.MD5(Sign);
@@ -463,7 +465,7 @@ if(patentStarListDto.getFormed()==null||patentStarListDto.getFormed()==false) {
                 .build();
         // 创建一个请求对象
         Request request = new Request.Builder().url(url)
-                .addHeader("_appid", "2000041")
+                .addHeader("_appid", appId)
                 .addHeader("_timestamp", currentTimeMillis.toString())
                 .addHeader("_sign", signMd5)
                 .get().build();
@@ -657,8 +659,10 @@ if(patentStarListDto.getFormed()==null||patentStarListDto.getFormed()==false) {
      */
     public String getEnPdfApi(String patentNo) {
         String url = "  https://api.patentstar.com.cn/api/Patent/EnPdf/" + patentNo;
-        String appId = "2000041";
-        String appkey = "F0E183D5F02C48E391F5FADF1B646F54";
+        //String appId = "2000041";
+        //String appkey = "F0E183D5F02C48E391F5FADF1B646F54";
+        String appId = "1000046";
+        String appkey = "6AE6D4DC6AF94F26862501EDEE9E27A2";
         Long currentTimeMillis = System.currentTimeMillis() / 1000;
         String Sign = appId + appkey + currentTimeMillis.toString();
         String signMd5 = FormatUtil.MD5(Sign);
@@ -670,7 +674,7 @@ if(patentStarListDto.getFormed()==null||patentStarListDto.getFormed()==false) {
                 .build();
         // 创建一个请求对象
         Request request = new Request.Builder().url(url)
-                .addHeader("_appid", "2000041")
+                .addHeader("_appid", appId)
                 .addHeader("_timestamp", currentTimeMillis.toString())
                 .addHeader("_sign", signMd5)
                 .get().build();

PAS/src/main/java/cn/cslg/pas/service/upLoadPatent/ExcutePatentDataStar.java

@@ -376,7 +376,8 @@ public class ExcutePatentDataStar implements IExcutePatentData {
         if (starPatent.getIpcListStr() != null && !starPatent.getIpcListStr().equals("")) {
             String[] ipcArr = starPatent.getIpcListStr().split(";");
             //装载主分类号
-            uploadParamsVO.setMainIpc(ipcArr[0]);
+            //uploadParamsVO.setMainIpc(ipcArr[0]);
+            uploadParamsVO.setMainIpc(starPatent.getMainIpc());
             uploadParamsVO.setIpcList(Arrays.asList(ipcArr));
         }
         //装载法律状态（os_patent表status字段值）
@@ -584,6 +585,12 @@ public class ExcutePatentDataStar implements IExcutePatentData {
         StringBuilder builder = new StringBuilder();
         while (matcher.find()) {
             String oldRow = matcher.group();
+//            if (oldRow.contains("\r\n")) {
+//                oldRow = oldRow.replace("\r\n", "");
+//            }
+//            if (oldRow.contains("\n")) {
+//                oldRow = oldRow.replace("\n", "");
+//            }
             if (oldRow.contains("num=\"n")) {
                 oldRow = oldRow.substring(oldRow.indexOf("num=\"n") + 6);
                 oldRow = "[" + oldRow;