Merge remote-tracking branch 'origin/dev2' into dev2

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

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

@@ -65,7 +65,6 @@ public class StarPatentVO implements Serializable {
     /**
      * 专利号
      */
-    @JSONField(name = "PN")
     private String patentNo;
     /**
      * 公告号

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

@@ -233,8 +233,11 @@ public class PatentStarApiService {
                 );
             }
             //附图
-            String apN = item.getApplicationNo().replace(".", "");
-            item.setAbstractPath(this.getPictureApi(apN.substring(2)));
+            if(item.getApplicationNo()!=null&&item.getApplicationNo()!="") {
+                String apN = item.getApplicationNo().replace(".", "");
+                String path = this.getPictureApi(apN.substring(2));
+                item.setAbstractPath(path);
+            }
             if (item.getLG() != null) {
                 switch (item.getLG()) {
                     case 1:
@@ -290,6 +293,12 @@ public class PatentStarApiService {
             if (patentStarListDto.getFormed() == null || patentStarListDto.getFormed() == false) {
                 String formQuery = patentStarListDto.getCurrentQuery();
                 patentStarListDto.setCurrentQuery(PatentStarApiService.formatQuery(formQuery));
+                if(patentStarListDto.getDBType().equals("WD")){
+               StringBuilder stringBuilder =new StringBuilder(patentStarListDto.getCurrentQuery());
+               stringBuilder.insert(patentStarListDto.getCurrentQuery().length()-1,"-CN/GJ");
+                    patentStarListDto.setCurrentQuery(stringBuilder.toString());
+
+                }
             }
         } catch (Exception e) {
             return null;
@@ -333,7 +342,7 @@ public class PatentStarApiService {
                 Map<String, Object> reMap = new HashMap<>();
                 reMap.put("size", patentStarListDto.getRowCount());
                 reMap.put("current", patentStarListDto.getPageNum());
-                reMap.put("records", starPatentVOS);
+                reMap.put("records",starPatentVOS);
                 reMap.put("total", Data.get("HitCount"));
                 return reMap;
             }
@@ -480,6 +489,7 @@ public class PatentStarApiService {
             }
         } catch (IOException e) {
             e.printStackTrace();
+            return  null;
         }
         return "{}";
     }
@@ -659,10 +669,10 @@ public class PatentStarApiService {
      */
     public String getEnPdfApi(String patentNo) {
         String url = "  https://api.patentstar.com.cn/api/Patent/EnPdf/" + patentNo;
-        String appId = "2000041";
-        String appkey = "F0E183D5F02C48E391F5FADF1B646F54";
-//        String appId = "1000046";
-//        String appkey = "6AE6D4DC6AF94F26862501EDEE9E27A2";
+        //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);