This commit is contained in:
2024-12-25 16:25:36 +08:00
parent 532c4b5230
commit 143ec1daff
@@ -358,9 +358,9 @@ class NewGaoDePoiBatch extends BaseBatch{
def oldPoiMagre(){ def oldPoiMagre(){
def cityList = CommonDatautils.findFullNameCitys().reverse() def cityList = CommonDatautils.findFullNameCitys().reverse()
for(def cityObj : cityList){ for(def cityObj : cityList){
if(!cityObj.city.contains("五指山市")){ // if(!cityObj.city.contains("攀枝花市")){
continue // continue
} // }
def fileName = "/home/goojia/gj/poi/old_poi/merge_poi/${cityObj.city}.csv" def fileName = "/home/goojia/gj/poi/old_poi/merge_poi/${cityObj.city}.csv"
if (CommonDatautils.isWindow()) { if (CommonDatautils.isWindow()) {
fileName = "D:\\数据\\merge_poi\\${cityObj.city}.csv" fileName = "D:\\数据\\merge_poi\\${cityObj.city}.csv"
@@ -463,7 +463,7 @@ class NewGaoDePoiBatch extends BaseBatch{
def findEsPoiByCity(city){ def findEsPoiByCity(city){
QueryBuilder queryBuilder = QueryBuilders.boolQuery().must(QueryBuilders.termQuery("city", city)) QueryBuilder queryBuilder = QueryBuilders.boolQuery().must(QueryBuilders.termQuery("city", city))
def map = new HashMap() def map = new HashMap()
ElasticUtils89.executeQuery("192.168.0.89", "didata_map_poi", queryBuilder, { String id, Map d-> ElasticUtils89.executeQuery("192.168.0.89", "map_poi_2024", queryBuilder, { String id, Map d->
def district = "" def district = ""
if(d.district){ if(d.district){
district = d.district district = d.district