Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -10,8 +10,14 @@ with DAG(
|
|||||||
catchup=True,
|
catchup=True,
|
||||||
tags=["ai_stock"],
|
tags=["ai_stock"],
|
||||||
) as dag:
|
) as dag:
|
||||||
|
|
||||||
t1 = BashOperator(
|
t1 = BashOperator(
|
||||||
|
task_id='stock_strategy',
|
||||||
|
bash_command='python /opt/airflow/dags/repo/dags/ai/stock/stock_strategy.py',
|
||||||
|
)
|
||||||
|
|
||||||
|
t2 = BashOperator(
|
||||||
task_id='ai_stock',
|
task_id='ai_stock',
|
||||||
bash_command='python /opt/airflow/dags/repo/dags/ai/stock/stock.py',
|
bash_command='python /opt/airflow/dags/repo/dags/ai/stock/stock.py',
|
||||||
)
|
)
|
||||||
t1
|
t1 >> t2
|
||||||
@@ -1,6 +1,11 @@
|
|||||||
"""
|
"""
|
||||||
写字楼基准价
|
写字楼基准价
|
||||||
"""
|
"""
|
||||||
|
import math
|
||||||
|
from datetime import datetime
|
||||||
|
|
||||||
|
import numpy as np
|
||||||
|
import pandas as pd
|
||||||
# 第一步:计算有样本写字楼的基准价
|
# 第一步:计算有样本写字楼的基准价
|
||||||
# 取近一年,最近100个样本的中位值
|
# 取近一年,最近100个样本的中位值
|
||||||
# 第二步:计算无样本写字楼的基准价
|
# 第二步:计算无样本写字楼的基准价
|
||||||
@@ -10,13 +15,8 @@
|
|||||||
#
|
#
|
||||||
# 第五步:本身没有等级和类型的写字楼
|
# 第五步:本身没有等级和类型的写字楼
|
||||||
# 最近10个有样本写字楼的基准价的平均值
|
# 最近10个有样本写字楼的基准价的平均值
|
||||||
from goojia_utils import ElasticSearchClient, dateutils, MAIN_MONGO_CLIENT, commutils
|
from goojia_utils import ElasticSearchClient, dateutils, MAIN_MONGO_CLIENT
|
||||||
import pandas as pd
|
|
||||||
from datetime import datetime
|
|
||||||
from pymongo import UpdateOne
|
from pymongo import UpdateOne
|
||||||
import math
|
|
||||||
import numpy as np
|
|
||||||
import sys
|
|
||||||
|
|
||||||
es = ElasticSearchClient(host='192.168.0.206')
|
es = ElasticSearchClient(host='192.168.0.206')
|
||||||
seaweed_df = MAIN_MONGO_CLIENT.get_collection('fangjia', 'seaweed')
|
seaweed_df = MAIN_MONGO_CLIENT.get_collection('fangjia', 'seaweed')
|
||||||
|
|||||||
@@ -1,6 +1,11 @@
|
|||||||
"""
|
"""
|
||||||
写字楼基准价
|
写字楼基准价
|
||||||
"""
|
"""
|
||||||
|
import math
|
||||||
|
from datetime import datetime
|
||||||
|
|
||||||
|
import numpy as np
|
||||||
|
import pandas as pd
|
||||||
# 第一步:计算有样本写字楼的基准价
|
# 第一步:计算有样本写字楼的基准价
|
||||||
# 取近一年,最近100个样本的中位值
|
# 取近一年,最近100个样本的中位值
|
||||||
# 第二步:计算无样本写字楼的基准价
|
# 第二步:计算无样本写字楼的基准价
|
||||||
@@ -10,13 +15,8 @@
|
|||||||
#
|
#
|
||||||
# 第五步:本身没有等级和类型的写字楼
|
# 第五步:本身没有等级和类型的写字楼
|
||||||
# 最近10个有样本写字楼的基准价的平均值
|
# 最近10个有样本写字楼的基准价的平均值
|
||||||
from goojia_utils import ElasticSearchClient, dateutils, MAIN_MONGO_CLIENT, commutils
|
from goojia_utils import ElasticSearchClient, dateutils, MAIN_MONGO_CLIENT
|
||||||
import pandas as pd
|
|
||||||
from datetime import datetime
|
|
||||||
from pymongo import UpdateOne
|
from pymongo import UpdateOne
|
||||||
import math
|
|
||||||
import numpy as np
|
|
||||||
import sys
|
|
||||||
|
|
||||||
es = ElasticSearchClient(host='192.168.0.206')
|
es = ElasticSearchClient(host='192.168.0.206')
|
||||||
seaweed_df = MAIN_MONGO_CLIENT.get_collection('fangjia', 'seaweed')
|
seaweed_df = MAIN_MONGO_CLIENT.get_collection('fangjia', 'seaweed')
|
||||||
@@ -110,9 +110,10 @@ def calcByOffice(city, district, office_name):
|
|||||||
avg_prices = [doc["avg_price"] for doc in avg_price_ret]
|
avg_prices = [doc["avg_price"] for doc in avg_price_ret]
|
||||||
# 计算平均值
|
# 计算平均值
|
||||||
average_price = np.mean(avg_prices) if len(avg_prices) > 0 else 0
|
average_price = np.mean(avg_prices) if len(avg_prices) > 0 else 0
|
||||||
|
new_avg_price = None
|
||||||
if average_price > 0:
|
if average_price > 0:
|
||||||
new_avg_price = int(average_price)
|
new_avg_price = int(average_price)
|
||||||
else:
|
elif "avg_price" in sample.columns:
|
||||||
# 取样本的平均值
|
# 取样本的平均值
|
||||||
new_avg_price = int(sample['avg_price'].mean())
|
new_avg_price = int(sample['avg_price'].mean())
|
||||||
if pd.notna(new_avg_price):
|
if pd.notna(new_avg_price):
|
||||||
|
|||||||
Reference in New Issue
Block a user