From 664ad2bccfc795a65ed10fefad45ca3db206d171 Mon Sep 17 00:00:00 2001 From: Jian Shen Date: Tue, 5 Jul 2022 14:02:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dags/mt/supply/comm.py | 2 +- dags/mt/supply/data_stat.py | 2 +- dags/mt/supply/deal.py | 2 +- dags/mt/supply/facilitys.py | 2 +- dags/mt/supply/rent_avg_price.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dags/mt/supply/comm.py b/dags/mt/supply/comm.py index a53d9af..cdf92b6 100644 --- a/dags/mt/supply/comm.py +++ b/dags/mt/supply/comm.py @@ -16,7 +16,7 @@ if not os.path.exists(path): city_df = pd.read_excel('/opt/airflow/dags/repo/dags/mt/supply/data/美团19城市列表.xlsx') cities = city_df['城市列表'].values.tolist() -output_date = len(sys.argv) > 1 if sys.argv[1] else dateutils.format_date(datetime.datetime.now(), '%Y%m') +output_date = sys.argv[1] if len(sys.argv) > 1 else dateutils.format_date(datetime.datetime.now(), '%Y%m') print("输出日期" + output_date) seaweed_df = pd.DataFrame() diff --git a/dags/mt/supply/data_stat.py b/dags/mt/supply/data_stat.py index 97d1fb1..7f7f76b 100644 --- a/dags/mt/supply/data_stat.py +++ b/dags/mt/supply/data_stat.py @@ -11,7 +11,7 @@ path = "/home/airflow/data/mt" clickhouse_client = ClickHouseClient(database='fangjia_stat') -output_date = len(sys.argv) > 1 if sys.argv[1] else dateutils.format_date(datetime.datetime.now(), '%Y%m') +output_date = sys.argv[1] if len(sys.argv) > 1 else dateutils.format_date(datetime.datetime.now(), '%Y%m') print("输出日期" + output_date) result_df = pd.read_csv(path + '/FJW_COMM_' + output_date + ".csv", sep='@', encoding='utf-8') diff --git a/dags/mt/supply/deal.py b/dags/mt/supply/deal.py index cfe80ce..4a9e133 100644 --- a/dags/mt/supply/deal.py +++ b/dags/mt/supply/deal.py @@ -17,7 +17,7 @@ cities = city_df['城市列表'].values.tolist() path = "/home/airflow/data/mt" -output_date = len(sys.argv) > 1 if sys.argv[1] else dateutils.format_date(datetime.datetime.now(), '%Y%m') +output_date = sys.argv[1] if len(sys.argv) > 1 else dateutils.format_date(datetime.datetime.now(), '%Y%m') month_start = dateutils.format_date(dateutils.add_months(dateutils.parse_date(output_date, '%Y%m'), months=-1), '%Y%m') + '01' curr_month_start = output_date + '01' diff --git a/dags/mt/supply/facilitys.py b/dags/mt/supply/facilitys.py index 8271e83..6ae18d9 100644 --- a/dags/mt/supply/facilitys.py +++ b/dags/mt/supply/facilitys.py @@ -14,7 +14,7 @@ cities = city_df['城市列表'].values.tolist() path = "/home/airflow/data/mt" -output_date = len(sys.argv) > 1 if sys.argv[1] else dateutils.format_date(datetime.datetime.now(), '%Y%m') +output_date = sys.argv[1] if len(sys.argv) > 1 else dateutils.format_date(datetime.datetime.now(), '%Y%m') month_start = dateutils.format_date(dateutils.add_months(dateutils.parse_date(output_date, '%Y%m'), months=-1), '%Y%m') + '01' curr_month_start = output_date + '01' diff --git a/dags/mt/supply/rent_avg_price.py b/dags/mt/supply/rent_avg_price.py index 801cd01..3df75b9 100644 --- a/dags/mt/supply/rent_avg_price.py +++ b/dags/mt/supply/rent_avg_price.py @@ -17,7 +17,7 @@ cities = city_df['城市列表'].values.tolist() path = "/home/airflow/data/mt" -output_date = len(sys.argv) > 1 if sys.argv[1] else dateutils.format_date(datetime.datetime.now(), '%Y%m') +output_date = sys.argv[1] if len(sys.argv) > 1 else dateutils.format_date(datetime.datetime.now(), '%Y%m') seaweed_new_result_df = pd.read_csv(path + '/FJW_COMM_' + output_date + '.csv', sep='@', encoding='utf-8')