From d82c2f1b2bf28a9d9e70798c3454574b3237f1e2 Mon Sep 17 00:00:00 2001 From: "shenjian@fangjia.com" Date: Tue, 16 May 2023 16:20:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=E7=9B=B8=E5=AF=B9=E4=BB=B7?= =?UTF-8?q?=E6=A0=BC=E6=8E=92=E5=90=8D=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dags/business/business/community/consumption.py | 8 ++++---- dags/business/dag_community_summary.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dags/business/business/community/consumption.py b/dags/business/business/community/consumption.py index 06bda6f..cef8772 100644 --- a/dags/business/business/community/consumption.py +++ b/dags/business/business/community/consumption.py @@ -34,7 +34,7 @@ def calc_consumption_potential(city): """ 计算消费潜力 """ - sql = "select id, city, region, name, total_price, estate_charge, estate_charge_fix, relative_price_ranking, relative_price_ranking_fix, avg_cost from community_summary where city='" + city + "'" + sql = "select id, city, region, name, total_price, estate_charge, estate_charge_fix, relative_price_ranking, avg_cost from community_summary where city='" + city + "'" community_summary_df = es206_client.scan_by_sql_to_data_frame(sql) columns = community_summary_df.columns if 'total_price' not in columns or 'estate_charge' not in columns or 'relative_price_ranking' not in columns or 'avg_cost' not in columns: @@ -70,9 +70,9 @@ def calc_consumption_potential(city): np.std) community_summary_df['relative_price_ranking_mean'] = community_summary_df.groupby(by=['city'])[ - 'relative_price_ranking_fix'].transform(np.mean) + 'relative_price_ranking'].transform(np.mean) community_summary_df['relative_price_ranking_std'] = community_summary_df.groupby(by=['city'])[ - 'relative_price_ranking_fix'].transform(np.std) + 'relative_price_ranking'].transform(np.std) community_summary_df['avg_cost_mean'] = community_summary_df.groupby(by=['city'])['avg_cost_fixed'].transform(np.mean) community_summary_df['avg_cost_std'] = community_summary_df.groupby(by=['city'])['avg_cost_fixed'].transform(np.std) @@ -89,7 +89,7 @@ def calc_consumption_potential(city): community_summary_df['estate_charge_score'] = 0 if community_summary_df['relative_price_ranking_std'].unique()[0] != 0: - community_summary_df['relative_price_ranking_score'] = 21.8427926 * (community_summary_df['relative_price_ranking_fix'] - community_summary_df['relative_price_ranking_mean']) / community_summary_df['relative_price_ranking_std'] + community_summary_df['relative_price_ranking_score'] = 21.8427926 * (community_summary_df['relative_price_ranking'] - community_summary_df['relative_price_ranking_mean']) / community_summary_df['relative_price_ranking_std'] else: community_summary_df['relative_price_ranking_score'] = 0 diff --git a/dags/business/dag_community_summary.py b/dags/business/dag_community_summary.py index c147e84..132055b 100644 --- a/dags/business/dag_community_summary.py +++ b/dags/business/dag_community_summary.py @@ -111,4 +111,4 @@ with DAG( bash_command='python /opt/airflow/dags/repo/dags/business/business/community/other.py {{dag_run.conf["city"] if "city" in dag_run.conf}}', ) # 人均消费并行,值为空 - comm >> price >> [avg_cost, total_price, relative_price_ranking, estate_charge_complete] >> total_price_complete >> relative_price_ranking_fix >> consumption >> city_level_and_price_rating >> credit >> [estate_charge_ranking, price_rating, person_rating, percentile] >> sell >> trade >> [traffic, business_district, medical, life, education] >> education2 >> extra >> other + comm >> price >> [avg_cost, total_price, relative_price_ranking, estate_charge_complete] >> total_price_complete >> consumption >> city_level_and_price_rating >> credit >> [estate_charge_ranking, price_rating, person_rating, percentile] >> sell >> trade >> [traffic, business_district, medical, life, education] >> education2 >> extra >> other