Merge remote-tracking branch 'origin/master'
This commit is contained in:
+1
@@ -1,5 +1,6 @@
|
||||
package com.fangjia.script.dataAna
|
||||
|
||||
import com.fangjia.core.util.DataUtil
|
||||
import com.fangjia.core.util.DateUtil
|
||||
import com.fangjia.datastore.driver.DSCursor
|
||||
import com.fangjia.script.BaseBatch
|
||||
|
||||
+5
-1
@@ -147,8 +147,9 @@ class SeaweedDataSynch extends BaseBatch{
|
||||
def run(){
|
||||
|
||||
fullCityMap = CommonDatautils.queryFullNameCity()
|
||||
println "城市全称加载完成"
|
||||
mcaDistMap = CommonDatautils.queryDistNameCityByMapping()
|
||||
|
||||
println "民政部加载完成"
|
||||
priceMap = findAllDistrictSellPrice()
|
||||
def citys = CommonDatautils.findAllCity()
|
||||
def index = 0
|
||||
@@ -342,6 +343,9 @@ class SeaweedDataSynch extends BaseBatch{
|
||||
map.region = distData.district
|
||||
area_code = distData.mca_district_code
|
||||
}else{
|
||||
if(["东莞市","中山市","济源市","仙桃市","潜江市","天门市","神农架林区","五指山市","琼海市","文昌市","万宁市","东方市","定安县","屯昌县","澄迈县","临高县","白沙黎族自治县","昌江黎族自治县","乐东黎族自治县","陵水黎族自治县","保亭黎族苗族自治县","琼中黎族苗族自治县","五指山市","琼海市","文昌市","万宁市","东方市","定安县","屯昌县","澄迈县","临高县","白沙黎族自治县","昌江黎族自治县","乐东黎族自治县","陵水黎族自治县","保亭黎族苗族自治县","琼中黎族苗族自治县","石河子市","阿拉尔市","图木舒克市","五家渠市","北屯市","铁门关市","双河市","可克达拉市","昆玉市","胡杨河市","新星市","白杨市"].contains(map.city)){
|
||||
map.region = map.city
|
||||
}
|
||||
// map.region = dist.region
|
||||
println dist.city +" "+dist.region+" 民政部中没有找到相应的区域全称"
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user