diff --git a/dags/mt/supply/data_stat.py b/dags/mt/supply/data_stat.py index 2aa2a1f..9a19e6b 100644 --- a/dags/mt/supply/data_stat.py +++ b/dags/mt/supply/data_stat.py @@ -77,44 +77,44 @@ def deal_nan_val(x): def save2_clickhouse(): curr_month_start = output_date + '01' - # result_df['avg_price'].fillna(-99.0, inplace=True) - # 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['house_area'].fillna(-99.0, inplace=True) - # result_df['deal_num'].fillna(-99.0, inplace=True) - # result_df['school'].fillna(-99.0, inplace=True) - # result_df['market'].fillna(-99.0, inplace=True) - # 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.fillna('null', inplace=True) + result_df['avg_price'].fillna(-99.0, inplace=True) + 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['house_area'].fillna(-99.0, inplace=True) + result_df['deal_num'].fillna(-99.0, inplace=True) + result_df['school'].fillna(-99.0, inplace=True) + result_df['market'].fillna(-99.0, inplace=True) + 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.fillna('', inplace=True) result_df['plot_ratio'] = result_df['plot_ratio'].astype(str) result_df['landscaping_ratio'] = result_df['landscaping_ratio'].astype(str) result_df['property_life'] = result_df['property_life'].astype(str) result_df['finish_building_date'] = result_df['finish_building_date'].astype(str) result_df['house_type'] = result_df['house_type'].astype(str) - result_df['avg_price'] = result_df['avg_price'].astype(int, errors='ignore') - result_df['rent_price'] = result_df['rent_price'].astype(int, errors='ignore') - result_df['lng'] = result_df['lng'].astype(float, errors='ignore') - result_df['lat'] = result_df['lat'].astype(float, errors='ignore') - result_df['car_site_count'] = result_df['car_site_count'].astype(int, errors='ignore') - result_df['households'] = result_df['households'].astype(int, errors='ignore') - result_df['all_area'] = result_df['all_area'].astype(int, errors='ignore') - result_df['build_area'] = result_df['build_area'].astype(int, errors='ignore') - result_df['house_area'] = result_df['house_area'].astype(int, errors='ignore') - result_df['deal_num'] = result_df['deal_num'].astype(int, errors='ignore') - result_df['school'] = result_df['school'].astype(int, errors='ignore') - result_df['market'] = result_df['market'].astype(int, errors='ignore') - result_df['subway'] = result_df['subway'].astype(int, errors='ignore') - result_df['bank'] = result_df['bank'].astype(int, errors='ignore') - result_df['hospital'] = result_df['hospital'].astype(int, errors='ignore') - result_df['property_fee'] = result_df['property_fee'].astype(float, errors='ignore') + result_df['avg_price'] = result_df['avg_price'].astype(int) + result_df['rent_price'] = result_df['rent_price'].astype(int) + result_df['lng'] = result_df['lng'].astype(float) + result_df['lat'] = result_df['lat'].astype(float) + result_df['car_site_count'] = result_df['car_site_count'].astype(int) + result_df['households'] = result_df['households'].astype(int) + result_df['all_area'] = result_df['all_area'].astype(int) + result_df['build_area'] = result_df['build_area'].astype(int) + result_df['house_area'] = result_df['house_area'].astype(int) + result_df['deal_num'] = result_df['deal_num'].astype(int) + result_df['school'] = result_df['school'].astype(int) + result_df['market'] = result_df['market'].astype(int) + result_df['subway'] = result_df['subway'].astype(int) + result_df['bank'] = result_df['bank'].astype(int) + result_df['hospital'] = result_df['hospital'].astype(int) + result_df['property_fee'] = result_df['property_fee'].astype(float) for city in cities: temp_df = result_df[result_df['city'] == city] @@ -122,7 +122,7 @@ def save2_clickhouse(): # 删除旧数据 clickhouse_client.execute( "ALTER TABLE fangjia_stat.mt_community_stat DELETE WHERE city='" + city + "' and year_month = toDate('" + curr_month_start + "')") - clickhouse_client.to_sql(data=temp_df.head(1), table='mt_community_stat', engine='MergeTree', if_exists=False, order_by={'year_month'}) + clickhouse_client.to_sql(data=temp_df, table='mt_community_stat', engine='MergeTree', if_exists=False, order_by={'year_month'}) def up_to_nextcloud(): diff --git a/dags/stat/community/community_count_price_rent.py b/dags/stat/community/community_count_price_rent.py index 3dc3fbe..1f3561f 100644 --- a/dags/stat/community/community_count_price_rent.py +++ b/dags/stat/community/community_count_price_rent.py @@ -1,3 +1,7 @@ +""" +小区数量 租金 均价 及 覆盖率统计 +""" + from goojia_utils import MAIN_MONGO_CLIENT, dateutils, ClickHouseClient import pandas as pd