This commit is contained in:
2024-01-16 21:53:40 +08:00
parent d9181fdb61
commit 11cb97b033
4 changed files with 51 additions and 10 deletions
@@ -674,6 +674,7 @@ class OpenApiUtils {
static def financialRating(city, address){ static def financialRating(city, address){
def url = "http://open.fangjia.com/address/financialRating?city=${city}&address=${address}&token=F54F52381C49BB9EB4A33EB1B65604AE4B71A28AEE53518A94A2F360408B9056D57553931D15CE6DDE765562DAD286BA38E05A4CDAFC51C3D527A4959BF8E75A3B95DB7108FCEA340DDE61925616DB55118E1851E67D83EAD800460D100D6B667A4ED8EE67C8F7FB" def url = "http://open.fangjia.com/address/financialRating?city=${city}&address=${address}&token=F54F52381C49BB9EB4A33EB1B65604AE4B71A28AEE53518A94A2F360408B9056D57553931D15CE6DDE765562DAD286BA38E05A4CDAFC51C3D527A4959BF8E75A3B95DB7108FCEA340DDE61925616DB55118E1851E67D83EAD800460D100D6B667A4ED8EE67C8F7FB"
String content = new HttpRequest().get(url, "utf-8"); String content = new HttpRequest().get(url, "utf-8");
print(url)
if(content){ if(content){
def doc = new JsonSlurper().parseText(content) def doc = new JsonSlurper().parseText(content)
if(doc && doc.code ==0 && doc.result){ if(doc && doc.code ==0 && doc.result){
@@ -28,7 +28,10 @@ class GaoDeMapSearchTest {
// task.mapSearch(path) // task.mapSearch(path)
// task.baiduMapSearch(path) // task.baiduMapSearch(path)
// task.checkTrue(path) // task.checkTrue(path)
task.addFinancialLevel(path) // task.addFinancialLevel(path)
def results = com.fangjia.script.gj.OpenApiUtils.financialRating("重庆", "凤中路193号")
println results
} }
def addFinancialLevel(path){ def addFinancialLevel(path){
@@ -10,24 +10,39 @@ def codeMap = ["
//def region = "东城区" //def region = "东城区"
//def rets = OpenApiUtils.searchBaiDuMap(name, region, codeMap.get("北京").toInteger()); //def rets = OpenApiUtils.searchBaiDuMap(name, region, codeMap.get("北京").toInteger());
filePath = "D:\\数据\\涉农\\无经纬度居委_0.xlsx" filePath = "D:\\数据\\涉农\\无经纬度居委_5.xlsx"
ExcelUtils.multiThreadingModify(filePath, {d-> ExcelUtils.multiThreadingModify(filePath, {d->
if(!d['N']){ if(!d['N']){
def city = d['D'] def city = d['D']
def region = d['F'] def region = d['F']
def name = d['J'] def name = d['J']
def township = d['H']
def code = codeMap.get(city); def code = codeMap.get(city);
if(!code){ if(!code){
code = codeMap.get(RegionData.formatCity(city)); code = codeMap.get(RegionData.formatCity(city));
} }
if(code){ if(code){
def rets = OpenApiUtils.searchBaiDuMap(name, region, code.toInteger()); def rets = OpenApiUtils.searchBaiDuMap(name, region, code.toInteger());
// rets = sortResult(rets)
println name +" "+rets.size() println name +" "+rets.size()
for(def r : rets){ for(def r : rets){
def bdname = r.name.replace("-","").replace("社区居民委员会","").replace('社区居委会','').replace('居民委员会','').replace('村民委员会','').replace('村委员会','').replace('村委会','').replace('居委会','') def bdname = r.name.replace("-","").replace("社区居民委员会","").replace('社区居委会','').replace('居民委员会','').replace('村民委员会','').replace('村委员会','').replace('村委会','').replace('居委会','')
def newName = name.replace("-","").replace("社区居民委员会","").replace('社区居委会','').replace('居民委员会','').replace('村民委员会','').replace('村委员会','').replace('村委会','').replace('居委会','') def newName = name.replace("-","").replace("社区居民委员会","").replace('社区居委会','').replace('居民委员会','').replace('村民委员会','').replace('村委员会','').replace('村委会','').replace('居委会','')
def stopFlag = false
if(bdname == newName){ if(bdname == newName){
stopFlag = true
}else if(bdname.endsWith("村")){
if(bdname.equals(newName+"村")){
stopFlag = true
}else{
if(bdname.equals(township+newName+"村")){
stopFlag = true
}
}
}
if(stopFlag){
d['N'] = DataUtil.getRound(6, r.lng) d['N'] = DataUtil.getRound(6, r.lng)
d['O'] = DataUtil.getRound(6, r.lat) d['O'] = DataUtil.getRound(6, r.lat)
d['P'] = r.estateType d['P'] = r.estateType
@@ -48,6 +63,23 @@ ExcelUtils.multiThreadingModify(filePath, {d->
}) })
def sortResult(rets){
rets.sort{a,b->
def a1 = a.estateType
def b1 = b.estateType
def a1_score = a.score
if(a1.contains("政府机构")){
a1_score = a1_score +1
}
def b1_score = b.score
if(b1.contains("政府机构")){
b1_score = b1_score +1
}
return b1_score.compareTo(a1_score)
}
return rets
}
// //
//def code = codeMap.get("北京"); //def code = codeMap.get("北京");
@@ -59,14 +59,14 @@ class SuggestionDataSynch extends BaseBatch{
def run() { def run() {
//"三明","宁德","泉州","厦门","福州","漳州","南平","龙岩","莆田","重庆" //"三明","宁德","泉州","厦门","福州","漳州","南平","龙岩","莆田","重庆"
def citys = CommonDatautils.findAllCity() def citys = ["岳阳","湘潭","张家界","邵阳","南京","苏州","无锡","扬州","常州","徐州","镇江","南通","泰州","连云港","盐城","淮安","宿迁"]//CommonDatautils.findAllCity()
def index = 0 def index = 0
fullCityMap = queryFullNameCity() fullCityMap = queryFullNameCity()
mcaDistMap = queryDistNameCity() mcaDistMap = queryDistNameCity()
for (def c : citys) { for (def c : citys) {
def allRets = [] def allRets = []
if(["上海","北京","广州","深圳","成都","杭州","天津","西安","南京","沈阳","重庆","武汉","石家庄","福州","宁波","贵阳"].contains(c)){ if(["上海","北京","广州","深圳","成都","杭州","天津","西安","南京","沈阳","重庆","武汉","石家庄","福州","宁波","贵阳","怀化","郴州","益阳","永州","娄底","湘西","长沙","常德","株洲","衡阳"].contains(c)){
continue; continue;
} }
index++ index++
@@ -85,8 +85,8 @@ class SuggestionDataSynch extends BaseBatch{
allRets.addAll(ret3) allRets.addAll(ret3)
allRets.addAll(ret4) allRets.addAll(ret4)
println index + " " + c + " 完成 "+ allRets.size()
saveToMG(c, allRets) saveToMG(c, allRets)
println index + " " + c + " 完成 "+ allRets.size()
} }
} }
@@ -96,7 +96,13 @@ class SuggestionDataSynch extends BaseBatch{
def data = fullCityMap.get(city) def data = fullCityMap.get(city)
def q = new BasicDBObject("city", data.city) def q = new BasicDBObject("city", data.city)
def count = SUGGESTION_CONN.count(q) def count = 0
try{
count = SUGGESTION_CONN.count(q)
}catch(e){
SUGGESTION_CONN = MongoUtils.getCollectionByName2("fangjia", "suggestion", MONGO100_URL)
count = SUGGESTION_CONN.count(q)
}
if(count>0){ if(count>0){
SUGGESTION_CONN.remove(q) SUGGESTION_CONN.remove(q)
} }
@@ -227,7 +233,6 @@ class SuggestionDataSynch extends BaseBatch{
if(data){ if(data){
def results = CommonDatautils.findAmapDetailBySql(data.city) def results = CommonDatautils.findAmapDetailBySql(data.city)
def rets = createPoi(data.city, results, data, townMap) def rets = createPoi(data.city, results, data, townMap)
println city +" 完成!"
return rets; return rets;
} }
return [] return []
@@ -265,9 +270,9 @@ class SuggestionDataSynch extends BaseBatch{
map.source = "FJW" map.source = "FJW"
if(townshipMap && townshipMap.containsKey(dist.id)){ if(townshipMap && townshipMap.containsKey(dist.id)){
def obj = townshipMap.get(dist.id) def township = townshipMap.get(dist.id)
if(obj){ if(township){
map.township = obj.township map.township = township
} }
} }
if(!map.township){ if(!map.township){