From fb31cd9609450bd903259b6fa10d5f22abd84978 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E8=89=B3?= Date: Thu, 19 Jan 2023 16:47:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BC=B0=E5=80=BC=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dags/jh/para/估值模型测试城市模板.xlsx | Bin 0 -> 10917 bytes dags/jh/price/price_evaluation.py | 121 +++++++++++++++++++++++++ dags/jh/price_exception_dag.py | 7 +- 3 files changed, 127 insertions(+), 1 deletion(-) create mode 100644 dags/jh/para/估值模型测试城市模板.xlsx create mode 100644 dags/jh/price/price_evaluation.py diff --git a/dags/jh/para/估值模型测试城市模板.xlsx b/dags/jh/para/估值模型测试城市模板.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..9318a3c5953cf9482cee244464934d808e09e9fc GIT binary patch literal 10917 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 literal 0 HcmV?d00001 diff --git a/dags/jh/price/price_evaluation.py b/dags/jh/price/price_evaluation.py new file mode 100644 index 0000000..3b779b5 --- /dev/null +++ b/dags/jh/price/price_evaluation.py @@ -0,0 +1,121 @@ +import os, sys +import logging +import pandas as pd +import requests +from datetime import datetime +from goojia_utils import dateutils, oracle + +os.environ["NLS_LANG"] = "American_America.AL32UTF8" +os.environ["ORACLE_HOME"] = "/home/airflow/instantclient_21_7" + + +important_cities =["北京","上海","广州","深圳","重庆","杭州","苏州","厦门","大连","呼和浩特"] +city_order = pd.read_excel("para/估值模型测试城市模板.xlsx") + + +def convert_calc_type(cale_type): + if cale_type == 1: + return "指导价" + elif cale_type == 2: + return "样本" + elif cale_type == 3: + return "神经网络" + + +fitment_code_map = {"0601": "毛坯", "0602": "简装", "0603": "精装"} + + +def convert_fitment_code(fitment_code): + if pd.isna(fitment_code): + return None + fitment_code = str(fitment_code) + if fitment_code in fitment_code_map: + return fitment_code_map[fitment_code] + return None + + +house_aspect_code_map = {"0301": "南北", "0302": "东南", "0303": "南", "0304": "东西", "0305": "东", "0306": "西南", "0307": "西", + "0308": "北", "0309": "东北", + "0310": "西北"} + + +def convert_house_aspect_code(house_aspect_code): + if pd.isna(house_aspect_code): + return None + house_aspect_code = str(house_aspect_code) + if house_aspect_code in house_aspect_code_map: + return house_aspect_code_map[house_aspect_code] + return None + +log = logging.getLogger(__name__) +path = "/home/airflow/data/jh/price" +if not os.path.exists(path): + os.makedirs(path) +year_month = int(sys.argv[1]) if len(sys.argv) > 1 else int(dateutils.format_date(datetime.utcnow(), "%Y%m")) +log.info(f"测试月份:{year_month}") +avm_evaluation = oracle.scan_by_sql_to_data_frame(f"SELECT * FROM avm_evaluation_gj where year_month={year_month}") +avm_evaluation_item = oracle.scan_by_sql_to_data_frame(f"SELECT * FROM avm_evaluation_item_gj where year_month={year_month}") +community_base_price = oracle.scan_by_sql_to_data_frame(f"SELECT commid,cityname,distname,commname, avg_price as comm_avg_price,confidence,calc_type from community_base_price_gj where year_month={year_month}") +communities = oracle.scan_by_sql_to_data_frame(f"select COMMID from bigdata_community_gj") +community_base_price = community_base_price[community_base_price.commid.isin(communities["commid"])] +avm_evaluation_item["fitment"] = avm_evaluation_item["fitment"].map(convert_fitment_code) +avm_evaluation_item["houseaspect"] = avm_evaluation_item["houseaspect"].map(convert_house_aspect_code) +avm_evaluation_item["calc_type"] = avm_evaluation_item["calc_type"].map(convert_calc_type) +community_base_price["calc_type"] = community_base_price["calc_type"].map(convert_calc_type) +avm_evaluation_item["dealdate"] = avm_evaluation_item["dealdate"].apply(lambda x : x.strftime("%Y-%m-%d") if pd.notna(x) else None) +avm_evaluation_item_third = avm_evaluation_item[avm_evaluation_item.data_type=='第三方'] +avm_evaluation_item_deal = avm_evaluation_item[avm_evaluation_item.data_type=='成交'] +import_avm_evaluation_item_third = avm_evaluation_item_third[avm_evaluation_item_third.cityname.isin(important_cities)] +import_avm_evaluation_item_deal = avm_evaluation_item_deal[avm_evaluation_item_deal.cityname.isin(important_cities)] +import_avm_evaluation_item_deal.loc[:, "deal_total_price"] = import_avm_evaluation_item_deal["buildarea"] * import_avm_evaluation_item_deal["target_avg_price"] +import_avm_evaluation_item_deal.loc[:, "deal_total_price"] = import_avm_evaluation_item_deal["deal_total_price"].apply(lambda x : int(x)) +import_avm_evaluation_item_deal.loc[:, "total_price"] = import_avm_evaluation_item_deal["buildarea"] * import_avm_evaluation_item_deal["calc_avg_price"] +import_avm_evaluation_item_deal.loc[:, "total_price"] = import_avm_evaluation_item_deal["total_price"].apply(lambda x : int(x)) +import_community_base_price = community_base_price[community_base_price.cityname.isin(important_cities)] +normal_community_base_price = community_base_price[~(community_base_price.cityname.isin(important_cities))] +import_avm_evaluation = avm_evaluation[avm_evaluation.cityname.isin(important_cities)] +avm_evaluation = avm_evaluation.merge(city_order, on="cityname", how="left") +import_community_base_price = import_community_base_price.merge(city_order, on="cityname", how="left") +normal_community_base_price = normal_community_base_price.merge(city_order, on="cityname", how="left") +import_avm_evaluation_item_deal = import_avm_evaluation_item_deal.merge(city_order, on="cityname", how="left") +import_avm_evaluation_item_third = import_avm_evaluation_item_third.merge(city_order, on="cityname", how="left") +avm_evaluation.sort_values(by="cityrank", inplace=True) +import_community_base_price.sort_values(by="cityrank", inplace=True) +normal_community_base_price.sort_values(by="cityrank", inplace=True) +import_avm_evaluation_item_deal.sort_values(by="cityrank", inplace=True) +import_avm_evaluation_item_third.sort_values(by="cityrank", inplace=True) + +file_name = f"估值模型测试{year_month}_{dateutils.format_date(datetime.utcnow(), 'HHMMSS')}.xlsx" +aim_file_name = path + '/' + file_name +with pd.ExcelWriter(file_name) as writer: + avm_evaluation.to_excel(writer, sheet_name="92个城市估值概况", columns=["cityname","community_num","price_coverage","sample_calc_coverage","ann_calc_coverage","artificial_calc_coverage","deal_test_case_num","deal_ppe15_coverage","deal_test_comm_num","deal_test_comm_coverage","deal_rate_median","deal_coefficient","third_test_comm_num","third_test_comm_coverage","third_ppe15_coverage","third_rate_median","third_coefficient"], header=["城市名称","小区量","可输出均价小区占比","样本计算占比","神经网络计算占比","人工指导价占比","成交测试案例总量","成交测试PPE15占比","成交测试小区量","成交测试小区量占比","成交比率中位数","成交比率离散系数","第三方均价测试小区量","第三方均价测试小区量占比","第三方均价测试PPE15占比","第三方比率中位数","第三方比率离散系数"], index=False) + import_community_base_price.to_excel(writer, sheet_name="测试10个城市估值数据", columns=["cityname","distname","commname","comm_avg_price","confidence","calc_type"], header=["城市","区域","小区名","估值小区均价","置信度","估值方式"],index=False) + import_avm_evaluation_item_deal.to_excel(writer, sheet_name="10个城市成交测试案例", columns=['cityname','distname', 'commname', 'unit_price', 'confidence', 'calc_type','total_price', 'deal_total_price', 'target_avg_price','pe',"dealdate","fitment","houseaspect","floornum","floorcnt","buildarea"], header=["城市","区域","小区名","修正均价","置信度","估值方式","小区估价","对标成交价","对标均价","PPE","dealdate","fitment","houseaspect","floornum","floorcnt","buildarea"], index=False) + import_avm_evaluation_item_third.to_excel(writer, sheet_name="10个城市第三方均价测试", columns=["cityname","distname","commname","avg_price","confidence","calc_type","target_avg_price","pe"], header=["城市","区域","小区名","小区均价","置信度","估值方式","对标第三方均价","PPE"],index=False) +log.info("估值结果测试结束") +def up_to_nextcloud(): + """ + 上传统计信息至nextcloud + """ + from nextcloud import NextCloud + NEXTCLOUD_URL = "https://nextcloud.fangjia.com" + NEXTCLOUD_USERNAME = "shenjian@fangjia.com" + NEXTCLOUD_PASSWORD = "goojia123456" + nextcloud_file_name = '共享/建行/' + file_name + nxc = NextCloud(endpoint=NEXTCLOUD_URL, user=NEXTCLOUD_USERNAME, password=NEXTCLOUD_PASSWORD, json_output=True) + nxc.upload_file(aim_file_name, nextcloud_file_name) + +def send_msg(): + infos = "【准确度测评】数据已生成完毕,请点击 https://nextcloud.fangjia.com/s/KwxGsosMcnYxdoa 查看详情" + data = { + "msgtype": "text", + "text": { + "content": infos + } + } + # 发送消息至群 + requests.post( + url='https://oapi.dingtalk.com/robot/send?access_token=1b6d0d782d3c316f2d3b6b18ea5144816170dd392befbf2042a24a01fb84b736', + json=data) +up_to_nextcloud() +send_msg() \ No newline at end of file diff --git a/dags/jh/price_exception_dag.py b/dags/jh/price_exception_dag.py index 9ac94ac..c67d5e3 100644 --- a/dags/jh/price_exception_dag.py +++ b/dags/jh/price_exception_dag.py @@ -14,4 +14,9 @@ with DAG( task_id='price_exception', bash_command='python /opt/airflow/dags/repo/dags/jh/price/price_exception.py {{dag_run.conf["type"] if "type" in dag_run.conf}}', ) - t1 + t2 = BashOperator( + task_id='price_evaluate', + bash_command='python /opt/airflow/dags/repo/dags/jh/price/price_evaluation.py {{dag_run.conf["year_month"] if "year_month" in dag_run.conf}}', + ) + + t1 >> t2