瀏覽代碼

调整融合地名地址路径。

DESKTOP-6LTVLN7\Liumouren 3 月之前
父節點
當前提交
3a4939fb49

+ 4 - 1
src/main/java/com/skyversation/poiaddr/addquery/Constant.java

@@ -46,7 +46,10 @@ public class Constant {
     public static final String GET_TOKEN_URL = "http://10.235.245.226:7010/addrMatch/auth/getToken";
     public static final String GET_ADDRESS_MEG_URL = "http://10.235.245.226:7010/addrMatch/addrApi/searchAddr";
     public static final String SZX_URL = "https://service-api.onemap.sh.gov.cn/data-service-manage-service/MapProxyApi/eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJhcHBsaWNhdGlvbl9pZCI6NjEsImFwcGxpY2F0aW9uX25hbWUiOiLpnZLmtabkuozkuInnu7TmnI3liqHns7vnu58iLCJleHAiOjIwNDY2Nzg0MDN9.IKUMdjUX4U1jncIUNren-iotL7duXI90aLECMjpvUX8/address_search/MapServer?page_num=1&page_size=5";
-    public static final String SJ_SZX_SEARCH_BY_NAME = "https://data.songjiang.gov.cn:8081/openapi/1736930075105";
+//    TODO 平台融合版地名地址接口
+//    public static final String SJ_SZX_SEARCH_BY_NAME = "https://data.songjiang.gov.cn:8081/openapi/1736930075105";
+//    TODO 服务器融合版地名地址接口
+    public static final String SJ_SZX_SEARCH_BY_NAME = "http://172.30.77.19:8081/openapi/1736930075105";
     public static final String V4_URL = "http://10.235.245.174:10011/proxy/address/getAddressV4?token=65463DEE-620A-0ED5-2385-17ECD07CD351&address=";
 
     public static String AMAP_GEO_URL = "https://restapi.amap.com/v3/geocode/geo";

+ 4 - 4
src/main/java/com/skyversation/poiaddr/util/AddressTools.java

@@ -492,10 +492,10 @@ public class AddressTools {
             JSONObject obj = array.getJSONObject(i);
             obj.put("searchAddress", address);
             if (obj.containsKey(param) && obj.get(param) != null) {
-//          得到返回的地址
+//              得到返回的地址
                 String addr = obj.getString(param);
-//          规则4判断
-//          TODO 添加校验逻辑(首先使用第4校验规则匹配,匹配不到使用第二规则,还匹配不到的话就使用打分规则)
+//              规则4判断
+//              TODO 添加校验逻辑(首先使用第4校验规则匹配,匹配不到使用第二规则,还匹配不到的话就使用打分规则)
                 Set<String> addressString = AddressQueryEngine.tokenizeString(addr).get(0);
                 Set<String> addressNumber = AddressQueryEngine.tokenizeString(addr).get(1);
                 Set<String> address2String = AddressQueryEngine.tokenizeString(address).get(0);
@@ -520,7 +520,7 @@ public class AddressTools {
                         }
                     }
                 }
-//          规则2判断
+//              规则2判断
                 String role2address = AddressQueryEngine.townReplaceAll(AddressQueryEngine.addressReplaceAll(addr));
                 String role2address2 = AddressQueryEngine.townReplaceAll(AddressQueryEngine.addressReplaceAll(address));
                 if (AddressQueryEngine.isNotEmptyOrBlank(role2address) && role2address.contains(role2address2)) {

+ 1 - 1
src/main/java/com/skyversation/poiaddr/util/tasks/ScheduledTasks.java

@@ -15,7 +15,7 @@ public class ScheduledTasks {
     /**
      * 全量跑C表数据
      */
-    @Scheduled(cron = "0 30 16 * * *")
+    @Scheduled(cron = "0 0 1 * * *")
     public void executeAtOneOClock() {
         System.out.println("定时开始执行,当前时间:" + new Date());
         // 在这里编写具体的业务逻辑