diff --git a/PriceSystem/feature/region_feature.py b/PriceSystem/feature/region_feature.py index d21c501..621fa7c 100644 --- a/PriceSystem/feature/region_feature.py +++ b/PriceSystem/feature/region_feature.py @@ -312,7 +312,7 @@ def return_operate(ppu,mm): if ppu==None: return 0 else: - return round(10000*(mm-ppu)/ppu,2) + return int(10000*(mm-ppu)/ppu,2) ''' def before_month_lastday(ti): @@ -402,7 +402,7 @@ def save_region_feature(ct,rl,timd,timm): {"city":ct,"region":rl,"weekend":timme}, - {"city":ct,"region":rl,"district_name":None,"make_up":markup,'ratio':region_feature[0], + {"city":ct,"region":rl,"district_name":None,"markup":markup,'ratio':region_feature[0], "avg_price":region_feature[1], "c_date":date,"weekend":timme,"cat":'region'},True ) diff --git a/PriceSystem/fix/price_fix.py b/PriceSystem/fix/price_fix.py index 7bab91c..0c413ae 100644 --- a/PriceSystem/fix/price_fix.py +++ b/PriceSystem/fix/price_fix.py @@ -113,7 +113,8 @@ estype='普通住宅' ''' ct='上海' -rl='崇明' +rl='崇明' /home/luogan/Downloads/矩阵微分(变分)法.pdf +/home/luogan/Downloads/向量和矩阵的微分.pdf lk='上海经济建设小区' estype='普通住宅' ''' diff --git a/PriceSystem/rent_price/__pycache__/district_map0413.cpython-36.pyc b/PriceSystem/rent_price/__pycache__/district_map0413.cpython-36.pyc index 141cbc5..dceea76 100644 Binary files a/PriceSystem/rent_price/__pycache__/district_map0413.cpython-36.pyc and b/PriceSystem/rent_price/__pycache__/district_map0413.cpython-36.pyc differ diff --git a/PriceSystem/rent_price/district_map0413.py b/PriceSystem/rent_price/district_map0413.py index 730170f..30d7f45 100644 --- a/PriceSystem/rent_price/district_map0413.py +++ b/PriceSystem/rent_price/district_map0413.py @@ -897,7 +897,7 @@ def save_to_mongo(ct,rl,lk,timd,timm): if ppu==None: return 0 else: - return round(10000*(mm-ppu)/ppu,2) + return int(10000*(mm-ppu)/ppu,2) ''' def month_lastday(ti): from dateutil.parser import parse @@ -997,7 +997,13 @@ def save_to_mongo(ct,rl,lk,timd,timm): make_up=return_operate(mmup,mm) #print('d_time=',time.time()-d) ###print('p=',p) - date=datetime.datetime.now() + + def c_date(): + date1=datetime.datetime.now() + + pacific = pytz.timezone('Asia/Shanghai') + return pacific.localize(date1) + date=c_date() #weekend=20161231 print("######################## ","ct=",ct,"rl=",rl,"lk=",p[0],"mm=",mm,make_up) """ @@ -1020,7 +1026,7 @@ def save_to_mongo(ct,rl,lk,timd,timm): {"city":ct,"region":rl,"district_name":p[0],"weekend":timme}, - {"city":ct,"region":rl,"district_name":p[0],"make_up":make_up, + {"city":ct,"region":rl,"district_name":p[0],"markup":make_up, "avg_price":mm, "c_date":date,"weekend":timme,"cat":'district'},True )