检索接口配置化

PAS/src/main/java/cn/cslg/pas/domain/WebLoginConfig.java

@@ -35,5 +35,9 @@ public class WebLoginConfig implements Serializable {
     @TableField(value = "web_Id")
     private Integer webId;
 
+    @TableField(value = "web_config")
+    private String webConfig;
+    @TableField(value = "web_group")
+    private Integer webGroup;
 
 }

PAS/src/main/java/cn/cslg/pas/service/WebLoginConfigService.java

@@ -69,4 +69,15 @@ public class WebLoginConfigService extends ServiceImpl<WebLoginConfigMapper, Web
         return this.removeByIds(ids);
     }
 
+    public WebLoginConfig getConfig(Integer webId,Integer webGroup) {
+        List<WebLoginConfig> configs = this.list(new LambdaQueryWrapper<WebLoginConfig>().eq(WebLoginConfig::getWebId, webId).eq(WebLoginConfig::getWebGroup,webGroup));
+        WebLoginConfig config;
+        if (configs.size() > 0) {
+            config = configs.get(0);
+        } else {
+            config = null;
+        }
+        return config;
+    }
+
 }

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

@@ -10,7 +10,9 @@ import cn.cslg.pas.common.utils.FormatUtil;
 import cn.cslg.pas.common.utils.SecurityUtils.LoginUtils;
 import cn.cslg.pas.common.utils.ThrowException;
 import cn.cslg.pas.domain.*;
+import cn.cslg.pas.service.WebLoginConfigService;
 import cn.cslg.pas.service.upLoadPatent.RetrieveRecordService;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
@@ -45,7 +47,7 @@ public class PatentStarApiService {
     private final RetrieveRecordService retrieveRecordService;
     private final CacheUtils cacheUtils;
     private final LoginUtils loginUtils;
-
+    private final WebLoginConfigService webLoginConfigService;
     public static String formatValue(String value) {
         return value.replace("~", ">");
     }
@@ -286,8 +288,6 @@ public class PatentStarApiService {
         return map;
 
     }
-
-
     public Map<String, Object> patentStarSearchApi(PatentStarListDto patentStarListDto) throws IOException {
         try {
             if (patentStarListDto.getFormed() == null || patentStarListDto.getFormed() == false) {
@@ -303,12 +303,15 @@ public class PatentStarApiService {
         } catch (Exception e) {
             return null;
         }
+        JSONObject configObject =this.getConfigObject(4,1);
+        String appId =configObject.getString("appId");
+        String appKey =configObject.getString("appKey");
         PatentStarDto patentStarDto = new PatentStarDto();
         BeanUtils.copyProperties(patentStarListDto, patentStarDto);
         String json = JSONObject.toJSONString(patentStarDto);
         String url = "http://s.patentstar.com.cn/SearchAPI/PatentSearch/ResultGet";
         Long currentTimeMillis = System.currentTimeMillis() / 1000;
-        String Sign = "FNYJD7902206FFB741E163BE6536C3689D55" + currentTimeMillis.toString();
+        String Sign = appKey + currentTimeMillis.toString();
         String signMd5 = FormatUtil.MD5(Sign);
         // 创建一个OkHttpClient对象
         OkHttpClient okHttpClient = new OkHttpClient.Builder()
@@ -318,7 +321,7 @@ public class PatentStarApiService {
                 .build();
         // 创建一个RequestBody(参数1：数据类型 参数2传递的json串)
         FormBody.Builder builder = new FormBody.Builder();
-        builder.add("AppID", "K8FFB741E163BE6536");
+        builder.add("AppID", appId);
         builder.add("Stamp", currentTimeMillis.toString());
         builder.add("Sign", signMd5);
         builder.add("QueryJson", json);
@@ -417,10 +420,11 @@ public class PatentStarApiService {
      */
     public String getCnBibApi(String appNo) {
         String url = "https://api.patentstar.com.cn/api/Patent/CnBibo/" + appNo;
-        String appId = "2000041";
-        String appkey = "F0E183D5F02C48E391F5FADF1B646F54";
+        JSONObject configObject =this.getConfigObject(4,2);
+        String appId =configObject.getString("appId");
+        String appKey =configObject.getString("appKey");
         Long currentTimeMillis = System.currentTimeMillis() / 1000;
-        String Sign = appId + appkey + currentTimeMillis.toString();
+        String Sign = appId + appKey + currentTimeMillis.toString();
         String signMd5 = FormatUtil.MD5(Sign);
         // 创建一个OkHttpClient对象
         OkHttpClient okHttpClient = new OkHttpClient.Builder()
@@ -459,12 +463,11 @@ public class PatentStarApiService {
      */
     public String getPictureApi(String appNo) {
         String url = "https://api.patentstar.com.cn/api/Patent/CnMainImage/" + appNo;
-        //String appId = "2000041";
-        //String appkey = "F0E183D5F02C48E391F5FADF1B646F54";
-        String appId = "1000046";
-        String appkey = "6AE6D4DC6AF94F26862501EDEE9E27A2";
+        JSONObject configObject =this.getConfigObject(4,2);
+        String appId =configObject.getString("appId");
+        String appKey =configObject.getString("appKey");
         Long currentTimeMillis = System.currentTimeMillis() / 1000;
-        String Sign = appId + appkey + currentTimeMillis.toString();
+        String Sign = appId + appKey + currentTimeMillis.toString();
         String signMd5 = FormatUtil.MD5(Sign);
         // 创建一个OkHttpClient对象
         OkHttpClient okHttpClient = new OkHttpClient.Builder()
@@ -504,10 +507,11 @@ public class PatentStarApiService {
     public String getWGPictureApi(String appNo) throws IOException {
 
         String url = "https://api.patentstar.com.cn/api/Patent/CnWGImage/" + appNo;
-        String appId = "2000041";
-        String appkey = "F0E183D5F02C48E391F5FADF1B646F54";
+        JSONObject configObject =this.getConfigObject(4,2);
+        String appId =configObject.getString("appId");
+        String appKey =configObject.getString("appKey");
         Long currentTimeMillis = System.currentTimeMillis() / 1000;
-        String Sign = appId + appkey + currentTimeMillis.toString();
+        String Sign = appId + appKey + currentTimeMillis.toString();
         String signMd5 = FormatUtil.MD5(Sign);
         // 创建一个OkHttpClient对象
         OkHttpClient okHttpClient = new OkHttpClient.Builder()
@@ -517,7 +521,7 @@ public class PatentStarApiService {
                 .build();
         // 创建一个请求对象
         Request request = new Request.Builder().url(url)
-                .addHeader("_appid", "2000041")
+                .addHeader("_appid", appId)
                 .addHeader("_timestamp", currentTimeMillis.toString())
                 .addHeader("_sign", signMd5)
                 .get().build();
@@ -545,10 +549,11 @@ public class PatentStarApiService {
      */
     public String getCnLegalApi(String appNo) {
         String url = "https://api.patentstar.com.cn/api/Patent/CnLegal/" + appNo;
-        String appId = "2000041";
-        String appkey = "F0E183D5F02C48E391F5FADF1B646F54";
+        JSONObject configObject =this.getConfigObject(4,2);
+        String appId =configObject.getString("appId");
+        String appKey =configObject.getString("appKey");
         Long currentTimeMillis = System.currentTimeMillis() / 1000;
-        String Sign = appId + appkey + currentTimeMillis.toString();
+        String Sign = appId + appKey + currentTimeMillis.toString();
         String signMd5 = FormatUtil.MD5(Sign);
         // 创建一个OkHttpClient对象
         OkHttpClient okHttpClient = new OkHttpClient.Builder()
@@ -558,7 +563,7 @@ public class PatentStarApiService {
                 .build();
         // 创建一个请求对象
         Request request = new Request.Builder().url(url)
-                .addHeader("_appid", "2000041")
+                .addHeader("_appid", appId)
                 .addHeader("_timestamp", currentTimeMillis.toString())
                 .addHeader("_sign", signMd5)
                 .get().build();
@@ -586,10 +591,11 @@ public class PatentStarApiService {
      */
     public String getCnPdfApi(String appNo) throws IOException {
         String url = "https://api.patentstar.com.cn/api/Patent/CnPdf/" + appNo;
-        String appId = "2000041";
-        String appkey = "F0E183D5F02C48E391F5FADF1B646F54";
+        JSONObject configObject =this.getConfigObject(4,2);
+        String appId =configObject.getString("appId");
+        String appKey =configObject.getString("appKey");
         Long currentTimeMillis = System.currentTimeMillis() / 1000;
-        String Sign = appId + appkey + currentTimeMillis.toString();
+        String Sign = appId + appKey + currentTimeMillis.toString();
         String signMd5 = FormatUtil.MD5(Sign);
         // 创建一个OkHttpClient对象
         OkHttpClient okHttpClient = new OkHttpClient.Builder()
@@ -599,7 +605,7 @@ public class PatentStarApiService {
                 .build();
         // 创建一个请求对象
         Request request = new Request.Builder().url(url)
-                .addHeader("_appid", "2000041")
+                .addHeader("_appid", appId)
                 .addHeader("_timestamp", currentTimeMillis.toString())
                 .addHeader("_sign", signMd5)
                 .get().build();
@@ -628,10 +634,11 @@ public class PatentStarApiService {
 
     public String getCnFullXmlApi(String appNo) throws IOException {
         String url = "https://api.patentstar.com.cn/api/Patent/CnFullXml/" + appNo;
-        String appId = "2000041";
-        String appkey = "F0E183D5F02C48E391F5FADF1B646F54";
+        JSONObject configObject =this.getConfigObject(4,2);
+        String appId =configObject.getString("appId");
+        String appKey =configObject.getString("appKey");
         Long currentTimeMillis = System.currentTimeMillis() / 1000;
-        String Sign = appId + appkey + currentTimeMillis.toString();
+        String Sign = appId + appKey + currentTimeMillis.toString();
         String signMd5 = FormatUtil.MD5(Sign);
         // 创建一个OkHttpClient对象
         OkHttpClient okHttpClient = new OkHttpClient.Builder()
@@ -641,7 +648,7 @@ public class PatentStarApiService {
                 .build();
         // 创建一个请求对象
         Request request = new Request.Builder().url(url)
-                .addHeader("_appid", "2000041")
+                .addHeader("_appid", appId)
                 .addHeader("_timestamp", currentTimeMillis.toString())
                 .addHeader("_sign", signMd5)
                 .get().build();
@@ -669,12 +676,13 @@ 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";
+        JSONObject configObject =this.getConfigObject(4,2);
+        String appId =configObject.getString("appId");
+        String appKey =configObject.getString("appKey");
+//        String appId = "1000046";
+//        String appkey = "6AE6D4DC6AF94F26862501EDEE9E27A2";
         Long currentTimeMillis = System.currentTimeMillis() / 1000;
-        String Sign = appId + appkey + currentTimeMillis.toString();
+        String Sign = appId + appKey + currentTimeMillis.toString();
         String signMd5 = FormatUtil.MD5(Sign);
         // 创建一个OkHttpClient对象
         OkHttpClient okHttpClient = new OkHttpClient.Builder()
@@ -712,10 +720,11 @@ public class PatentStarApiService {
      */
     public String getENBibApi(String patentNo) {
         String url = "https://api.patentstar.com.cn/api/Patent/ENBib/" + patentNo;
-        String appId = "2000041";
-        String appkey = "F0E183D5F02C48E391F5FADF1B646F54";
+        JSONObject configObject =this.getConfigObject(4,2);
+        String appId =configObject.getString("appId");
+        String appKey =configObject.getString("appKey");
         Long currentTimeMillis = System.currentTimeMillis() / 1000;
-        String Sign = appId + appkey + currentTimeMillis.toString();
+        String Sign = appId + appKey + currentTimeMillis.toString();
         String signMd5 = FormatUtil.MD5(Sign);
         // 创建一个OkHttpClient对象
         OkHttpClient okHttpClient = new OkHttpClient.Builder()
@@ -725,7 +734,7 @@ public class PatentStarApiService {
                 .build();
         // 创建一个请求对象
         Request request = new Request.Builder().url(url)
-                .addHeader("_appid", "2000041")
+                .addHeader("_appid", appKey)
                 .addHeader("_timestamp", currentTimeMillis.toString())
                 .addHeader("_sign", signMd5)
                 .get().build();
@@ -753,10 +762,11 @@ public class PatentStarApiService {
      */
     public String getFamilyByPubNoApi(String patentNo) {
         String url = "https://api.patentstar.com.cn/api/Patent/FamilyByPubNo/" + patentNo;
-        String appId = "2000041";
-        String appkey = "F0E183D5F02C48E391F5FADF1B646F54";
+        JSONObject configObject =this.getConfigObject(4,2);
+        String appId =configObject.getString("appId");
+        String appKey =configObject.getString("appKey");
         Long currentTimeMillis = System.currentTimeMillis() / 1000;
-        String Sign = appId + appkey + currentTimeMillis.toString();
+        String Sign = appId + appKey + currentTimeMillis.toString();
         String signMd5 = FormatUtil.MD5(Sign);
         // 创建一个OkHttpClient对象
         OkHttpClient okHttpClient = new OkHttpClient.Builder()
@@ -766,7 +776,7 @@ public class PatentStarApiService {
                 .build();
         // 创建一个请求对象
         Request request = new Request.Builder().url(url)
-                .addHeader("_appid", "2000041")
+                .addHeader("_appid", appId)
                 .addHeader("_timestamp", currentTimeMillis.toString())
                 .addHeader("_sign", signMd5)
                 .get().build();
@@ -794,10 +804,11 @@ public class PatentStarApiService {
      */
     public String getCitedNumByPubNoApi(String patentNo) throws IOException {
         String url = "https://api.patentstar.com.cn/api/Patent/CitedNumByPubNo/" + patentNo;
-        String appId = "2000041";
-        String appkey = "F0E183D5F02C48E391F5FADF1B646F54";
+        JSONObject configObject =this.getConfigObject(4,2);
+        String appId =configObject.getString("appId");
+        String appKey =configObject.getString("appKey");
         Long currentTimeMillis = System.currentTimeMillis() / 1000;
-        String Sign = appId + appkey + currentTimeMillis.toString();
+        String Sign = appId + appKey + currentTimeMillis.toString();
         String signMd5 = FormatUtil.MD5(Sign);
         // 创建一个OkHttpClient对象
         OkHttpClient okHttpClient = new OkHttpClient.Builder()
@@ -807,7 +818,7 @@ public class PatentStarApiService {
                 .build();
         // 创建一个请求对象
         Request request = new Request.Builder().url(url)
-                .addHeader("_appid", "2000041")
+                .addHeader("_appid", appId)
                 .addHeader("_timestamp", currentTimeMillis.toString())
                 .addHeader("_sign", signMd5)
                 .get().build();
@@ -827,4 +838,15 @@ public class PatentStarApiService {
     }
 
 
+    public JSONObject getConfigObject(Integer webId,Integer webGroup){
+
+       WebLoginConfig webLoginConfig = webLoginConfigService.getConfig(webId,webGroup);
+       if(webLoginConfig==null){
+           return  null;
+       }
+       String config =webLoginConfig.getWebConfig();
+       JSONObject jsonObject =JSONObject.parseObject(config);
+       return jsonObject;
+    }
+
 }

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

@@ -224,7 +224,6 @@ public class UploadTaskService {
         if (condition == null) {
             ThrowException.throwXiaoShiException("尝试导入的专利号在本系统中均已存在");
         }
-
         taskAddNewDTO
                 .setProjectId(taskAddNewDTO.getProjectId())
                 .setReportId(taskAddNewDTO.getReportId())