diff --git a/PriceSystem/CalcCmdSender.py b/PriceSystem/CalcCmdSender.py index c1e4f16..71dbfcd 100644 --- a/PriceSystem/CalcCmdSender.py +++ b/PriceSystem/CalcCmdSender.py @@ -5,6 +5,7 @@ import config import datetime import sys import time + from datetime import date @@ -41,7 +42,6 @@ def send_cmd(seaweed): logger.info("命令发送成功:" + json_cmd) - def send_district_calc_cmd(): for city in fangjia.get_all_city(): for seaweed in get_district(city): @@ -85,11 +85,33 @@ def district_calc_cmd_finish(): return False +def all_calc_cmd_finish(start_time): + + calc_command = fangjia.get_collection("fangjia_log", "calc_command", config.get_log_mongodb_host(), + config.get_log_mongodb_port()) + query = { + "status": 4, + "c_date": { + "$gt": start_time + } + } + + while calc_command.count(query) != 0: + time.sleep(10) + time_format = "%Y-%m-%d %H:%M:%S" + + msg = "均价计算完成,开始时间:" + start_time.strftime(time_format) \ + + ", 结束时间:" + datetime.datetime.utcnow().strftime(time_format) + fangjia.send_ding_msg(msg) + + if __name__ == "__main__": + start_time = datetime.datetime.utcnow() send_district_calc_cmd() while not district_calc_cmd_finish(): time.sleep(5) logger.info("等待小区均价计算完成") send_city_calc_cmd() logger.info("城市均价计算完成") + all_calc_cmd_finish() sys.exit(0) diff --git a/PriceSystem/fangjia/__init__.py b/PriceSystem/fangjia/__init__.py index 6e40e56..75fa840 100644 --- a/PriceSystem/fangjia/__init__.py +++ b/PriceSystem/fangjia/__init__.py @@ -5,6 +5,8 @@ import config import pytz import datetime import calendar +import requests +import json from fangjia import mongoClients as mongoClients from fangjia import ElasticsearchClient as es @@ -90,6 +92,21 @@ def get_weekend(): return pacific.localize(now) +def send_ding_msg(msg): + headers = { + 'Content-Type': "application/json", + } + url = "https://oapi.dingtalk.com/robot/send" \ + "?access_token=2307d2fec8314b3e8b4b83dd1d42da2e2051638e3e668f21e77ca01258bf682c" + + text_body = { + "msgtype": "text", + "text": { + "content": msg + } + + } + requests.request("POST", url, data=json.dumps(text_body, ensure_ascii=False).encode('utf8'), headers=headers) @timer diff --git a/PriceSystem/test.py b/PriceSystem/test.py index 4231af2..3cb97ed 100644 --- a/PriceSystem/test.py +++ b/PriceSystem/test.py @@ -1,15 +1,18 @@ import datetime -import time +import fangjia +fangjia.send_dingding_msg("测试") -import sell_price.zhuge0118A as sellPrice - -s = time.time() - -ct = '上海' -rl = '杨浦' -lk = '邯郸路60弄小区' -weekend = datetime.datetime.strptime("2018-03-11", "%Y-%m-%d") -for i in range(0, 100): - sellPrice.out_put_price(ct, rl, lk, weekend) -e = time.time() -print(e - s) +# import time +# +# import sell_price.zhuge0118A as sellPrice +# +# s = time.time() +# +# ct = '上海' +# rl = '杨浦' +# lk = '邯郸路60弄小区' +# weekend = datetime.datetime.strptime("2018-03-11", "%Y-%m-%d") +# for i in range(0, 100): +# sellPrice.out_put_price(ct, rl, lk, weekend) +# e = time.time() +# print(e - s)