diff --git a/dags/mt/supply/comm.py b/dags/mt/supply/comm.py index cb85c12..5bf709c 100644 --- a/dags/mt/supply/comm.py +++ b/dags/mt/supply/comm.py @@ -44,7 +44,11 @@ def format_seaweed(x): x.addr_alias = commutils.format_addr_alias(x.addr_alias, x.address) x.virescence_percent = commutils.format_greening_rate(x.virescence_percent) x.all_area = commutils.format_all_area(x.all_area) + if pd.notna(x.all_area): + x.all_area = int(x.all_area) x.build_area = commutils.format_build_area(x.build_area) + if pd.notna(x.build_area): + x.build_area = int(x.build_area) x.car_site_count = commutils.format_car_site_count(x.car_site_count) x.household_count = commutils.format_households(x.household_count) x.lng = commutils.format_lat_lng(x.lng) @@ -53,6 +57,8 @@ def format_seaweed(x): house_type_area_dic = commutils.format_house_type_area(x.main_type, x.main_type_area) x.main_type = house_type_area_dic['house_type'] x.main_type_area = house_type_area_dic['house_area'] + if pd.notna(x.main_type_area): + x.main_type_area = int(x.main_type_area) x.household_count = commutils.format_households(x.household_count) x.estate_charge = commutils.format_property_fee(x.estate_charge) x.developer = commutils.format_developer(x.developer) diff --git a/dags/mt/supply/data_stat.py b/dags/mt/supply/data_stat.py index 3343d62..39ddec5 100644 --- a/dags/mt/supply/data_stat.py +++ b/dags/mt/supply/data_stat.py @@ -54,10 +54,11 @@ def save2_clickhouse(): result_df['rent_price'].fillna(-99.0, inplace=True) result_df['lng'].fillna(-99.0, inplace=True) result_df['lat'].fillna(-99.0, inplace=True) - result_df['car_site_count'].fillna(-99.0, inplace=True) - result_df['households'].fillna(-99.0, inplace=True) - result_df['all_area'].fillna(-99.0, inplace=True) - result_df['build_area'].fillna(-99.0, inplace=True) + result_df.loc[result_df['car_site_count'] == '', 'car_site_count'] = '-99' + result_df.loc[result_df['households'] == '', 'households'] = '-99' + result_df.loc[result_df['all_area'] == '', 'all_area'] = '-99' + result_df.loc[result_df['build_area'] == '', 'build_area'] = '-99' + result_df.loc[result_df['house_area'] == '', 'house_area'] = '-99' result_df['house_area'].fillna(-99.0, inplace=True) result_df['deal_num'].fillna(-99.0, inplace=True) result_df['school'].fillna(-99.0, inplace=True) @@ -65,7 +66,7 @@ def save2_clickhouse(): result_df['subway'].fillna(-99.0, inplace=True) result_df['bank'].fillna(-99.0, inplace=True) result_df['hospital'].fillna(-99.0, inplace=True) - result_df['property_fee'].fillna(-99.0, inplace=True) + result_df.loc[result_df['property_fee'] == '', 'property_fee'] = '-99' result_df.fillna('', inplace=True) result_df['plot_ratio'] = result_df['plot_ratio'].astype(str) result_df['landscaping_ratio'] = result_df['landscaping_ratio'].astype(str)