From 7f8f48535cbade830c27e03bb0cf5bb1672d3c62 Mon Sep 17 00:00:00 2001 From: "wangwenyan@fangjia.com" Date: Mon, 9 Apr 2018 11:42:46 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PriceSystem/CalcCmdSender.py | 12 ++++++------ PriceSystem/fangjia/__init__.py | 7 ++++++- PriceSystem/test.py | 4 ++-- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/PriceSystem/CalcCmdSender.py b/PriceSystem/CalcCmdSender.py index 671bfa6..abb7743 100644 --- a/PriceSystem/CalcCmdSender.py +++ b/PriceSystem/CalcCmdSender.py @@ -106,12 +106,12 @@ def all_calc_cmd_finish(start_time): if __name__ == "__main__": - start_time = datetime.datetime.utcnow() - send_district_calc_cmd() - while not district_calc_cmd_finish(): - time.sleep(5) - logger.info("等待小区均价计算完成") + # 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(start_time) + # all_calc_cmd_finish(start_time) sys.exit(0) diff --git a/PriceSystem/fangjia/__init__.py b/PriceSystem/fangjia/__init__.py index f86549f..8b3cb70 100644 --- a/PriceSystem/fangjia/__init__.py +++ b/PriceSystem/fangjia/__init__.py @@ -48,6 +48,7 @@ def get_performance_logger(name): break now = now + datetime.timedelta(days=1) + performance_logger = get_performance_logger("performance") @@ -61,7 +62,10 @@ def timer(func): arg_list = list() for arg in args: arg_list.append(str(arg)) - performance_logger.info("函数名:%-20s\t耗时:%7.4f\t\t参数:(%s)" % (func.__name__, end - begin, arg_list)) + if elapsed > config.get_timeout() * 10: + performance_logger.info("函数名:%-20s\t耗时:%7.4f\t\t参数:(%s)" % (func.__name__, end - begin, arg_list)) + else: + performance_logger.error("函数名:%-20s\t耗时:%7.4f\t\t参数:(%s)" % (func.__name__, end - begin, arg_list)) return rs return _timer @@ -126,6 +130,7 @@ def get_weekend(): if calendar.weekday(now.year, now.month, now.day) == 6: break now = now + datetime.timedelta(days=1) + now = now - datetime.timedelta(days=7) pacific = pytz.timezone('Asia/Shanghai') return pacific.localize(now) diff --git a/PriceSystem/test.py b/PriceSystem/test.py index 117cba0..2cdbb71 100644 --- a/PriceSystem/test.py +++ b/PriceSystem/test.py @@ -8,7 +8,7 @@ import sell_price.zhuge0118A as sellPrice s = time.time() - + #上海 闵行上海康城 #深圳龙岗葵涌供销社综合商住楼 @@ -42,7 +42,7 @@ lk='奥阳康城'上海浦东龚家阁龚家花园绍兴越城辕门新村 """ ct='上海' rl='长宁' -lk='绿地海怡公寓' +lk='湖南省工商局宿舍' #成都双流长滩一号 上海 奉贤 朝阳新村##上海 奉贤 棕榈滩别墅深圳龙岗丽皇阁 #洛阳涧西奥阳康城 From 883dac4c83ccc8bd46f401174a289702a9ee3ddd Mon Sep 17 00:00:00 2001 From: "wangwenyan@fangjia.com" Date: Mon, 9 Apr 2018 11:45:44 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PriceSystem/fangjia/__init__.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/PriceSystem/fangjia/__init__.py b/PriceSystem/fangjia/__init__.py index 45c8a69..feddcc9 100644 --- a/PriceSystem/fangjia/__init__.py +++ b/PriceSystem/fangjia/__init__.py @@ -157,15 +157,9 @@ def findHouse(query, fields=None): seawater105 = get_collection("fangjia", "seawater", config.get_seawater_host(), 27777) for err_count in range(0, 10): try: -<<<<<<< HEAD lt = 100 # seawater.find(query,{"p_date":-1}).sort([("p_date",-1)]) pos = list(seawater105.find(query, fields).sort([("p_date",-1)]).limit(lt)) - #pos = list(seawater105.find(query, fields).limit(lt)) -======= - lt = 1000 - pos = list(seawater105.find(query, fields).limit(lt)) ->>>>>>> 9b39a072aff955aeed773a2c859e1d355ec52231 data = pandas.DataFrame(pos) del pos # print("==================>", time.time() - s) From c0dde47402e9392ec56415ffdae980b7352cb4e4 Mon Sep 17 00:00:00 2001 From: "wangwenyan@fangjia.com" Date: Mon, 9 Apr 2018 13:46:31 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PriceSystem/.~lock.ppd4.xls# | 1 - PriceSystem/fangjia/__init__.py | 6 +++++- logs/myeasylog.log | 0 3 files changed, 5 insertions(+), 2 deletions(-) delete mode 100644 PriceSystem/.~lock.ppd4.xls# delete mode 100644 logs/myeasylog.log diff --git a/PriceSystem/.~lock.ppd4.xls# b/PriceSystem/.~lock.ppd4.xls# deleted file mode 100644 index e8a31cf..0000000 --- a/PriceSystem/.~lock.ppd4.xls# +++ /dev/null @@ -1 +0,0 @@ -,luogan,luogan-Precision-Tower-3620,09.04.2018 09:15,file:///home/luogan/.config/libreoffice/4; \ No newline at end of file diff --git a/PriceSystem/fangjia/__init__.py b/PriceSystem/fangjia/__init__.py index feddcc9..6893b60 100644 --- a/PriceSystem/fangjia/__init__.py +++ b/PriceSystem/fangjia/__init__.py @@ -125,12 +125,16 @@ def get_region(city): def get_weekend(): + """ + 返回本周周末 + :return: + """ now = datetime.datetime.now().replace(hour=0, minute=0, second=0, microsecond=0) for day in range(1, 9): if calendar.weekday(now.year, now.month, now.day) == 6: break now = now + datetime.timedelta(days=1) - now = now - datetime.timedelta(days=7) + now = now - datetime.timedelta(days=14) pacific = pytz.timezone('Asia/Shanghai') return pacific.localize(now) diff --git a/logs/myeasylog.log b/logs/myeasylog.log deleted file mode 100644 index e69de29..0000000 From d253c17cae80aab0340965a2bd161f1aea95d180 Mon Sep 17 00:00:00 2001 From: "wangwenyan@fangjia.com" Date: Mon, 9 Apr 2018 15:04:11 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E5=9D=87=E4=BB=B7?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E5=91=BD=E4=BB=A4=E5=8F=91=E9=80=81=E8=84=9A?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PriceSystem/CalcCmdSender.py | 12 ++++++------ PriceSystem/fangjia/__init__.py | 1 - 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/PriceSystem/CalcCmdSender.py b/PriceSystem/CalcCmdSender.py index abb7743..671bfa6 100644 --- a/PriceSystem/CalcCmdSender.py +++ b/PriceSystem/CalcCmdSender.py @@ -106,12 +106,12 @@ def all_calc_cmd_finish(start_time): if __name__ == "__main__": - # start_time = datetime.datetime.utcnow() - # send_district_calc_cmd() - # while not district_calc_cmd_finish(): - # time.sleep(5) - # logger.info("等待小区均价计算完成") + 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(start_time) + all_calc_cmd_finish(start_time) sys.exit(0) diff --git a/PriceSystem/fangjia/__init__.py b/PriceSystem/fangjia/__init__.py index 6893b60..7f38106 100644 --- a/PriceSystem/fangjia/__init__.py +++ b/PriceSystem/fangjia/__init__.py @@ -134,7 +134,6 @@ def get_weekend(): if calendar.weekday(now.year, now.month, now.day) == 6: break now = now + datetime.timedelta(days=1) - now = now - datetime.timedelta(days=14) pacific = pytz.timezone('Asia/Shanghai') return pacific.localize(now)