From d5c3c8af94e1ec3449c86427fe4e4689a7de8ddb Mon Sep 17 00:00:00 2001 From: Jian Shen Date: Mon, 22 Aug 2022 14:57:58 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=80=E5=8C=96=E8=AF=84=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dags/business/business/consumption_rate.py | 13 ---------- dags/business/business/price_rate.py | 13 ---------- dags/business/business/rate.py | 25 +++++++++++++++++++ dags/business/consumption_rate_dag.py | 16 ------------ .../{price_rate_dag.py => rate_dag.py} | 7 +++--- 5 files changed, 29 insertions(+), 45 deletions(-) delete mode 100644 dags/business/business/consumption_rate.py delete mode 100644 dags/business/business/price_rate.py create mode 100644 dags/business/business/rate.py delete mode 100644 dags/business/consumption_rate_dag.py rename dags/business/{price_rate_dag.py => rate_dag.py} (61%) diff --git a/dags/business/business/consumption_rate.py b/dags/business/business/consumption_rate.py deleted file mode 100644 index 776c566..0000000 --- a/dags/business/business/consumption_rate.py +++ /dev/null @@ -1,13 +0,0 @@ -""" -消费评级定时运行 -""" -import requests -import logging - -log = logging.getLogger(__name__) - -log.info("定时消费评级开始。。。。。") -headers = {'Content-Type': 'application/json'} -url = "http://192.168.0.19:31080/FangJiaNlpService/consumption_rate" -if requests.get(url=url, headers=headers).text == 'success': - log.info("定时消费评级调用完毕。。。。。") \ No newline at end of file diff --git a/dags/business/business/price_rate.py b/dags/business/business/price_rate.py deleted file mode 100644 index fdf0ada..0000000 --- a/dags/business/business/price_rate.py +++ /dev/null @@ -1,13 +0,0 @@ -""" -消费评级定时运行 -""" -import requests -import logging - -log = logging.getLogger(__name__) - -log.info("定时楼盘评级开始。。。。。") -headers = {'Content-Type': 'application/json'} -url = "http://192.168.0.19:31080/FangJiaNlpService/price_rate" -if requests.get(url=url, headers=headers).text == 'success': - log.info("定时楼盘评级调用完毕。。。。。") \ No newline at end of file diff --git a/dags/business/business/rate.py b/dags/business/business/rate.py new file mode 100644 index 0000000..566880a --- /dev/null +++ b/dags/business/business/rate.py @@ -0,0 +1,25 @@ +""" +消费或价格评级定时运行 +""" +import requests +import logging +import sys + +log = logging.getLogger(__name__) + +type = sys.argv[1] if len(sys.argv) > 1 else '' +print("输出评级类型" + type) + +if type == 'price': + log.info("定时楼盘评级开始。。。。。") + headers = {'Content-Type': 'application/json'} + url = "http://192.168.0.19:31080/FangJiaNlpService/price_rate" + if requests.get(url=url, headers=headers).text == 'success': + log.info("定时楼盘评级调用完毕。。。。。") + +else: + log.info("定时消费评级开始。。。。。") + headers = {'Content-Type': 'application/json'} + url = "http://192.168.0.19:31080/FangJiaNlpService/consumption_rate" + if requests.get(url=url, headers=headers).text == 'success': + log.info("定时消费评级调用完毕。。。。。") \ No newline at end of file diff --git a/dags/business/consumption_rate_dag.py b/dags/business/consumption_rate_dag.py deleted file mode 100644 index 7da0dec..0000000 --- a/dags/business/consumption_rate_dag.py +++ /dev/null @@ -1,16 +0,0 @@ -from airflow.operators.bash import BashOperator -import pendulum -from airflow import DAG - -with DAG( - "consumption_rate_dag", - # 每月2日2点整分运行 - schedule_interval="0 2 2 * *", - start_date=pendulum.datetime(2022, 7, 20, tz="Asia/Shanghai"), - catchup=True, -) as dag: - t1 = BashOperator( - task_id='consumption_rate', - bash_command='python /opt/airflow/dags/repo/dags/business/business/consumption_rate.py', - ) - t1 \ No newline at end of file diff --git a/dags/business/price_rate_dag.py b/dags/business/rate_dag.py similarity index 61% rename from dags/business/price_rate_dag.py rename to dags/business/rate_dag.py index 251988a..c918582 100644 --- a/dags/business/price_rate_dag.py +++ b/dags/business/rate_dag.py @@ -3,14 +3,15 @@ import pendulum from airflow import DAG with DAG( - "price_rate_dag", + "rate_dag", # 每月2日6点整分运行 schedule_interval="0 6 2 * *", start_date=pendulum.datetime(2022, 7, 20, tz="Asia/Shanghai"), catchup=True, + description="地数价格与消费评级 指定type: price或consumption, 不指定则只对消费评级" ) as dag: t1 = BashOperator( - task_id='price_rate', - bash_command='python /opt/airflow/dags/repo/dags/business/business/price_rate.py', + task_id='rate_dag', + bash_command='python /opt/airflow/dags/repo/dags/business/business/rate.py {{dag_run.conf["type"] if "type" in dag_run.conf}}', ) t1 \ No newline at end of file