From 2d9663edf203579aada8ff16c3a1fc14ee7cdd83 Mon Sep 17 00:00:00 2001 From: "shenjian@fangjia.com" Date: Wed, 16 Nov 2022 13:18:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96drop=20index?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dags/business/business/community/business_district.py | 3 +-- dags/business/business/community/education2.py | 3 +-- dags/business/business/community/life.py | 3 +-- .../business/community/relative_price_ranking.py | 3 +-- dags/business/business/community/total_price.py | 3 +-- dags/business/community_summary_dag.py | 10 +++++++--- 6 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dags/business/business/community/business_district.py b/dags/business/business/community/business_district.py index 17be6a1..d174e6b 100644 --- a/dags/business/business/community/business_district.py +++ b/dags/business/business/community/business_district.py @@ -96,8 +96,7 @@ def sync(city=None): seaweed_df = pd.read_csv(path + '/seaweed.csv', sep='@', encoding='UTF-8') if pd.notna(city): seaweed_df = seaweed_df[seaweed_df['city'] == city].copy() - seaweed_df = seaweed_df.reset_index() - seaweed_df = seaweed_df.drop(columns=['index']) + seaweed_df = seaweed_df.reset_index(drop=True) actions = list() with ThreadPoolExecutor(max_workers=30) as pool: diff --git a/dags/business/business/community/education2.py b/dags/business/business/community/education2.py index 9d3787c..3fd27ba 100644 --- a/dags/business/business/community/education2.py +++ b/dags/business/business/community/education2.py @@ -78,8 +78,7 @@ def sync(city=None): seaweed_df = pd.read_csv(path + '/seaweed.csv', sep='@', encoding='UTF-8') if pd.notna(city): seaweed_df = seaweed_df[seaweed_df['city'] == city].copy() - seaweed_df = seaweed_df.reset_index() - seaweed_df = seaweed_df.drop(columns=['index']) + seaweed_df = seaweed_df.reset_index(drop=True) actions = list() with ThreadPoolExecutor(max_workers=30) as pool: diff --git a/dags/business/business/community/life.py b/dags/business/business/community/life.py index 7e4c64a..3c62f6f 100644 --- a/dags/business/business/community/life.py +++ b/dags/business/business/community/life.py @@ -79,8 +79,7 @@ def sync(city=None): seaweed_df = pd.read_csv(path + '/seaweed.csv', sep='@', encoding='UTF-8') if pd.notna(city): seaweed_df = seaweed_df[seaweed_df['city'] == city].copy() - seaweed_df = seaweed_df.reset_index() - seaweed_df = seaweed_df.drop(columns=['index']) + seaweed_df = seaweed_df.reset_index(drop=True) actions = list() with ThreadPoolExecutor(max_workers=30) as pool: diff --git a/dags/business/business/community/relative_price_ranking.py b/dags/business/business/community/relative_price_ranking.py index 7914440..dd408df 100644 --- a/dags/business/business/community/relative_price_ranking.py +++ b/dags/business/business/community/relative_price_ranking.py @@ -60,8 +60,7 @@ def sync(city=None): seaweed_df = pd.read_csv(path + '/seaweed.csv', sep='@', encoding='UTF-8') if pd.notna(city): seaweed_df = seaweed_df[seaweed_df['city'] == city].copy() - seaweed_df = seaweed_df.reset_index() - seaweed_df = seaweed_df.drop(columns=['index']) + seaweed_df = seaweed_df.reset_index(drop=True) def find_around_price_item(index, item): if index % 1000 == 0: diff --git a/dags/business/business/community/total_price.py b/dags/business/business/community/total_price.py index 20d145c..ff8461a 100644 --- a/dags/business/business/community/total_price.py +++ b/dags/business/business/community/total_price.py @@ -61,8 +61,7 @@ def sync(city=None): seaweed_df = pd.read_csv(path + '/seaweed.csv', sep='@', encoding='UTF-8') if pd.notna(city): seaweed_df = seaweed_df[seaweed_df['city'] == city].copy() - seaweed_df = seaweed_df.reset_index() - seaweed_df = seaweed_df.drop(columns=['index']) + seaweed_df = seaweed_df.reset_index(drop=True) # 加载库中均价数据 query_sql = "SELECT city, region, name, avg_price FROM community_summary " diff --git a/dags/business/community_summary_dag.py b/dags/business/community_summary_dag.py index 2670f58..c975f51 100644 --- a/dags/business/community_summary_dag.py +++ b/dags/business/community_summary_dag.py @@ -74,8 +74,12 @@ with DAG( # task_id='extra_dag', # bash_command='python /opt/airflow/dags/repo/dags/business/business/community/extra.py {{dag_run.conf["type"] if "type" in dag_run.conf}}', # ) - t16 = BashOperator( - task_id='other_dag', - bash_command='python /opt/airflow/dags/repo/dags/business/business/community/other.py {{dag_run.conf["type"] if "type" in dag_run.conf}}', + # t16 = BashOperator( + # task_id='other_dag', + # bash_command='python /opt/airflow/dags/repo/dags/business/business/community/other.py {{dag_run.conf["type"] if "type" in dag_run.conf}}', + # ) + t17 = BashOperator( + task_id='business_district_dag', + bash_command='python /opt/airflow/dags/repo/dags/business/business/community/business_district.py {{dag_run.conf["type"] if "type" in dag_run.conf}}', ) # t1 >> t2 >> t3 >> t4 >> t5 >> t6 >> t6_1 >> t7 >> t8 >> t9 >> t10 >> t11 >> t12 >> t13 >> t14 >> t15 >> t16