diff --git a/dags/business/business/community/avg_cost.py b/dags/business/business/community/avg_cost.py index e822f5e..72561c8 100644 --- a/dags/business/business/community/avg_cost.py +++ b/dags/business/business/community/avg_cost.py @@ -3,13 +3,13 @@ """ import logging import pandas as pd -from goojia_utils import DEV_MONGO_CLIENT, ElasticSearchClient, commutils, dateutils +from goojia_utils import MAIN_MONGO_CLIENT, ElasticSearchClient, commutils, dateutils from elasticsearch import helpers import numpy as np from concurrent.futures import ThreadPoolExecutor log = logging.getLogger(__name__) -seaweed_conn = DEV_MONGO_CLIENT.get_collection('fangjia', 'seaweed') +seaweed_conn = MAIN_MONGO_CLIENT.get_collection('fangjia', 'seaweed') es206_client = ElasticSearchClient(host='192.168.0.206') index_name = "community_summary" diff --git a/dags/business/business/community/comm.py b/dags/business/business/community/comm.py index 7d3167e..b892e43 100644 --- a/dags/business/business/community/comm.py +++ b/dags/business/business/community/comm.py @@ -4,11 +4,11 @@ import logging import pandas as pd -from goojia_utils import DEV_MONGO_CLIENT, ElasticSearchClient, commutils, dateutils +from goojia_utils import MAIN_MONGO_CLIENT, ElasticSearchClient, commutils, dateutils from elasticsearch import helpers log = logging.getLogger(__name__) -seaweed_conn = DEV_MONGO_CLIENT.get_collection('fangjia', 'seaweed') +seaweed_conn = MAIN_MONGO_CLIENT.get_collection('fangjia', 'seaweed') es206_client = ElasticSearchClient(host='192.168.0.206') index_name = "community_summary" diff --git a/dags/business/business/community/community_summary.py b/dags/business/business/community/community_summary.py index 2aa7130..82cd5f1 100644 --- a/dags/business/business/community/community_summary.py +++ b/dags/business/business/community/community_summary.py @@ -25,4 +25,4 @@ if type == 'all': #total_price.sync() #traffic.sync() #medical.sync() - life.sync() + life.sync('上海') diff --git a/dags/business/business/community/consumption_potential.py b/dags/business/business/community/consumption_potential.py index 9b8cc70..968aba6 100644 --- a/dags/business/business/community/consumption_potential.py +++ b/dags/business/business/community/consumption_potential.py @@ -3,18 +3,40 @@ """ from goojia_utils import ElasticSearchClient import pandas as pd +import numpy as np es206_client = ElasticSearchClient(host='192.168.0.206') -def calcConsumptionPotential(): +def calc_consumption_potential(city): """ 计算消费潜力 """ + sql = "select id, city, region, name, total_price, estate_charge, avg_price_region_ranking, avg_cost from community_summary" + if pd.notna(city): + sql += " where city=" + city + community_summary_df = es206_client.scan_by_sql_to_data_frame(sql) + community_summary_df['total_price_mean'] = community_summary_df.groupby(by=['city'])['total_price'].transform(np.mean) + community_summary_df['total_price_std'] = community_summary_df.groupby(by=['city'])['total_price'].transform(np.std) + + community_summary_df['estate_charge_mean'] = community_summary_df.groupby(by=['city'])['estate_charge'].transform(np.mean) + community_summary_df['estate_charge_std'] = community_summary_df.groupby(by=['city'])['estate_charge'].transform(np.std) + + community_summary_df['avg_price_region_ranking_mean'] = community_summary_df.groupby(by=['city'])['avg_price_region_ranking'].transform(np.mean) + community_summary_df['avg_price_region_ranking_std'] = community_summary_df.groupby(by=['city'])['avg_price_region_ranking'].transform(np.std) + + community_summary_df['avg_cost_mean'] = community_summary_df.groupby(by=['city'])['avg_cost'].transform(np.mean) + community_summary_df['avg_cost_std'] = community_summary_df.groupby(by=['city'])['avg_cost'].transform(np.std) + + community_summary_df['consumption_potential'] = 286.0134196 * (community_summary_df['total_price'] - community_summary_df['total_price_avg']) / community_summary_df['total_price_std'] \ + + 139.1374524 * (community_summary_df['estate_charge'] - community_summary_df['estate_charge_avg']) / community_summary_df['estate_charge_std'] \ + + 21.8427926 * (community_summary_df['avg_price_region_ranking'] - community_summary_df['avg_price_region_ranking_avg']) / community_summary_df['avg_price_region_ranking_std'] \ + + 67.0195871700 * (community_summary_df['avg_cost'] - community_summary_df['avg_cost_mean']) / community_summary_df['avg_cost_std'] + 4099.978248 pass -def calcConsumptionRating(): + +def calc_consumption_rating(): """ 计算消费等级 """ diff --git a/dags/business/business/community/life.py b/dags/business/business/community/life.py index e41ea58..cbcf886 100644 --- a/dags/business/business/community/life.py +++ b/dags/business/business/community/life.py @@ -3,13 +3,13 @@ """ import logging import pandas as pd -from goojia_utils import DEV_MONGO_CLIENT, ElasticSearchClient, commutils, dateutils, areautils, poiutils +from goojia_utils import MAIN_MONGO_CLIENT, ElasticSearchClient, commutils, dateutils, areautils, poiutils from elasticsearch import helpers from concurrent.futures import ThreadPoolExecutor from threading import Lock log = logging.getLogger(__name__) -seaweed_conn = DEV_MONGO_CLIENT.get_collection('fangjia', 'seaweed') +seaweed_conn = MAIN_MONGO_CLIENT.get_collection('fangjia', 'seaweed') es206_client = ElasticSearchClient(host='192.168.0.206') index_name = "community_summary" diff --git a/dags/business/business/community/medical.py b/dags/business/business/community/medical.py index 540135c..269dee6 100644 --- a/dags/business/business/community/medical.py +++ b/dags/business/business/community/medical.py @@ -3,13 +3,13 @@ """ import logging import pandas as pd -from goojia_utils import DEV_MONGO_CLIENT, ElasticSearchClient, commutils, dateutils, areautils, poiutils +from goojia_utils import MAIN_MONGO_CLIENT, ElasticSearchClient, commutils, dateutils, areautils, poiutils from elasticsearch import helpers from concurrent.futures import ThreadPoolExecutor from threading import Lock log = logging.getLogger(__name__) -seaweed_conn = DEV_MONGO_CLIENT.get_collection('fangjia', 'seaweed') +seaweed_conn = MAIN_MONGO_CLIENT.get_collection('fangjia', 'seaweed') es206_client = ElasticSearchClient(host='192.168.0.206') index_name = "community_summary" diff --git a/dags/business/business/community/price.py b/dags/business/business/community/price.py index f272721..6f5bfa6 100644 --- a/dags/business/business/community/price.py +++ b/dags/business/business/community/price.py @@ -3,11 +3,11 @@ """ import logging import pandas as pd -from goojia_utils import DEV_MONGO_CLIENT, ElasticSearchClient, commutils, dateutils, areautils +from goojia_utils import MAIN_MONGO_CLIENT, ElasticSearchClient, commutils, dateutils, areautils from elasticsearch import helpers log = logging.getLogger(__name__) -seaweed_conn = DEV_MONGO_CLIENT.get_collection('fangjia', 'seaweed') +seaweed_conn = MAIN_MONGO_CLIENT.get_collection('fangjia', 'seaweed') es206_client = ElasticSearchClient(host='192.168.0.206') index_name = "community_summary" diff --git a/dags/business/business/community/sell.py b/dags/business/business/community/sell.py index 61101ce..3729f5a 100644 --- a/dags/business/business/community/sell.py +++ b/dags/business/business/community/sell.py @@ -3,12 +3,12 @@ """ import logging import pandas as pd -from goojia_utils import DEV_MONGO_CLIENT, ElasticSearchClient, commutils, dateutils, areautils +from goojia_utils import MAIN_MONGO_CLIENT, ElasticSearchClient, commutils, dateutils, areautils from elasticsearch import helpers from concurrent.futures import ThreadPoolExecutor log = logging.getLogger(__name__) -seaweed_conn = DEV_MONGO_CLIENT.get_collection('fangjia', 'seaweed') +seaweed_conn = MAIN_MONGO_CLIENT.get_collection('fangjia', 'seaweed') es206_client = ElasticSearchClient(host='192.168.0.206') index_name = "community_summary" diff --git a/dags/business/business/community/total_price.py b/dags/business/business/community/total_price.py index 0a0989f..ce934d9 100644 --- a/dags/business/business/community/total_price.py +++ b/dags/business/business/community/total_price.py @@ -3,13 +3,13 @@ """ import logging import pandas as pd -from goojia_utils import DEV_MONGO_CLIENT, ElasticSearchClient, commutils, dateutils, areautils +from goojia_utils import MAIN_MONGO_CLIENT, ElasticSearchClient, commutils, dateutils, areautils from elasticsearch import helpers from concurrent.futures import ThreadPoolExecutor import datetime log = logging.getLogger(__name__) -seaweed_conn = DEV_MONGO_CLIENT.get_collection('fangjia', 'seaweed') +seaweed_conn = MAIN_MONGO_CLIENT.get_collection('fangjia', 'seaweed') es206_client = ElasticSearchClient(host='192.168.0.206') index_name = "community_summary" diff --git a/dags/business/business/community/trade.py b/dags/business/business/community/trade.py index 988abb2..0be193c 100644 --- a/dags/business/business/community/trade.py +++ b/dags/business/business/community/trade.py @@ -3,11 +3,11 @@ """ import logging import pandas as pd -from goojia_utils import DEV_MONGO_CLIENT, ElasticSearchClient, commutils, dateutils, areautils +from goojia_utils import MAIN_MONGO_CLIENT, ElasticSearchClient, commutils, dateutils, areautils from elasticsearch import helpers log = logging.getLogger(__name__) -seaweed_conn = DEV_MONGO_CLIENT.get_collection('fangjia', 'seaweed') +seaweed_conn = MAIN_MONGO_CLIENT.get_collection('fangjia', 'seaweed') es206_client = ElasticSearchClient(host='192.168.0.206') index_name = "community_summary" diff --git a/dags/business/business/community/traffic.py b/dags/business/business/community/traffic.py index a561009..5acb3bb 100644 --- a/dags/business/business/community/traffic.py +++ b/dags/business/business/community/traffic.py @@ -3,13 +3,13 @@ """ import logging import pandas as pd -from goojia_utils import DEV_MONGO_CLIENT, ElasticSearchClient, commutils, dateutils, areautils, poiutils +from goojia_utils import MAIN_MONGO_CLIENT, ElasticSearchClient, commutils, dateutils, areautils, poiutils from elasticsearch import helpers from concurrent.futures import ThreadPoolExecutor from threading import Lock log = logging.getLogger(__name__) -seaweed_conn = DEV_MONGO_CLIENT.get_collection('fangjia', 'seaweed') +seaweed_conn = MAIN_MONGO_CLIENT.get_collection('fangjia', 'seaweed') es206_client = ElasticSearchClient(host='192.168.0.206') index_name = "community_summary"