修改: PriceSystem/sell_price/zhuge0118A.py
This commit is contained in:
@@ -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("INFO")
|
logger.setLevel("ERROR")
|
||||||
|
|
||||||
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("INFO")
|
logger.setLevel("ERROR")
|
||||||
|
|
||||||
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)
|
||||||
|
|||||||
@@ -1352,104 +1352,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)
|
|
||||||
|
|
||||||
mm = commonprice(ct, rl, p)
|
|
||||||
print('mm=',mm)
|
|
||||||
c_date = datetime.datetime.utcnow()
|
|
||||||
m_date = datetime.datetime.utcnow()
|
|
||||||
estate_type = lf['estate_type2'].iloc[0]
|
|
||||||
|
|
||||||
|
#print('p=', p)
|
||||||
|
|
||||||
#print('estate_type',estate_type)
|
mm = commonprice(ct, rl, p)
|
||||||
|
#print('mm=',mm)
|
||||||
|
c_date = datetime.datetime.utcnow()
|
||||||
estate_type,cmd_estate_type = out_estate_type(estate_type)
|
m_date = datetime.datetime.utcnow()
|
||||||
|
estate_type = lf['estate_type2'].iloc[0]
|
||||||
|
|
||||||
if type(mm[0]) != str:
|
|
||||||
|
|
||||||
print(ct, rl, lk, mm, '$' * 20)
|
|
||||||
# print(lf['estate_type2'].iloc[0],'*'*10)
|
|
||||||
|
|
||||||
|
|
||||||
# last_sunday=last_sunday()
|
|
||||||
# t1=time.time()
|
|
||||||
last_sunday_price = make_up_price(ct, rl, lk, weekend)
|
|
||||||
|
|
||||||
# print(time.time()-t1,'*'*20)
|
|
||||||
|
|
||||||
# print('last_sunday_price',last_sunday_price)
|
|
||||||
# print('mm[0]',mm[0])
|
|
||||||
|
|
||||||
def make_up():
|
|
||||||
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
|
|
||||||
return make_up
|
|
||||||
else:
|
|
||||||
return 0
|
|
||||||
|
|
||||||
make_up = int(make_up())
|
|
||||||
|
|
||||||
#print('make_up',make_up,'*'*20)
|
|
||||||
#print('credic',mm[1])
|
#print('estate_type',estate_type)
|
||||||
|
|
||||||
try:
|
|
||||||
|
estate_type,cmd_estate_type = out_estate_type(estate_type)
|
||||||
|
|
||||||
|
|
||||||
|
if type(mm[0]) != str:
|
||||||
|
|
||||||
|
print(ct, rl, lk, mm, '$' * 20)
|
||||||
|
# print(lf['estate_type2'].iloc[0],'*'*10)
|
||||||
|
|
||||||
|
|
||||||
|
# last_sunday=last_sunday()
|
||||||
|
# t1=time.time()
|
||||||
|
last_sunday_price = make_up_price(ct, rl, lk, weekend)
|
||||||
|
|
||||||
|
# print(time.time()-t1,'*'*20)
|
||||||
|
|
||||||
|
# print('last_sunday_price',last_sunday_price)
|
||||||
|
# print('mm[0]',mm[0])
|
||||||
|
|
||||||
|
def make_up():
|
||||||
|
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
|
||||||
|
return make_up
|
||||||
|
else:
|
||||||
|
return 0
|
||||||
|
|
||||||
|
make_up = int(make_up())
|
||||||
|
|
||||||
stat_save(ct,rl,p,weekend,mm,c_date,m_date,make_up,estate_type)
|
#print('make_up',make_up,'*'*20)
|
||||||
pt_up(ct,rl,p,weekend,c_date,cmd_estate_type)
|
#print('credic',mm[1])
|
||||||
|
|
||||||
|
try:
|
||||||
|
|
||||||
|
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)
|
||||||
|
|
||||||
|
'''
|
||||||
|
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
|
|
||||||
)
|
|
||||||
'''
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+5
-4
@@ -37,11 +37,12 @@ lk = '会展世界城三期'
|
|||||||
"""
|
"""
|
||||||
ct='洛阳'
|
ct='洛阳'
|
||||||
rl='涧西'
|
rl='涧西'
|
||||||
lk='奥阳康城'上海浦东龚家阁龚家花园绍兴越城辕门新村南区亨纳斯花园杨浦
|
lk='奥阳康城'上海浦东龚家阁龚家花园绍兴越城辕门新村
|
||||||
|
南区亨纳斯花园杨浦上海嘉定浏翔花苑北京 昌平 回龙观三期
|
||||||
"""
|
"""
|
||||||
ct='上海'
|
ct='北京'
|
||||||
rl='杨浦'
|
rl='昌平'
|
||||||
lk='亨纳斯花园'
|
lk='回龙观三期'
|
||||||
|
|
||||||
#成都双流长滩一号 上海 奉贤 朝阳新村##上海 奉贤 棕榈滩别墅深圳龙岗丽皇阁
|
#成都双流长滩一号 上海 奉贤 朝阳新村##上海 奉贤 棕榈滩别墅深圳龙岗丽皇阁
|
||||||
#洛阳涧西奥阳康城
|
#洛阳涧西奥阳康城
|
||||||
|
|||||||
Reference in New Issue
Block a user