+25
@@ -4962,6 +4962,31 @@ class CommonDatautils {
|
|||||||
return townMap
|
return townMap
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static def queryTownByCity(city, fields){
|
||||||
|
|
||||||
|
def q = new BasicDBObject()
|
||||||
|
q.put("type","乡镇街道")
|
||||||
|
q.put("city",city)
|
||||||
|
|
||||||
|
def keys = new BasicDBObject()
|
||||||
|
for(def key : fields){
|
||||||
|
keys.put(key,1)
|
||||||
|
}
|
||||||
|
def dbcursor = ADMINISTRATIVE_MAPPING_COLL.find(q, keys).batchSize(5000).addOption(Bytes.QUERYOPTION_NOTIMEOUT)
|
||||||
|
def townMap = [:]
|
||||||
|
for(def d : dbcursor){
|
||||||
|
def list = townMap.get(d.district)
|
||||||
|
if(!list){
|
||||||
|
list = []
|
||||||
|
}
|
||||||
|
list << d
|
||||||
|
townMap.put(d.district, list)
|
||||||
|
}
|
||||||
|
|
||||||
|
println "[${city}] 乡镇街道 加载完成 "+new Date().format("yyyy-MM-dd HH:mm:ss")
|
||||||
|
return townMap
|
||||||
|
}
|
||||||
|
|
||||||
static def queryTownByCity(city){
|
static def queryTownByCity(city){
|
||||||
|
|
||||||
def q = new BasicDBObject()
|
def q = new BasicDBObject()
|
||||||
|
|||||||
+70
-6
@@ -38,8 +38,6 @@ class TownStandardBatch extends BaseBatch{
|
|||||||
@Override
|
@Override
|
||||||
void process(Object args) {
|
void process(Object args) {
|
||||||
TownStandard()
|
TownStandard()
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
def TownStandard(){
|
def TownStandard(){
|
||||||
@@ -81,14 +79,14 @@ class TownStandardBatch extends BaseBatch{
|
|||||||
fullCityName = data.city
|
fullCityName = data.city
|
||||||
}
|
}
|
||||||
if(fullCityName){
|
if(fullCityName){
|
||||||
|
def townMap = CommonDatautils.queryTownByCity(fullCityName, ["city","district", "street", "alias"])
|
||||||
def rMap = regionFullNameMap.get(fullCityName)
|
def rMap = regionFullNameMap.get(fullCityName)
|
||||||
if(rMap){
|
if(rMap){
|
||||||
def set = rMap.keySet()
|
def set = rMap.keySet()
|
||||||
def rets = findEsPoiByCity(fullCityName)
|
def rets = findEsPoiByCity(fullCityName)
|
||||||
println city +" "+rets.size()
|
println city +" "+rets.size()
|
||||||
if(set.size()>1){
|
if(set.size()>1){
|
||||||
poiHaveRegionProcess(city, set, rMap, rets)
|
poiHaveRegionProcess(fullCityName, townMap, rets)
|
||||||
}else{
|
}else{
|
||||||
// haveStreetProcess(city, set, cat)
|
// haveStreetProcess(city, set, cat)
|
||||||
}
|
}
|
||||||
@@ -153,10 +151,76 @@ class TownStandardBatch extends BaseBatch{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
def poiHaveRegionProcess(fullCityName, townMap, rets){
|
||||||
|
def results = []
|
||||||
|
if(fullCityName){
|
||||||
|
for(def d : rets){
|
||||||
|
if(d.township){
|
||||||
|
def towns = null
|
||||||
|
def updateTown = null
|
||||||
|
for(def m : townMap){
|
||||||
|
def townDatas = townMap.get(d.district)
|
||||||
|
if(townDatas){
|
||||||
|
towns = townDatas
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
def opt = true
|
||||||
|
if(towns){
|
||||||
|
for(def town : towns){
|
||||||
|
def townAlias = []
|
||||||
|
if(town.alias){
|
||||||
|
townAlias = town.alias
|
||||||
|
}
|
||||||
|
townAlias << town.street
|
||||||
|
if(townAlias.contains(d.township)){
|
||||||
|
if(d.township!=town.street){
|
||||||
|
updateTown = town.street
|
||||||
|
}else{
|
||||||
|
opt = false
|
||||||
|
}
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(opt){
|
||||||
|
if(updateTown){
|
||||||
|
def m = [:]
|
||||||
|
m.put(d.id, ["township":updateTown])
|
||||||
|
results << m
|
||||||
|
// if(results.size()%100==0){
|
||||||
|
// updateByEs(results)
|
||||||
|
// results.clear()
|
||||||
|
// }
|
||||||
|
println d.city +" "+d.district+" "+d.name +" "+d.township+" 乡镇修改为:"+updateTown
|
||||||
|
}else{
|
||||||
|
def m = [:]
|
||||||
|
m.put(d.id, ["township":""])
|
||||||
|
results << m
|
||||||
|
// if(results.size()%100==0){
|
||||||
|
// updateByEs(results)
|
||||||
|
// results.clear()
|
||||||
|
// }
|
||||||
|
println d.city +" "+d.district+" "+d.name +" "+d.township+" 状态修改为:空值"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(results.size()>0){
|
||||||
|
updateByEs(results)
|
||||||
|
results.clear()
|
||||||
|
}
|
||||||
|
println fullCityName +" 处理完成"
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def updateRegionByEs(rows){
|
|
||||||
|
def updateByEs(rows){
|
||||||
def client = ElasticUtils89.getClient("192.168.0.89")
|
def client = ElasticUtils89.getClient("192.168.0.89")
|
||||||
def bulkRequest = new BulkRequest()
|
def bulkRequest = new BulkRequest()
|
||||||
|
|
||||||
@@ -193,7 +257,7 @@ class TownStandardBatch 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)).must(QueryBuilders.termQuery("status", 0))
|
||||||
def rets = []
|
def rets = []
|
||||||
|
|
||||||
String[] includes = ["city", "district", "name", "township", "status", "id"]
|
String[] includes = ["city", "district", "name", "township", "status", "id"]
|
||||||
|
|||||||
Reference in New Issue
Block a user