Merge branch 'script_gj' into 'master'
房源改为按城市id See merge request !904
This commit is contained in:
+4
-4
@@ -98,7 +98,7 @@ class FjwBigdataForsaleBatch extends BaseBatch{
|
||||
|
||||
for(def city : citys){
|
||||
index++
|
||||
houseIdsfilter = findAllHouseIdsByCity(city)
|
||||
houseIdsfilter = findAllHouseIdsByCity(cityCodeDataMap.get(city))
|
||||
def distCodeMap = CcbCommonUtils.findAllDistrictCodeValue(city)
|
||||
def districts = CcbCommonUtils.findAllDistrictByCity(city, "district", ["city", "region", "name", "lng","estate_type2","name_cat","address", "alias", "finish_building_date", "house_property", "property_life", "build_type", "build_structure"], "all");
|
||||
exportSellCSV(index, city, cityCodeDataMap, distCodeMap, districts, startDate.toInteger(), endDate.toInteger(), houseIdsfilter);
|
||||
@@ -920,11 +920,11 @@ class FjwBigdataForsaleBatch extends BaseBatch{
|
||||
return houseIds;
|
||||
}
|
||||
|
||||
def findAllHouseIdsByCity(city){
|
||||
def findAllHouseIdsByCity(cityid){
|
||||
// 创建布隆过滤器对象
|
||||
BloomFilter<CharSequence> filter = BloomFilter.create(Funnels.stringFunnel(StandardCharsets.UTF_8), 800000000, 0.000001);
|
||||
BloomFilter<CharSequence> filter = BloomFilter.create(Funnels.stringFunnel(StandardCharsets.UTF_8), 200000000, 0.000001);
|
||||
// def houseIds = new HashSet()
|
||||
pgsqlInstance.eachRow("SELECT gujia_sell_id FROM base.bigdata_forsale where urbn_nm='${city}'",{it->
|
||||
pgsqlInstance.eachRow("SELECT gujia_sell_id FROM base.bigdata_forsale where urbn_id='${cityid}'",{it->
|
||||
filter.put(it.gujia_sell_id)
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user