diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/GaoDePoiDataProcess.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/GaoDePoiDataProcess.groovy index 45222be0b..6e7603f05 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/GaoDePoiDataProcess.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/GaoDePoiDataProcess.groovy @@ -200,15 +200,16 @@ class GaoDePoiDataProcess extends BaseBatch{ try{ totalCount.addAndGet(1) // def obj = MAPPOI_CONN.findOne(new BasicDBObject("name", p.name).append("district", p.district).append("city", p.city)) - def key = p.city+"##"+p.district+"##"+p.name + def key = p.city+"##"+p.district+"##"+p.name.replace("-","").replace("¡¤","") if(!poiKeysFilter.mightContain(key)){ def prov = ProvinceData.getProvince(p.city.replace("ÊÐ","")) def ret = createVillageData(prov, p, townMap) - if(ret && !rets.containsKey(ret.city+"##"+ret.district+"##"+ret.name)){ + def newKey = ret.city+"##"+ret.district+"##"+ret.name.replace("-","").replace("¡¤","") + if(ret && !rets.containsKey(newKey)){ //keyRets << ret.city+"##"+ret.district+"##"+ret.name //rets << ret - rets.put(ret.city+"##"+ret.district+"##"+ret.name, ret) + rets.put(newKey, ret) } } @@ -229,7 +230,7 @@ class GaoDePoiDataProcess extends BaseBatch{ QueryBuilder queryBuilder = QueryBuilders.boolQuery().must(QueryBuilders.termQuery("city", city)) BloomFilter filter = BloomFilter.create(Funnels.stringFunnel(StandardCharsets.UTF_8), 200000000, 0.000001); ElasticUtils89.executeQuery("192.168.0.89", "didata_map_poi_single", queryBuilder, { String id, Map d-> - filter.put(d.city +"##"+d.district+"##"+d.name) + filter.put(d.city +"##"+d.district+"##"+d.name.replace("-","").replace("¡¤","")) }) return filter }