Merge branch 'master' of 192.168.0.27:dev0/PriceSystem

This commit is contained in:
2018-04-04 13:35:07 +08:00
5 changed files with 13 additions and 8 deletions
+1 -1
View File
@@ -77,7 +77,7 @@ def send_city_calc_cmd():
save_city_calc_command(city, None, weekend)
def district_calc_cmd_finish():
def district_calc_cimport redismd_finish():
count = client.llen(QUEUE)
if count == 0:
return True
+1
View File
@@ -274,6 +274,7 @@ def dis_feature(query, fields=None):
# dsf = db1.average_statistics
# s = time.time()
seawater105 = get_collection("fangjia_stat", "district_feature", config.get_mongodb_host(), config.get_mongodb_port())
#seawater105 = get_collection("luogan", "district_feature", '192.168.0.136',27017)
for err_count in range(0, 10):
+1 -1
View File
@@ -42,7 +42,7 @@ def get_weekend(tt):
if __name__ == "__main__":
weekend = ""
#send_cmd({"city": "西安", "region": "雁塔", "name": "鸿景花园", "weekend": get_weekend('20180325')})
send_cmd({"city": "西安", "region": "雁塔", "name": "鸿景花园", "weekend": get_weekend('20180325')})
send_cmd({"city": "绍兴", "region": "越城", "name": "辕门新村南区", "weekend": get_weekend('20180401')})
#sys.exit(0)
+6 -2
View File
@@ -508,7 +508,7 @@ def commonprice(ct, rl, p):
dd = neighbor(location['lng2'].iloc[0], location['lat2'].iloc[0], 5, ct, rl, p)
# print(time.time()-t1,'t1'*10)
# print('dd=',dd,'dd'*20)
#print('dd=',dd,'dd'*20)
if dd.shape[0] >= factor:
# print('$'*50)
# dd1=neighbor(location['lng2'][0],location['lat2'][0],5)
@@ -916,7 +916,7 @@ def commonprice(ct, rl, p):
bl = ['anjuke_esf_price',
'soufang_esf_price',
'tuboshi_esf_price',
'ganji_esf_price'
]
# ppd3dp=ppd3['total_price'].dropna()
@@ -1449,3 +1449,7 @@ def out_put_price(ct, rl, lk, weekend):
}, True
)
'''
+4 -4
View File
@@ -37,11 +37,11 @@ lk = '会展世界城三期'
"""
ct='洛阳'
rl='涧西'
lk='奥阳康城'
lk='奥阳康城'上海浦东龚家阁龚家花园绍兴越城辕门新村南区亨纳斯花园杨浦
"""
ct='北海'
rl='银海'
lk='汇景公寓'
ct='上海'
rl='杨浦'
lk='亨纳斯花园'
#成都双流长滩一号 上海 奉贤 朝阳新村##上海 奉贤 棕榈滩别墅深圳龙岗丽皇阁
#洛阳涧西奥阳康城