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 71d8c3bec..7edea330f 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,5 +1,6 @@ package com.fangjia.script.temp.shenjian.poi +import com.fangjia.core.util.CosineSimilarAlgorithm import com.fangjia.script.statistics.poi.AmapPoi import com.fangjia.script.temp.shenjian.util.GaoDeUtils import com.fangjia.script.util.MongoUtils @@ -43,6 +44,11 @@ class CommitteeLatLng { List amapPoi = GaoDeUtils.searchPoi(city, address, obj.area_name, "130106|130105|130104") if (amapPoi && amapPoi.size() > 0) { def poi = amapPoi[0] + double similarity = CosineSimilarAlgorithm.getSimilarity(poi.name, obj.name) + if (similarity < 0.7) { + amapPoi = GaoDeUtils.searchPoi(city, address, obj.area_name, "") + } + poi = amapPoi[0] String[] locations = poi.location.split(",") def lng = Double.valueOf(locations[0]) def lat = Double.valueOf(locations[1]) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/util/GaoDeUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/util/GaoDeUtils.groovy index 8496f3f01..c75696cd6 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/util/GaoDeUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/util/GaoDeUtils.groovy @@ -9,6 +9,7 @@ import com.fangjia.script.statistics.poi.AmapPoi import com.fangjia.script.util.GeoHelper import com.fangjia.script.util.HttpRequestUtil import com.fangjia.script.yinjihaun.amap.GaoDeApiUtils +import org.apache.commons.lang.StringUtils import java.util.concurrent.atomic.AtomicInteger @@ -175,7 +176,9 @@ class GaoDeUtils { params.keywords = keywords params.city = city params.region = region - params.types = typecodes + if (StringUtils.isNotBlank(typecodes)) { + params.types = typecodes + } params.put("extensions", "all") params.put("citylimit","true") params.put("offset","20")