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 ef344bc84..239c9f83c 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 @@ -3152,5 +3152,19 @@ class CommonDatautils { } return dbo; } + + static def findNewSqmetreRent(def city, def region, def name){ + def q = new BasicDBObject() + q.put("city", city) + q.put("region", region) + q.put("district_name", name) + + def dbcursor = SQMETRE_RENT_COLL.find(q).sort(new BasicDBObject().append("weekend", -1)).limit(1) + def avg_price = null + for(def d : dbcursor){ + avg_price = d.avg_price; + } + return avg_price; + } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/level/DistrictIndexBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/level/DistrictIndexBatch.groovy index 8feaa621c..9113f0971 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/level/DistrictIndexBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/level/DistrictIndexBatch.groovy @@ -70,7 +70,6 @@ class DistrictIndexBatch extends BaseBatch{ def run(){ def cityCodeDatas = CcbCommonUtils.findCityCodeValue() def citys = CommonDatautils.findAllCity(); - citys.remove("ΙΟΊ£") for(def city : citys){ def dists = CommonDatautils.findAllDistrictByCity(city, "district", ["city","alias","region","name", "finish_building_date","estate_charge","lat","lng","lng2","lat2"]) def code = cityCodeDatas.get(city) @@ -85,7 +84,7 @@ class DistrictIndexBatch extends BaseBatch{ city_avg_total_price = 531.2615913 } if(city_avg_total_price){ - calcute(city, dists, code, city_avg_total_price) + // calcute(city, dists, code, city_avg_total_price) calcuteIndex(city, dists, code, city_avg_total_price) } @@ -119,7 +118,7 @@ class DistrictIndexBatch extends BaseBatch{ def total_price = getHousePrice(d, dists, priceMap, citycode); def avg_cost = getAvgCost(d, costDatas) - + def avg_price = priceMap.get(d.city+"##"+d.region+"##"+d.name) def map = [:] map.id = d._id.toString() map.city = d.city @@ -137,9 +136,10 @@ class DistrictIndexBatch extends BaseBatch{ //datas << [d.city, d.region, d.name, total_price_index, avg_charge_index, rank_index, avg_cost_index,potentiality] + map.sell_avg_price = avg_price def newUrl = targetUrl +"_doc/"+map.id httpSaveData(newUrl, map) - println "[${totalCount.get()}] " + d.name + " avg_cost: " + avg_cost + " avg_charge:" + avg_charge + " rank:" + rank + " total_price:" + total_price + println "[${totalCount.get()}] " + d.name + " avg_cost: " + avg_cost + " avg_charge:" + avg_charge + " rank:" + rank + " total_price:" + total_price+"" } catch (Exception e) { e.printStackTrace() } finally { @@ -213,6 +213,9 @@ class DistrictIndexBatch extends BaseBatch{ def potentiality = total_price_index + avg_charge_index + rank_index + avg_cost_index + 4099.978248 potentiality = DataHandleUtils.getDoubleRound(6, potentiality) + + def year = CommonUtils.getBuildYear(d.finish_building_date) + def sqmetre_rent = CommonDatautils.findNewSqmetreRent(d.city,d.region,d.name) def map = [:] map.id = d._id.toString() map.city = d.city @@ -228,6 +231,15 @@ class DistrictIndexBatch extends BaseBatch{ map.avg_total_price = total_price_index map.month = "2022-03" map.m_date = DateUtil.formatDate(new Date(),"yyyy-MM-dd HH:mm:ss").replace(" ","T") + + map.finish_date = year + map.sell_avg_price = rMap.sell_avg_price + if(sqmetre_rent){ + map.sqmetre_rent = sqmetre_rent + } + if(rMap.sell_avg_price && sqmetre_rent){ + map.price_to_rent = (rMap.sell_avg_price/sqmetre_rent).toInteger() + } def newUrl = targetUrl +"_doc/"+map.id httpSaveData(newUrl, map) @@ -268,6 +280,7 @@ class DistrictIndexBatch extends BaseBatch{ rMap.put("price_rank", rs.price_rank) rMap.put("avg_cost", rs.avg_cost) rMap.put("avg_estate_charge", rs.avg_estate_charge) + rMap.put("sell_avg_price", rs.sell_avg_price) } return detailMap; }