diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataForsaleBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataForsaleBatch.groovy index 0f85fe67b..cf248fb61 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataForsaleBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataForsaleBatch.groovy @@ -123,7 +123,7 @@ class BigdataForsaleBatch extends BaseBatch{ def commId = rMap.get("_id").toString() - def ret = findHouses(city, rMap.region, "sell", startDate,endDate, rMap.name, rMap.alias, rMap.estate_type2, commId) + def ret = findHouses(city, rMap.region, "sell", startDate,endDate, rMap.name, rMap.alias, rMap.estate_type2, commId, cityCodeDataMap) //def ret = findHousesByDistId(city, commId, "sell", startDate,endDate) // if(ret && ret.size()<100){//导历史房源需要,以后不需要 // ret = findHouses(city, rMap.region, "sell", 20190701, endDate, rMap.name, rMap.alias) @@ -436,14 +436,15 @@ class BigdataForsaleBatch extends BaseBatch{ } - def findHouses(def city, def region, def cat, def startDate, def endDate, def name, def alias, def estate_type2, def commId){ + def findHouses(def city, def region, def cat, def startDate, def endDate, def name, def alias, def estate_type2, def commId, def cityCodeDataMap){ def rets1 = findHousesByPdate(city, region, cat, startDate, endDate, name, alias, estate_type2) def rets2 = findHousesByMdate(city, region, cat, startDate, endDate, name, alias, estate_type2, rets1) rets1.addAll(rets2) if(rets1){ def newRets = [] - def houseIds = getAllHouseIds(commId) + def cityCode = cityCodeDataMap.get(city) + def houseIds = getAllHouseIds(commId, cityCode) for(def r : rets1){ if(!houseIds.contains(r.houseId)){ newRets << r @@ -1034,8 +1035,8 @@ class BigdataForsaleBatch extends BaseBatch{ println ids.size() } - def getAllHouseIds(def commid){ - def sql = "SELECT FORSALEID FROM bigdata_forsale_gj WHERE commid = '"+commid+"'"; + def getAllHouseIds(def commid, def cityCode){ + def sql = "SELECT FORSALEID FROM bigdata_forsale_gj WHERE cityid='"+cityCode+"' and commid = '"+commid+"'"; def houseIds = new HashSet() sqlInstance.eachRow(sql,{it->