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)