Merge branch 'master' of 192.168.0.27:dev0/PriceSystem

This commit is contained in:
2018-04-25 16:43:02 +08:00
4 changed files with 11 additions and 5 deletions
+10 -4
View File
@@ -333,7 +333,7 @@ def before_month_lastday(ti):
def save_region_feature(ct,rl,timd,timm):
a=time.time()
#a=time.time()
region_feature=dff(ct,rl,timd,timm)
#print('region_feature=',region_feature)
@@ -341,8 +341,13 @@ def save_region_feature(ct,rl,timd,timm):
mmup=region_make_up_price(ct,rl,None,timm)
#print('mmup_region=',mmup)
#print('this month region price',region_feature[1])
make_up=return_operate(mmup,region_feature[1])
date=datetime.datetime.now()
markup=return_operate(mmup,region_feature[1])
def c_date():
date1=datetime.datetime.now()
pacific = pytz.timezone('Asia/Shanghai')
return pacific.localize(date1)
@@ -388,6 +393,7 @@ def save_region_feature(ct,rl,timd,timm):
#save_lg = fangjia.get_collection("fangjia_stat", "rent_1221", config.get_district_stat_host(), config.get_district_stat_port())
avg=region_feature[1]
date=c_date()
if type(avg)!=str:
avg=float(avg)
save_lg = fangjia.get_collection("fangjia",config.get_sqm_rentprice_db(), config.get_mongodb_host(),27017)
@@ -396,7 +402,7 @@ def save_region_feature(ct,rl,timd,timm):
{"city":ct,"region":rl,"weekend":timme},
{"city":ct,"region":rl,"district_name":None,"make_up":make_up,'ratio':region_feature[0],
{"city":ct,"region":rl,"district_name":None,"make_up":markup,'ratio':region_feature[0],
"avg_price":region_feature[1], "c_date":date,"weekend":timme,"cat":'region'},True
)
+1 -1
View File
@@ -24,7 +24,7 @@ ct='上海'
rl='闵行'
lk='虹凯小区'#杨浦凤城四村闵行上海康城厦门同安大唐世家二期青岛市北东方小区合肥庐阳海亮红玺台青岛市北东方小区
#深圳龙岗浪背村宝安吉祥公寓门头沟 泷悦长安北京上海闵行金盛小区江苏昆山象屿珑庭##
#深圳龙岗浪背村宝安吉祥公寓门头沟 泷悦长安北京上海闵行金盛小区江苏昆山象屿珑庭###
#for i in range(0, 100):深圳福田世纪豪庭北京海淀前沙涧襄阳樊城国色天襄上海闵行虹凯小区
#北区济南章丘朝阳南区上海奉贤嘉安公寓