【情报二期】数据域服务 - 同行类数据查询接口代码改造

src/main/java/com/hhwy/qbeqsjy/service/CtrlService.java

@@ -175,14 +175,12 @@ public class CtrlService {
     public void processJJYJCtrl(String taskId, List<Map<String, Object>> clueList, List<String> resourceIdList, List<String> areaIdList) {
         ExecutorService executorService = Executors.newFixedThreadPool(Constants.NUM_1);
         executorService.execute(() -> {
-            for (String resourceId : resourceIdList) {
-                // 根据数据资源业务ID读取配置文件中对应的数据资源标识符和数据资源编码
-                String[] resourceInfoArr = CommonUtil.getConfValueByKey("SJZYYWID_" + resourceId).split(",");
+            for (String resourceCode : resourceIdList) {
                 for (Map<String, Object> clueMap : clueList) {
                     String clue = String.valueOf(clueMap.get("clue"));
                     String clueType = String.valueOf(clueMap.get("clueType"));
                     if(clueCodeIdCard.equals(clueType)){
-                        sameTravelService.callFHUniQueryService(taskId, clue, resourceInfoArr[0], resourceInfoArr[1]);
+                        sameTravelService.callFHUniQueryService(taskId, clue, resourceCode, CommonUtil.getConfValueByKey(resourceCode));
                     }
                 }
             }

src/main/java/com/hhwy/qbeqsjy/service/SameTravelService.java

@@ -54,11 +54,11 @@ public class SameTravelService {
      * 调用烽火同行类数据通查服务接口，并将查询结果保存入库
      * @param taskId 任务编号
      * @param conditionFieldValue 参与条件查询的字段值
-     * @param resourceIdentifier 参与条件查询的数据资源标识符（烽火盘古平台标准）
      * @param resourceCode 参与条件查询的数据资源标识符对应的数据资源编码（烽火盘古平台标准）
+     * @param resourceIdentifier 参与条件查询的数据资源标识符（烽火盘古平台标准）
      * @return
      */
-    public void callFHUniQueryService(String taskId, String conditionFieldValue, String resourceIdentifier, String resourceCode){
+    public void callFHUniQueryService(String taskId, String conditionFieldValue, String resourceCode, String resourceIdentifier){
         // ========== 获取烽火 - 服务开放平台认证token
         Map<String, String> tokenMap = getFHUniQueryServiceToken();
         String appTokenId = tokenMap.get("appTokenId");

src/main/resources/application.properties

@@ -153,6 +153,17 @@ JJYJ-TLWIFI-WiFi=
 JJYJ-TRZ-LG=01A1200002660
 
 
+# \u70FD\u706B\u76D8\u53E4\u5E73\u53F0\u6570\u636E\u8D44\u6E90\u7F16\u7801\u4E0E\u6570\u636E\u8D44\u6E90\u6807\u8BC6\u7B26\u5B57\u5178
+# \u94C1\u8DEF\u8BA2\u7968
+01A1201001039=R-120000000000-00004525
+# \u6C11\u822A\u8BA2\u7968
+01A1200002658=R-120000000000-00004522
+# \u5883\u5185\u4EBA\u5458\u4F4F\u5BBF
+01A1200002660=R-120000000000-00004526
+# \u957F\u9014\u5BA2\u8FD0
+01A1201001040=R-120000000000-00004530
+
+
 # \u673A\u573A\u4EE3\u7801\u5B57\u5178
 PEK=\u9996\u90FD\u56FD\u9645\u673A\u573A
 NAY=\u5357\u82D1\u673A\u573A