From 920731bb4adb475400fab3dac7e415f39fc8e520 Mon Sep 17 00:00:00 2001 From: "shenjian@fangjia.com" Date: Wed, 6 Jul 2022 14:00:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=89=B9=E6=AE=8A=E5=9F=8E?= =?UTF-8?q?=E5=B8=82=E6=97=A0=E7=A7=9F=E9=87=91=E6=97=A0=E5=9D=87=E4=BB=B7?= =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/特殊城市既无租金又无价格小区过滤.xlsx | Bin 0 -> 8974 bytes dags/mt/supply/rent_avg_price.py | 11 +++++++++++ 2 files changed, 11 insertions(+) create mode 100644 dags/mt/supply/data/特殊城市既无租金又无价格小区过滤.xlsx diff --git a/dags/mt/supply/data/特殊城市既无租金又无价格小区过滤.xlsx b/dags/mt/supply/data/特殊城市既无租金又无价格小区过滤.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..7f49d63cf9074c448a94dd207dd9b0aa9a9ce698 GIT binary patch literal 8974 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 Yiv?DeNBp%}aqs>=fqW--NO`aKKWj~PUjP6A literal 0 HcmV?d00001 diff --git a/dags/mt/supply/rent_avg_price.py b/dags/mt/supply/rent_avg_price.py index 9ffb2e2..f70376c 100644 --- a/dags/mt/supply/rent_avg_price.py +++ b/dags/mt/supply/rent_avg_price.py @@ -7,6 +7,7 @@ import pandas as pd import datetime import logging import sys +import numpy district_stat_conn = MAIN_MONGO_CLIENT.get_collection('fangjia_stat', 'district_stat') sqmetre_rent_conn = MAIN_MONGO_CLIENT.get_collection('fangjia', 'sqmetre_rent') @@ -76,6 +77,9 @@ rent_df = rent_df[['city', 'region', 'name', 'rent_price']] result_df = pd.merge(seaweed_new_result_df, avg_df, how='left', on=['city', 'region', 'name']) result_df = pd.merge(result_df, rent_df, how='left', on=['city', 'region', 'name']) +none_rent_and_price_df = pd.read_excel('/opt/airflow/dags/repo/dags/mt/supply/data/特殊城市既无租金又无价格小区过滤.xlsx') +none_rent_and_price_cities = none_rent_and_price_df['city'].values.tolist() + def format_rent(x): """ @@ -84,8 +88,15 @@ def format_rent(x): :return: """ x.rent_price = commutils.format_rent_price(x.avg_price, x.rent_price, 1500) + # 过滤租金与均价无的小区 + if len(none_rent_and_price_cities) > 0: + if x['city'] in none_rent_and_price_cities and (np.isnan(x['rent_price']) and np.isnan(x['avg_price'])): + x['ignore_comm'] = 1 return x +result_df['ignore_comm'] = None result_df = result_df.apply(lambda x: format_rent(x), axis=1) +result_df = result_df[result_df['ignore'] != 1] + result_df.to_csv(path + '/FJW_COMM_' + output_date + '.csv', sep='@', encoding='utf-8', index=False)