修改: PriceSystem/config/__init__.py
修改: PriceSystem/fangjia/__init__.py 修改: PriceSystem/feature/region_feature.py 修改: PriceSystem/rent_price/district_map0413.py 修改: PriceSystem/rent_test.py
This commit is contained in:
@@ -408,40 +408,34 @@ def rent_disanganf_series(query, fields):
|
||||
|
||||
pos=list(seawater105.find(query,fields))
|
||||
|
||||
#print(pos)
|
||||
print('pos=',pos)
|
||||
data1=pandas.DataFrame(pos)
|
||||
if data1.shape[0]>3:
|
||||
one_date=list(set(data1['weekend']))[0]
|
||||
|
||||
|
||||
data=data1[data1['weekend']==one_date]
|
||||
d0=list(data['calc_value'])
|
||||
d1=list(data['district_name'])
|
||||
d2=pandas.Series(d0,index=d1)
|
||||
return d2
|
||||
else:
|
||||
return pandas.DataFrame()
|
||||
one_date=list(set(data1['weekend']))[1]
|
||||
#two_date=list(set(data1['weekend']))[1]
|
||||
data=data1[data1['weekend']==one_date]
|
||||
|
||||
|
||||
d0=list(data['calc_value'])
|
||||
d1=list(data['district_name'])
|
||||
d2=pandas.Series(d0,index=d1)
|
||||
return d2
|
||||
|
||||
except:
|
||||
# print('flag2')
|
||||
pos=list(seawater105.find(query,fields))
|
||||
data1=pandas.DataFrame(pos)
|
||||
print('data1=',data1)
|
||||
if data1.shape[0]>3:
|
||||
one_date=list(set(data1['weekend']))[0]
|
||||
|
||||
|
||||
data=data1[data1['weekend']==one_date]
|
||||
d0=list(data['calc_value'])
|
||||
d1=list(data['district_name'])
|
||||
d2=pandas.Series(d0,index=d1)
|
||||
return d2
|
||||
else:
|
||||
return pandas.DataFrame()
|
||||
one_date=list(set(data1['weekend']))[1]
|
||||
data=data1[data1['weekend']==one_date]
|
||||
d0=list(data['calc_value'])
|
||||
d1=list(data['district_name'])
|
||||
d2=pandas.Series(d0,index=d1)
|
||||
return d2
|
||||
|
||||
raise Exception("样本查询失败!")
|
||||
|
||||
def rent_region_feature(query, fields):
|
||||
rf = get_collection("fangjia", config.get_sqm_rentprice_db(), 'mongo.db.fangjia.com', 27017)
|
||||
rf = get_collection("fangjia", config.get_rent_temp_db(), '192.168.0.136', 27017)
|
||||
#client182 = pymongo.MongoClient('192.168.10.182',27017)
|
||||
#db182 = client182.fangjia_stat.rent_1221
|
||||
for err_count in range(0, 2):
|
||||
@@ -466,6 +460,35 @@ def rent_region_feature(query, fields):
|
||||
else:
|
||||
return ()
|
||||
"""
|
||||
|
||||
def rent_find_disanganf_price(query, fields=None):
|
||||
# client1 = pymongo.MongoClient('192.168.0.136',27017)
|
||||
# db1 = client1.fangjia
|
||||
# dsf = db1.average_statistics
|
||||
# s = time.time()
|
||||
seawater105 = get_collection("fangjia", "district_stat",'mongo.db.fangjia.com', 27017)
|
||||
for err_count in range(0, 2):
|
||||
|
||||
try:
|
||||
# print('flag3')
|
||||
lt = seawater105.count(query)
|
||||
|
||||
pos = list(seawater105.find(query).limit(lt))
|
||||
data = pandas.DataFrame(pos)
|
||||
del pos
|
||||
# print("==================>", time.time() - s)
|
||||
return data
|
||||
|
||||
except:
|
||||
|
||||
# err_count = err_count + 1
|
||||
lt = seawater105.count(query)
|
||||
pos = list(seawater105.find(query).limit(lt))
|
||||
data = pandas.DataFrame(pos)
|
||||
del pos
|
||||
return data
|
||||
|
||||
raise Exception("yang ben cha xun shi bai1")
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user