Merge branch 'script_gj' into 'master'
Script gj See merge request !783
This commit is contained in:
+12
-10
@@ -66,13 +66,13 @@ class SuggestionDataSynch extends BaseBatch{
|
||||
def allRets = []
|
||||
index++
|
||||
// if(!["三明","宁德","泉州","厦门","福州","漳州","南平","龙岩","莆田","重庆"].contains(c)){
|
||||
def ret1 = updating(c, "district")
|
||||
def ret2 = updating(c, "office")
|
||||
def ret3 = updating(c, "shop")
|
||||
def ret1 = updating(c, "district")
|
||||
def ret2 = updating(c, "office")
|
||||
def ret3 = updating(c, "shop")
|
||||
|
||||
// }
|
||||
// if(["三明","宁德","泉州","厦门","福州","漳州","南平","龙岩","莆田","重庆"].contains(c)) {
|
||||
def ret4 = poiData(c)
|
||||
def ret4 = poiData(c)
|
||||
// }
|
||||
|
||||
allRets.addAll(ret1)
|
||||
@@ -80,7 +80,7 @@ class SuggestionDataSynch extends BaseBatch{
|
||||
allRets.addAll(ret3)
|
||||
allRets.addAll(ret4)
|
||||
|
||||
println index + " " + c + " 完成"
|
||||
println index + " " + c + " 完成 "+ allRets.size()
|
||||
saveToMG(c, allRets)
|
||||
}
|
||||
}
|
||||
@@ -178,7 +178,7 @@ class SuggestionDataSynch extends BaseBatch{
|
||||
map.alias = dist.alias
|
||||
}
|
||||
if(dist.addr_alias && dist.addr_alias.size()>0){
|
||||
map.addr_alias = dist.addr_alias
|
||||
map.addr_alias = dist.addr_alias
|
||||
}
|
||||
map.type = dist.cat
|
||||
if(dist.lng){
|
||||
@@ -221,9 +221,11 @@ class SuggestionDataSynch extends BaseBatch{
|
||||
def data = fullCityMap.get(city)
|
||||
if(data){
|
||||
def results = CommonDatautils.findAmapDetailBySql(data.city)
|
||||
createPoi(results, data, townMap)
|
||||
def rets = createPoi(results, data, townMap)
|
||||
println city +" 完成!"
|
||||
return rets;
|
||||
}
|
||||
return []
|
||||
|
||||
}
|
||||
|
||||
@@ -295,13 +297,13 @@ class SuggestionDataSynch extends BaseBatch{
|
||||
if(d.city == "市辖区"){
|
||||
fjwcity = RegionData.formatCity(d.province)
|
||||
if(fjwcity){
|
||||
d.city = d.province
|
||||
d.city = d.province
|
||||
}
|
||||
}
|
||||
}
|
||||
}else if(d.level == "区域"){
|
||||
if(d.administer == "省直辖县级行政区划"){
|
||||
fjwcity = RegionData.formatCity(d.city)
|
||||
fjwcity = RegionData.formatCity(d.city)
|
||||
if(fjwcity){
|
||||
d.city = d.district
|
||||
}
|
||||
@@ -329,7 +331,7 @@ class SuggestionDataSynch extends BaseBatch{
|
||||
}else if(d.city == "市辖区"){
|
||||
def fjwcity = RegionData.formatCity(d.province)
|
||||
if(fjwcity){
|
||||
def fjwdist = RegionData.formatRegion(fjwcity, d.district)
|
||||
def fjwdist = RegionData.formatRegion(fjwcity, d.district)
|
||||
retMap.put(fjwcity+"#"+fjwdist, d)
|
||||
}
|
||||
}else{
|
||||
|
||||
Reference in New Issue
Block a user