From f207b8b53abe42d62350e62260eb19bd1cda1eaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E5=81=A5?= Date: Sun, 26 Sep 2021 18:14:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=95=87=E5=88=86=E8=AF=8D?= =?UTF-8?q?=E7=BB=8F=E7=BA=AC=E5=BA=A6=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../temp/shenjian/poi/CommitteeLatLng.groovy | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/poi/CommitteeLatLng.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/poi/CommitteeLatLng.groovy index acd13cff0..56ad77ad4 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/poi/CommitteeLatLng.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/poi/CommitteeLatLng.groovy @@ -1,6 +1,7 @@ package com.fangjia.script.temp.shenjian.poi import com.fangjia.core.util.CosineSimilarAlgorithm +import com.fangjia.script.gj.EsUtils import com.fangjia.script.statistics.poi.AmapPoi import com.fangjia.script.temp.shenjian.util.GaoDeUtils import com.fangjia.script.util.MongoUtils @@ -20,12 +21,10 @@ import java.util.concurrent.Executors class CommitteeLatLng { static DBCollection villagesConn = MongoUtils.getCollectionByName("fangjia", "villages", "192.168.0.43", 28017) - static ExecutorService executorService = Executors.newFixedThreadPool(1) + static ExecutorService executorService = Executors.newFixedThreadPool(20) static void main(String[] args) { - dealPoi(new BasicDBObject("status_location", new BasicDBObject('$ne', 0)) - .append("province_name", '江苏省') - ) + dealPoi(new BasicDBObject("status_location", new BasicDBObject('$ne', 0))) //dealLocation() executorService.shutdown() } @@ -41,10 +40,6 @@ class CommitteeLatLng { def area = obj.area_name def name = obj.name -// if (!name.contains("社区居委会")) { -// return ; -// } - if (city == "市辖区") { city = obj.province_name } else if (city == "省直辖县级行政区划" || city == "自治区直辖县级行政区划") { @@ -57,17 +52,22 @@ class CommitteeLatLng { if (obj.name.contains("虚拟生活区") || obj.name.contains("管理区") || obj.name.contains("虚拟社区")) { name = obj.street_name } - if (name.contains("社区居委会")) { - name = name.replace("居委会", "") +// if (name.contains("社区居委会")) { +// name = name.replace("居委会", "") +// } + if (name.contains("村村委会")) { + name = name.replace("村委会", "") + } else if (name.contains("村委会")) { + name = name.replace("村委会", "村") } - String address = province_name + city + area + " " + obj.street_name + " " + name; + String address = province_name + " " + city + " " + area + " " + obj.street_name + " " + name; //String address = province_name + city + area + name List amapPoi = GaoDeUtils.searchPoi(city, address, area, "130106|130105|130104") if (amapPoi && amapPoi.size() > 0) { def poi = amapPoi[0] double similarity = CosineSimilarAlgorithm.getSimilarity(poi.name, name) - if (similarity < 0.7) { + if (similarity <= 0.8) { amapPoi = GaoDeUtils.searchPoi(city, address, area, "") } poi = amapPoi[0]