Merge branch 'master' of 192.168.0.27:dev0/PriceSystem

# Conflicts:
#	PriceSystem/test.py
This commit is contained in:
2018-04-08 09:13:08 +08:00
3 changed files with 213 additions and 193 deletions
+2 -2
View File
@@ -25,7 +25,7 @@ def get_logger(name):
file_handler = logging.FileHandler("/home/goojia/logs/" + name + ".log") file_handler = logging.FileHandler("/home/goojia/logs/" + name + ".log")
file_handler.setFormatter(formatter) file_handler.setFormatter(formatter)
logger.addHandler(file_handler) logger.addHandler(file_handler)
logger.setLevel("ERROR") logger.setLevel("INFO")
return logger return logger
@@ -39,7 +39,7 @@ def get_performance_logger(name):
file_handler = logging.FileHandler("/home/goojia/logs/" + name + ".performance.log") file_handler = logging.FileHandler("/home/goojia/logs/" + name + ".performance.log")
file_handler.setFormatter(formatter) file_handler.setFormatter(formatter)
logger.addHandler(file_handler) logger.addHandler(file_handler)
logger.setLevel("ERROR") logger.setLevel("INFO")
return logger return logger
now = datetime.datetime.now().replace(hour=0, minute=0, second=0, microsecond=0) now = datetime.datetime.now().replace(hour=0, minute=0, second=0, microsecond=0)
+97 -74
View File
@@ -21,6 +21,7 @@ import pymongo
import sklearn.cluster import sklearn.cluster
import pandas import pandas
import numpy import numpy
import numpy as np
import time import time
import fangjia import fangjia
import sklearn.svm import sklearn.svm
@@ -327,18 +328,38 @@ def commonprice(ct, rl, p):
#print('lf',lf[['estate_type2','lng2', 'lat2']]) #print('lf',lf[['estate_type2','lng2', 'lat2']])
le = lf[lf['estate_type2'] == estype] le = lf[lf['estate_type2'] == estype]
#print('le',le[['estate_type2','lng2', 'lat2']]) #print(le['name'])
le.index = le['name'] le.index = le['name']
lr = le[['lng2', 'lat2']] lr = le[['lng2', 'lat2']]
lr['name1']=le['name']
dirst1 = list(lr.index)
random.shuffle(dirst1) def sort_manhaten(lr):
lr1=lr.values
lr2=[]
for m in range(lr1.shape[0]):
#print(m)
distance=abs(lng-lr1[m][0])+abs(lat-lr1[m][1])
lr2.append(distance/100000)
lr3=np.c_[lr1,lr2]
lrr=lr3[lr3[:,3].argsort()]
return lrr
lr1=sort_manhaten(lr)
dirst1 = list(lr1[:,3])
#random.shuffle(dirst1)
dirst = dirst1[:80] dirst = dirst1[:80]
# print('dirst=',dirst) #print('dirst=',dirst)
dirst_plus = dirst + [p[0]] dirst_plus = dirst + [p[0]]
@@ -346,7 +367,7 @@ def commonprice(ct, rl, p):
"district_name": {"$in": dirst_plus}} "district_name": {"$in": dirst_plus}}
ppp = fangjia.dis_feature(query_feature) ppp = fangjia.dis_feature(query_feature)
# print('ox'*10,ppp) #print('ox'*10,ppp)
# print('小区个数= ',len(dirst)) # print('小区个数= ',len(dirst))
df1 = zhoubian_xiaoqu(ct, rl, dirst) df1 = zhoubian_xiaoqu(ct, rl, dirst)
@@ -356,7 +377,7 @@ def commonprice(ct, rl, p):
#print('df=',df) #print('df=',df)
vv = hh(ppp, df) vv = hh(ppp, df)
# print('#'*36) # print('#'*36)
# print('vv=',vv) #print('vv=',vv)
return vv return vv
else: else:
return numpy.array([]) return numpy.array([])
@@ -397,6 +418,7 @@ def commonprice(ct, rl, p):
#print('le',le[['estate_type2','lng2', 'lat2']]) #print('le',le[['estate_type2','lng2', 'lat2']])
le.index = le['name'] le.index = le['name']
print('EEEEEEEEE')
lr = le[['lng2', 'lat2']] lr = le[['lng2', 'lat2']]
@@ -1352,104 +1374,105 @@ def pt_up(ct, rl, p, weekend, c_date, cmd_estate_type):
@timer @timer
def out_put_price(ct, rl, lk, weekend): def out_put_price(ct, rl, lk, weekend):
lf = region_district_list_lk(ct, rl, lk) lf = region_district_list_lk(ct, rl, lk)
lf = add_alias(lf) if lf.shape[0]>0:
p = ghhh(lf[['name', 'alias', 'estate_type2']])[0] lf = add_alias(lf)
p = ghhh(lf[['name', 'alias', 'estate_type2']])[0]
print('p=', p) #print('p=', p)
mm = commonprice(ct, rl, p) mm = commonprice(ct, rl, p)
print('mm=',mm) #print('mm=',mm)
c_date = datetime.datetime.utcnow() c_date = datetime.datetime.utcnow()
m_date = datetime.datetime.utcnow() m_date = datetime.datetime.utcnow()
estate_type = lf['estate_type2'].iloc[0] estate_type = lf['estate_type2'].iloc[0]
#print('estate_type',estate_type) #print('estate_type',estate_type)
estate_type,cmd_estate_type = out_estate_type(estate_type) estate_type,cmd_estate_type = out_estate_type(estate_type)
if type(mm[0]) != str: if type(mm[0]) != str:
print(ct, rl, lk, mm, '$' * 20) print(ct, rl, lk, mm, '$' * 20)
# print(lf['estate_type2'].iloc[0],'*'*10) # print(lf['estate_type2'].iloc[0],'*'*10)
# last_sunday=last_sunday() # last_sunday=last_sunday()
# t1=time.time() # t1=time.time()
last_sunday_price = make_up_price(ct, rl, lk, weekend) last_sunday_price = make_up_price(ct, rl, lk, weekend)
# print(time.time()-t1,'*'*20) # print(time.time()-t1,'*'*20)
# print('last_sunday_price',last_sunday_price) # print('last_sunday_price',last_sunday_price)
# print('mm[0]',mm[0]) # print('mm[0]',mm[0])
def make_up(): def make_up():
if type(last_sunday_price) != str and last_sunday_price != None and mm[0] != None and type(mm[0]) != str: if type(last_sunday_price) != str and last_sunday_price != None and mm[0] != None and type(mm[0]) != str:
make_up = 10000 * (mm[0] - last_sunday_price) / last_sunday_price make_up = 10000 * (mm[0] - last_sunday_price) / last_sunday_price
return make_up return make_up
else: else:
return 0 return 0
make_up = int(make_up()) make_up = int(make_up())
#print('make_up',make_up,'*'*20) #print('make_up',make_up,'*'*20)
#print('credic',mm[1]) #print('credic',mm[1])
try: try:
stat_save(ct,rl,p,weekend,mm,c_date,m_date,make_up,estate_type) stat_save(ct,rl,p,weekend,mm,c_date,m_date,make_up,estate_type)
pt_up(ct,rl,p,weekend,c_date,cmd_estate_type) pt_up(ct,rl,p,weekend,c_date,cmd_estate_type)
'''
stat.replace_one(
{"city": ct, "region": rl, "district_name": p[0], "weekend": weekend},
{"city": ct, "region": rl, "district_name": p[0], 'credit': mm[1],
"calc_value": int(mm[0]), "weekend": weekend, "c_date": c_date, 'avg_price': int(mm[0]),
"m_date": m_date, 'value_type': int(mm[2]), 'weekend_markup': make_up,
'changed_markup': make_up, 'markup': make_up, 'sample_size': mm[3],
'estate_type': estate_type}, True
)
pt.replace_one(
{"city": ct, "region": rl, "name": p[0], "calc_date": weekend},
{"city": ct, "region": rl, "name": p[0], "c_date": c_date, 'status': int(102),
'remark': 'week', 'category': 'sell', "calc_date": weekend, 'priority': int(0),
'estate_type': cmd_estate_type, 'problem': None, "calc_type": int(0)
}, True
)
'''
except:
stat_save(ct,rl,p,weekend,mm,c_date,m_date,make_up,estate_type)
else:
pt_down(ct,rl,p,weekend,c_date,cmd_estate_type,mm)
''' '''
stat.replace_one(
{"city": ct, "region": rl, "district_name": p[0], "weekend": weekend},
{"city": ct, "region": rl, "district_name": p[0], 'credit': mm[1],
"calc_value": int(mm[0]), "weekend": weekend, "c_date": c_date, 'avg_price': int(mm[0]),
"m_date": m_date, 'value_type': int(mm[2]), 'weekend_markup': make_up,
'changed_markup': make_up, 'markup': make_up, 'sample_size': mm[3],
'estate_type': estate_type}, True
)
pt.replace_one( pt.replace_one(
{"city": ct, "region": rl, "name": p[0], "calc_date": weekend}, {"city": ct, "region": rl, "name": p[0], "calc_date": weekend},
{"city": ct, "region": rl, "name": p[0], "c_date": c_date, 'status': int(102), {"city": ct, "region": rl, "name": p[0], "c_date": c_date, 'status': int(3),
'remark': 'week', 'category': 'sell', "calc_date": weekend, 'priority': int(0), 'remark': 'week', 'category': 'sell', "calc_date": weekend, 'priority': int(0),
'estate_type': cmd_estate_type, 'problem': None, "calc_type": int(0) 'problem': mm[0], 'estate_type': cmd_estate_type, "calc_type": int(0)
}, True }, True
) )
''' '''
except:
stat_save(ct,rl,p,weekend,mm,c_date,m_date,make_up,estate_type)
else:
pt_down(ct,rl,p,weekend,c_date,cmd_estate_type,mm)
'''
pt.replace_one(
{"city": ct, "region": rl, "name": p[0], "calc_date": weekend},
{"city": ct, "region": rl, "name": p[0], "c_date": c_date, 'status': int(3),
'remark': 'week', 'category': 'sell', "calc_date": weekend, 'priority': int(0),
'problem': mm[0], 'estate_type': cmd_estate_type, "calc_type": int(0)
}, True
)
'''
+80 -83
View File
@@ -1,84 +1,81 @@
import pandas as pd import datetime
import numpy as np import fangjia
#fangjia.send_dingding_msg("测试")
# import datetime import time
# import fangjia
# #fangjia.send_dingding_msg("测试") import sell_price.zhuge0118A as sellPrice
#
# import time s = time.time()
#
# import sell_price.zhuge0118A as sellPrice
# #上海 闵行上海康城
# s = time.time()
# #深圳龙岗葵涌供销社综合商住楼
# '''
# #上海 闵行上海康城 ct = '深圳'
# rl = '龙岗'
# #深圳龙岗葵涌供销社综合商住楼 lk = '葵涌供销社综合商住楼'
# ''' ct = '杭州'
# ct = '深圳' rl = '桐庐'
# rl = '龙岗' lk = '金色港湾度假村'
# lk = '葵涌供销社综合商住楼'
# ct = '杭州' ct = '成都'
# rl = '桐庐' rl = '武侯'
# lk = '金色港湾度假村' lk = '中海国际社区林汀别墅'
#
# ct = '成都'
# rl = '武侯' ct = '成都'
# lk = '中海国际社区林汀别墅' rl = '双流'
# lk = '长滩壹号'
#
# ct = '成都' ct = '广州'
# rl = '双流' rl = '海珠'
# lk = '长滩壹号' lk = '会展世界城三期'
# '''
# ct = '广州' #成都- 都江堰- 溪岭雪#上海徐汇 灞桥沁水新城百汇园西 安 未央 兴乐园 弘和美邻馆 雁塔鸿景花园上海 奉贤 万隆花苑#
# rl = '海珠' """
# lk = '会展世界城三期' ct='洛阳'
# ''' rl='涧西'
# #成都- 都江堰- 溪岭雪#上海徐汇 灞桥沁水新城百汇园西 安 未央 兴乐园 弘和美邻馆 雁塔鸿景花园上海 奉贤 万隆花苑# lk='奥阳康城'上海浦东龚家阁龚家花园绍兴越城辕门新村
# """ 南区亨纳斯花园杨浦上海嘉定浏翔花苑北京 昌平 回龙观三期
# ct='洛阳' """
# rl='涧西' ct='上海'
# lk='奥阳康城'上海浦东龚家阁龚家花园绍兴越城辕门新村南区亨纳斯花园杨浦 rl='杨浦'
# """ lk='亨纳斯花园'
# ct='上海'
# rl='杨浦' #成都双流长滩一号 上海 奉贤 朝阳新村##上海 奉贤 棕榈滩别墅深圳龙岗丽皇阁
# lk='亨纳斯花园' #洛阳涧西奥阳康城
#
# #成都双流长滩一号 上海 奉贤 朝阳新村##上海 奉贤 棕榈滩别墅深圳龙岗丽皇阁 #未央
# #洛阳涧西奥阳康城
# weekend = datetime.datetime.strptime("2018-04-01", "%Y-%m-%d")
# #未央 #for i in range(0, 100):
#
# weekend = datetime.datetime.strptime("2018-04-01", "%Y-%m-%d") sellPrice.out_put_price(ct, rl, lk, weekend)
# #for i in range(0, 100): e = time.time()
#
# sellPrice.out_put_price(ct, rl, lk, weekend) print(e - s)
# e = time.time() '''
# ###
# print(e - s) import pandas as pd
# '''
# ### a=pd.read_csv('fangjia.seaweed.csv')
# import pandas as pd
# for i in a.index:
# a=pd.read_csv('fangjia.seaweed.csv') ct=a['city'][i]
# rl=a['region'][i]
# for i in a.index: lk=a['name'][i]
# ct=a['city'][i] sellPrice.out_put_price(ct, rl, lk, weekend)
# rl=a['region'][i]
# lk=a['name'][i] '''
# sellPrice.out_put_price(ct, rl, lk, weekend) '''
#
# ''' @fangjia.cache(1000)
# ''' def sum1(a, b):
# print(111)
# @fangjia.cache(1000) return a + b
# def sum1(a, b):
# print(111)
# return a + b print(sum1(1,2))
# '''
#
# print(sum1(1,2))
# '''
import execjs