diff --git a/dags/mt/supply/data_stat.py b/dags/mt/supply/data_stat.py index 2f9e10c..73a91e7 100644 --- a/dags/mt/supply/data_stat.py +++ b/dags/mt/supply/data_stat.py @@ -43,42 +43,6 @@ aim_file_name = path + "/" + output_date + '覆盖率统计.xlsx' df.to_excel(aim_file_name, index=False) -def deal_nan_val(x): - if np.isnan(x['avg_price']): - x['avg_price'] = None - if np.isnan(x['rent_price']): - x['rent_price'] = None - if np.isnan(x['lng']): - x['lng'] = None - if np.isnan(x['lat']): - x['lat'] = None - if np.isnan(x['car_site_count']): - x['car_site_count'] = None - if np.isnan(x['households']): - x['households'] = None - if np.isnan(x['all_area']): - x['all_area'] = None - if np.isnan(x['build_area']): - x['build_area'] = None - if np.isnan(x['house_area']): - x['house_area'] = None - if np.isnan(x['deal_num']): - x['deal_num'] = None - if np.isnan(x['market']): - x['market'] = None - if np.isnan(x['subway']): - x['subway'] = None - if np.isnan(x['bank']): - x['bank'] = None - if np.isnan(x['bank']): - x['bank'] = None - if np.isnan(x['hospital']): - x['hospital'] = None - if np.isnan(x['property_fee']): - x['property_fee'] = None - return x - - def save2_clickhouse(): curr_month_start = output_date + '01' result_df['avg_price'].fillna(-99.0, inplace=True) diff --git a/dags/mt/supply/facilitys.py b/dags/mt/supply/facilitys.py index 219ae8d..fd46153 100644 --- a/dags/mt/supply/facilitys.py +++ b/dags/mt/supply/facilitys.py @@ -59,13 +59,13 @@ district_facilitys_hospital_df = pd.DataFrame(list(district_facilitys_conn.aggre ]).batch_size(10000))) district_facilitys_hospital_df = district_facilitys_hospital_df.drop(columns=['_id']) -district_facilitys_df = pd.merge(district_facilitys_school_df, district_facilitys_supermarket_df, how='left', +district_facilitys_df = pd.merge(district_facilitys_school_df, district_facilitys_supermarket_df, how='outer', on=['city', 'region', 'district_name']) -district_facilitys_df = pd.merge(district_facilitys_df, district_facilitys_subway_df, how='left', +district_facilitys_df = pd.merge(district_facilitys_df, district_facilitys_subway_df, how='outer', on=['city', 'region', 'district_name']) -district_facilitys_df = pd.merge(district_facilitys_df, district_facilitys_bank_df, how='left', +district_facilitys_df = pd.merge(district_facilitys_df, district_facilitys_bank_df, how='outer', on=['city', 'region', 'district_name']) -district_facilitys_df = pd.merge(district_facilitys_df, district_facilitys_hospital_df, how='left', +district_facilitys_df = pd.merge(district_facilitys_df, district_facilitys_hospital_df, how='outer', on=['city', 'region', 'district_name']) district_facilitys_new_df = district_facilitys_df[