diff --git a/PriceSystem/CalcCmdSender.py b/PriceSystem/CalcCmdSender.py index 2d7d9c5..671bfa6 100644 --- a/PriceSystem/CalcCmdSender.py +++ b/PriceSystem/CalcCmdSender.py @@ -77,7 +77,7 @@ def send_city_calc_cmd(): save_city_calc_command(city, None, weekend) -def district_calc_cimport redismd_finish(): +def district_calc_cmd_finish(): count = client.llen(QUEUE) if count == 0: return True diff --git a/PriceSystem/ones_Sender.py b/PriceSystem/ones_Sender.py index 3da3a88..318433b 100644 --- a/PriceSystem/ones_Sender.py +++ b/PriceSystem/ones_Sender.py @@ -44,17 +44,3 @@ if __name__ == "__main__": #send_cmd({"city": "西安", "region": "雁塔", "name": "鸿景花园", "weekend": get_weekend('20180325')}) send_cmd({"city": "绍兴", "region": "越城", "name": "辕门新村南区", "weekend": get_weekend('20180401')}) #sys.exit(0) - - - - - - - - - - - - - - diff --git a/PriceSystem/test.py b/PriceSystem/test.py index d9683ad..d9cf64c 100644 --- a/PriceSystem/test.py +++ b/PriceSystem/test.py @@ -1,80 +1,84 @@ -import datetime -import fangjia -#fangjia.send_dingding_msg("测试") +import pandas as pd +import numpy as np -import time - -import sell_price.zhuge0118A as sellPrice - -s = time.time() - - -#上海 闵行上海康城 - -#深圳龙岗葵涌供销社综合商住楼 -''' -ct = '深圳' -rl = '龙岗' -lk = '葵涌供销社综合商住楼' -ct = '杭州' -rl = '桐庐' -lk = '金色港湾度假村' - -ct = '成都' -rl = '武侯' -lk = '中海国际社区林汀别墅' - - -ct = '成都' -rl = '双流' -lk = '长滩壹号' - -ct = '广州' -rl = '海珠' -lk = '会展世界城三期' -''' -#成都- 都江堰- 溪岭雪#上海徐汇 灞桥沁水新城百汇园西 安 未央 兴乐园 弘和美邻馆 雁塔鸿景花园上海 奉贤 万隆花苑# -""" -ct='洛阳' -rl='涧西' -lk='奥阳康城'上海浦东龚家阁龚家花园绍兴越城辕门新村南区亨纳斯花园杨浦 -""" -ct='上海' -rl='杨浦' -lk='亨纳斯花园' - -#成都双流长滩一号 上海 奉贤 朝阳新村##上海 奉贤 棕榈滩别墅深圳龙岗丽皇阁 -#洛阳涧西奥阳康城 - -#未央 - -weekend = datetime.datetime.strptime("2018-04-01", "%Y-%m-%d") -#for i in range(0, 100): - -sellPrice.out_put_price(ct, rl, lk, weekend) -e = time.time() - -print(e - s) -''' -### -import pandas as pd - -a=pd.read_csv('fangjia.seaweed.csv') - -for i in a.index: - ct=a['city'][i] - rl=a['region'][i] - lk=a['name'][i] - sellPrice.out_put_price(ct, rl, lk, weekend) - -''' -''' - -@fangjia.cache(1000) -def sum1(a, b): - print(111) - return a + b - - -print(sum1(1,2)) -''' +# import datetime +# import fangjia +# #fangjia.send_dingding_msg("测试") +# +# import time +# +# import sell_price.zhuge0118A as sellPrice +# +# s = time.time() +# +# +# #上海 闵行上海康城 +# +# #深圳龙岗葵涌供销社综合商住楼 +# ''' +# ct = '深圳' +# rl = '龙岗' +# lk = '葵涌供销社综合商住楼' +# ct = '杭州' +# rl = '桐庐' +# lk = '金色港湾度假村' +# +# ct = '成都' +# rl = '武侯' +# lk = '中海国际社区林汀别墅' +# +# +# ct = '成都' +# rl = '双流' +# lk = '长滩壹号' +# +# ct = '广州' +# rl = '海珠' +# lk = '会展世界城三期' +# ''' +# #成都- 都江堰- 溪岭雪#上海徐汇 灞桥沁水新城百汇园西 安 未央 兴乐园 弘和美邻馆 雁塔鸿景花园上海 奉贤 万隆花苑# +# """ +# ct='洛阳' +# rl='涧西' +# lk='奥阳康城'上海浦东龚家阁龚家花园绍兴越城辕门新村南区亨纳斯花园杨浦 +# """ +# ct='上海' +# rl='杨浦' +# lk='亨纳斯花园' +# +# #成都双流长滩一号 上海 奉贤 朝阳新村##上海 奉贤 棕榈滩别墅深圳龙岗丽皇阁 +# #洛阳涧西奥阳康城 +# +# #未央 +# +# weekend = datetime.datetime.strptime("2018-04-01", "%Y-%m-%d") +# #for i in range(0, 100): +# +# sellPrice.out_put_price(ct, rl, lk, weekend) +# e = time.time() +# +# print(e - s) +# ''' +# ### +# import pandas as pd +# +# a=pd.read_csv('fangjia.seaweed.csv') +# +# for i in a.index: +# ct=a['city'][i] +# rl=a['region'][i] +# lk=a['name'][i] +# sellPrice.out_put_price(ct, rl, lk, weekend) +# +# ''' +# ''' +# +# @fangjia.cache(1000) +# def sum1(a, b): +# print(111) +# return a + b +# +# +# print(sum1(1,2)) +# ''' +import execjs