From f7c1318b087aac32c418cef058eea02ebfbfb05c Mon Sep 17 00:00:00 2001 From: Jian Shen Date: Fri, 12 Aug 2022 16:13:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BC=B0=E5=80=BC=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dags/stat/district_sell_deal_dag.py | 2 +- dags/stat/evaluate/data/估值92城市数据统计.xlsx | Bin 0 -> 6054 bytes .../evaluate/district_count_thirdavg_deal.py | 10 +++++++++- dags/stat/evaluate/district_sell_property.py | 4 ++-- 4 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 dags/stat/evaluate/data/估值92城市数据统计.xlsx diff --git a/dags/stat/district_sell_deal_dag.py b/dags/stat/district_sell_deal_dag.py index 3b5196f..570b5f3 100644 --- a/dags/stat/district_sell_deal_dag.py +++ b/dags/stat/district_sell_deal_dag.py @@ -11,7 +11,7 @@ with DAG( ) as dag: t1 = BashOperator( task_id='district_count_thirdavg_deal', - bash_command='python /opt/airflow/dags/repo/dags/stat/evaluate/district_count_thirdavg_deal.py', + bash_command='python /opt/airflow/dags/repo/dags/stat/evaluate/district_count_thirdavg_deal.py {{dag_run.conf["city_num"] if "city_num" in dag_run.conf}}', ) t2 = BashOperator( task_id='district_sell_property', diff --git a/dags/stat/evaluate/data/估值92城市数据统计.xlsx b/dags/stat/evaluate/data/估值92城市数据统计.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..962481aae18d7344eced245631cd6db911808227 GIT binary patch literal 6054 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 1 else None +print("输出参数" + city_num) + +df = pd.DataFrame() +if city_num == 92: + df = pd.read_excel('/opt/airflow/dags/repo/dags/stat/evaluate/data/估值92城市数据统计.xlsx') +else: + df = pd.read_excel('/opt/airflow/dags/repo/dags/stat/evaluate/data/估值数据统计.xlsx') year_month_day = dateutils.format_date(datetime.datetime.now()) path = "/home/airflow/data/evaluate" aim_file_name = path + '/估值数据统计结果' + year_month_day + '.xlsx' diff --git a/dags/stat/evaluate/district_sell_property.py b/dags/stat/evaluate/district_sell_property.py index 62cb01c..492408c 100644 --- a/dags/stat/evaluate/district_sell_property.py +++ b/dags/stat/evaluate/district_sell_property.py @@ -42,7 +42,7 @@ def sell_stat(): '_id'].transform('size') sell_seaweed_merge_df = sell_seaweed_merge_df[['city', 'region', '_id', 'count']] sell_seaweed_merge_df = sell_seaweed_merge_df.drop_duplicates(subset=['city', 'region', '_id']) - sell_seaweed_ok_df = sell_seaweed_merge_df[sell_seaweed_merge_df['count'] > 3] + sell_seaweed_ok_df = sell_seaweed_merge_df[sell_seaweed_merge_df['count'] >= 3] sell_seaweed_ok_df['city_seaweed_count'] = sell_seaweed_ok_df.groupby('city')['city'].transform('size') city_seaweed_count_df = sell_seaweed_ok_df[['city', 'city_seaweed_count']].drop_duplicates( subset=['city', 'city_seaweed_count']) @@ -77,7 +77,7 @@ def sell_stat(): try: sql = "select count(*) from latest_seawater where city='" + city + "' and region='" + region + "' and cat='sell' and district_name in(" + names_str + ") and p_date > " + one_year_time num = es206_client.search_by_sql(sql)['hits']['total']['value'] - if num > 3: + if num >= 3: count += 1 total_num += num all_num += num