From 24328726292317711c41551c4896441472f9b35e Mon Sep 17 00:00:00 2001 From: gaojuan Date: Thu, 4 Jan 2024 13:09:33 +0800 Subject: [PATCH] update --- .../script/commData/CommonDatautils.groovy | 2 +- .../gj/xiamen/GaoDePoiDataProcess.groovy | 3 +- .../script/gj/xiamen/SeaweedDataSynch.groovy | 37 ++++++++++++++----- .../gj/xiamen/SuggestionDataSynch.groovy | 11 ++++-- 4 files changed, 37 insertions(+), 16 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/commData/CommonDatautils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/commData/CommonDatautils.groovy index 433217f4d..9f88fb0fd 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/commData/CommonDatautils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/commData/CommonDatautils.groovy @@ -265,7 +265,7 @@ class CommonDatautils { q.put("status", 0); q.put("cat", cat); q.put("city", city); -// q.put("name","文华楼") +// q.put("name","泰瑞家园") DBObject keys = new BasicDBObject(); if(fields){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/GaoDePoiDataProcess.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/GaoDePoiDataProcess.groovy index 6123122e8..d5d8303d5 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/GaoDePoiDataProcess.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/GaoDePoiDataProcess.groovy @@ -182,7 +182,7 @@ class GaoDePoiDataProcess extends BaseBatch{ def createCompanyData(map, townMap){ def retMap = [:] - retMap.id = new ObjectId().toString() + retMap._id = map._id retMap.fjw_province = map.province_name retMap.fjw_city = map.city_name @@ -269,7 +269,6 @@ class GaoDePoiDataProcess extends BaseBatch{ def fjw_province = province def fjw_city = RegionData.formatCity(map.city) def fjw_region = RegionData.formatRegion(fjw_city, map.district) - map.id = new ObjectId().toString() map.fjw_province = fjw_province map.fjw_city = fjw_city diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SeaweedDataSynch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SeaweedDataSynch.groovy index cacc276d7..0d1e2f3b3 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SeaweedDataSynch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SeaweedDataSynch.groovy @@ -127,7 +127,7 @@ class SeaweedDataSynch extends BaseBatch{ fullCityMap = CommonDatautils.queryFullNameCity() mcaDistMap = CommonDatautils.queryDistNameCity() - priceMap = findAllDistrictSellPrice() +// priceMap = findAllDistrictSellPrice() def citys = CommonDatautils.findAllCity().reverse() def index = 0 for(def c : citys){ @@ -218,19 +218,36 @@ class SeaweedDataSynch extends BaseBatch{ map.address = dist.address map.block = dist.block if(dist.mapping_alias){ - if(dist.mapping_alias.size()>5){ - map.alias= dist.mapping_alias[0..4] - }else{ - map.alias= dist.mapping_alias + def aliasNames = [] + for(def key : dist.mapping_alias){ + if(key && !key.toString().equals("null")){ + aliasNames << key + if(aliasNames.size()>5){ + map.alias = aliasNames + break; + }else{ + if(aliasNames){ + map.alias = aliasNames + } + } + } } - } if(dist.addr_alias){ - if(dist.addr_alias.size()>5){ - map.addr_alias = dist.addr_alias[0..4] - }else{ - map.addr_alias = dist.addr_alias + def names = [] + for(def key : dist.addr_alias){ + if(key && !key.toString().equals("null")){ + names << key + if(names.size()>5){ + map.addr_alias = names + break; + }else{ + if(names){ + map.addr_alias = names + } + } + } } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy index 4362615db..104e28def 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/SuggestionDataSynch.groovy @@ -48,10 +48,13 @@ class SuggestionDataSynch extends BaseBatch{ public void process(Object args) { run() // updateCode() + } + + def run() { //"三明","宁德","泉州","厦门","福州","漳州","南平","龙岩","莆田","重庆" def citys = CommonDatautils.findAllCity() @@ -65,11 +68,13 @@ class SuggestionDataSynch extends BaseBatch{ updating(c, "district") updating(c, "office") updating(c, "shop") - println index + " " + c + " 完成" + // } - if(["三明","宁德","泉州","厦门","福州","漳州","南平","龙岩","莆田","重庆"].contains(c)) { +// if(["三明","宁德","泉州","厦门","福州","漳州","南平","龙岩","莆田","重庆"].contains(c)) { poiData(c) - } +// } + + println index + " " + c + " 完成" } }