From 7ea6ac2fe1b5e09cae6a3095bb0a163f5982188d Mon Sep 17 00:00:00 2001 From: Jian Shen Date: Wed, 29 Jun 2022 10:59:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dags/mt/supply/comm.py | 6 +++--- dags/mt/supply/rent_avg_price.py | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dags/mt/supply/comm.py b/dags/mt/supply/comm.py index 1530e54..e12ff51 100644 --- a/dags/mt/supply/comm.py +++ b/dags/mt/supply/comm.py @@ -42,14 +42,14 @@ def format_seaweed(x): x.alias = ','.join(x.alias) if x.addr_alias is not None and str(x.addr_alias) != 'nan': x.addr_alias = ','.join(x.addr_alias) - x.landscaping_ratio = commutils.format_greening_rate(x.landscaping_ratio) + x.virescence_percent = commutils.format_greening_rate(x.virescence_percent) x.all_area = commutils.format_all_area(x.all_area) x.build_area = commutils.format_build_area(x.build_area) x.car_site_count = commutils.format_car_site_count(x.car_site_count) - x.households = commutils.format_household_count(x.households) + x.household_count = commutils.format_household_count(x.household_count) x.lng = commutils.format_lat_lng(x.lng) x.lat = commutils.format_lat_lng(x.lat) - x.plot_ratio = commutils.format_plot_ratio(x.plot_ratio) + x.cubage_percent = commutils.format_plot_ratio(x.cubage_percent) if type(x.alias) == str and '@' in x.alias: x.alias = None diff --git a/dags/mt/supply/rent_avg_price.py b/dags/mt/supply/rent_avg_price.py index ba2c675..147e956 100644 --- a/dags/mt/supply/rent_avg_price.py +++ b/dags/mt/supply/rent_avg_price.py @@ -11,7 +11,7 @@ district_stat_conn = MAIN_MONGO_CLIENT.get_collection('fangjia_stat', 'district_ sqmetre_rent_conn = MAIN_MONGO_CLIENT.get_collection('fangjia', 'sqmetre_rent') -city_df = pd.read_excel('/opt/airflow/dags/repo/dags/mt/supply/data/美团19城市列表.xlsx') +city_df = pd.read_excel('data/美团19城市列表.xlsx') cities = city_df['城市列表'].values.tolist() path = "/home/airflow/data/mt" @@ -30,7 +30,7 @@ logging.info("日期信息:" + month_start + ' ' + curr_month_start) month_start_date = dateutils.parse_date(month_start, '%Y%m%d') curr_month_start_date = dateutils.parse_date(curr_month_start, '%Y%m%d') -threshold_df = pd.read_excel('/opt/airflow/dags/repo/dags/mt/supply/data/租金和房价设置阀值(19个城市).xlsx') +threshold_df = pd.read_excel('data/租金和房价设置阀值(19个城市).xlsx') min_rent = dict() max_rent = dict() min_price = dict() @@ -41,6 +41,7 @@ for index, item in threshold_df.iterrows(): if item['租金最大值'] != '缺租金': max_rent[item['城市']] = item['租金最大值'] min_price[item['城市']] = item['均价最小值'] + max_price[item['城市']] = item['均价最大值'] avg_df = pd.DataFrame() for city in cities: