From fa951ec8d03b165db57cd68959c241d6b011894f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BD=97=E5=B9=B2?= Date: Wed, 25 Apr 2018 16:44:48 +0800 Subject: [PATCH] =?UTF-8?q?=09=E4=BF=AE=E6=94=B9=EF=BC=9A=20=20=20=20=20Pr?= =?UTF-8?q?iceSystem/feature/=5F=5Fpycache=5F=5F/region=5Ffeature.cpython-?= =?UTF-8?q?36.pyc=20=09=E4=BF=AE=E6=94=B9=EF=BC=9A=20=20=20=20=20PriceSyst?= =?UTF-8?q?em/feature/region=5Ffeature.py=20=09=E4=BF=AE=E6=94=B9=EF=BC=9A?= =?UTF-8?q?=20=20=20=20=20PriceSystem/rent=5Fprice/=5F=5Fpycache=5F=5F/dis?= =?UTF-8?q?trict=5Fmap0413.cpython-36.pyc=20=09=E4=BF=AE=E6=94=B9=EF=BC=9A?= =?UTF-8?q?=20=20=20=20=20PriceSystem/test.py?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../__pycache__/region_feature.cpython-36.pyc | Bin 6718 -> 6889 bytes PriceSystem/feature/region_feature.py | 14 ++++++++++---- .../district_map0413.cpython-36.pyc | Bin 17619 -> 17771 bytes PriceSystem/test.py | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/PriceSystem/feature/__pycache__/region_feature.cpython-36.pyc b/PriceSystem/feature/__pycache__/region_feature.cpython-36.pyc index 50d0ae40f8cf0d2583b362c6c86728dbbdaa7153..34da9185053d0bd1dae1f814ed6a2e43d529cd95 100644 GIT binary patch delta 552 zcmXYsJ#W-N5Qb;gYoEU<5^{DyBt+#3Q26Q)5(NekGiq(mz_TRxyUxoPmw;E};&LdJSq8ijM}T-L+)yGjE=6rI=Z&OR+<%_f~-lhPM9mKF(uD6z6I1ZNYnvQdUnn^`Q@KN##%`TC61C6G`e ziAz#g0vX1@g4qH~TUrd(L5T`Skc?!O_E3fxegK8b2(xtcq^I?;@R!;m5Vj0TD4a{o zKLjPW>^qI%}vCD!IL%=`> zG{YmF=x?Z2`~=S@Kk)&CBehlgg?+V=JZ@I@MVIwN$~#)b*EF0qS1KZgdCChjdNwdI z&@#|g^W=D+d%CY8o(_grqi#R#i5s3)B+qZI`I~tni_8<_cs1P8fq7ct-t9p3>wD{v o!iYpTf}TYwtx=c4K+h6HkcT3~XKGq+Tl`&nRoEE9nYwH6KZ25KA^-pY diff --git a/PriceSystem/feature/region_feature.py b/PriceSystem/feature/region_feature.py index 6a0a11f..d21c501 100644 --- a/PriceSystem/feature/region_feature.py +++ b/PriceSystem/feature/region_feature.py @@ -333,7 +333,7 @@ def before_month_lastday(ti): def save_region_feature(ct,rl,timd,timm): - a=time.time() + #a=time.time() region_feature=dff(ct,rl,timd,timm) #print('region_feature=',region_feature) @@ -341,8 +341,13 @@ def save_region_feature(ct,rl,timd,timm): mmup=region_make_up_price(ct,rl,None,timm) #print('mmup_region=',mmup) #print('this month region price',region_feature[1]) - make_up=return_operate(mmup,region_feature[1]) - date=datetime.datetime.now() + markup=return_operate(mmup,region_feature[1]) + + def c_date(): + date1=datetime.datetime.now() + + pacific = pytz.timezone('Asia/Shanghai') + return pacific.localize(date1) @@ -388,6 +393,7 @@ def save_region_feature(ct,rl,timd,timm): #save_lg = fangjia.get_collection("fangjia_stat", "rent_1221", config.get_district_stat_host(), config.get_district_stat_port()) avg=region_feature[1] + date=c_date() if type(avg)!=str: avg=float(avg) save_lg = fangjia.get_collection("fangjia",config.get_sqm_rentprice_db(), config.get_mongodb_host(),27017) @@ -396,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":make_up,'ratio':region_feature[0], + {"city":ct,"region":rl,"district_name":None,"make_up":markup,'ratio':region_feature[0], "avg_price":region_feature[1], "c_date":date,"weekend":timme,"cat":'region'},True ) diff --git a/PriceSystem/rent_price/__pycache__/district_map0413.cpython-36.pyc b/PriceSystem/rent_price/__pycache__/district_map0413.cpython-36.pyc index 33594842da4af4eb40b6f96d1a2508f11ad478f9..141cbc53a7f9e75c1d05e2ade74300d3323b3d77 100644 GIT binary patch delta 491 zcmYk2&rVZ86voe)`?r@C+ImZ=rY)kVSEEEAVFyxN$fm}?3QWiiW1yEv$aLH^bA#rZ zSXdatYlsT+($!lt5BB*uzfOaSs$`IkN{>(Q8w&VM zg?v(t@OlmSEmc-w79dDpl{1vN9qR*%_cAbDTJB?7Rn=rjfx^EIRpPgg?f?3a5=KeA z!=q!L-_0xp4l5AdYo8Wp=K|a~eKP-v>G8$yY!h_J4)+_hx`YH0q_se@#NtSgp~8fM zGbA%>_X>;MPCT`;9q(>!$DPO#=VTLK3~ETYYH*DZv4O*5`Qo9NFp_OiTS<`fsRN>v_X{8H=4)d*Z$cSumJ1Nh5^SD6e0)rt-oedEo4c z&aTuSTTL9(pDQ)}yY Px~(r}ujn_ApJDG0E{}7^ delta 366 zcmaFe#dx`sk<*x$mn&85K~%;@&S)b(aRvqkZXjj`;^G;Ti;S+zm9VAAbucwEF*2mc zrzo^A)CzPkbg-nzHZ#=(p1@c%rGy8>s}<^CtQD&f%i^tJs9}WYs1Zz2o5O;{ z7Xg|e3KUgO(U`-LqS?$0bPPiRF2*UFo$QV?30CnJrKV@*=f$U` zCYF>IrP@yBbbK^{zw)FM@&PmB10M2IHeWLal@ zv0JPKMVWaeMXW$oMVCRcSAfLi2xoal@yX{zB_~gG_Gh%4{LHyTo{5W