修改: PriceSystem/fangjia/__init__.py

修改:     PriceSystem/feature/region_feature.py
	修改:     PriceSystem/rent_price/district_map0413.py
	修改:     PriceSystem/rent_test.py
This commit is contained in:
罗干
2018-05-05 17:49:26 +08:00
parent 753b54db7c
commit 6ce1075d29
4 changed files with 37 additions and 24 deletions
+32 -21
View File
@@ -151,7 +151,7 @@ def send_ding_msg(msg):
@timer
def findHouse(query, fields=None):
seawater105 = get_collection("fangjia", "seawater", config.get_seawater_host(), 27777)
for err_count in range(0, 10):
for err_count in range(0, 2):
try:
@@ -218,7 +218,7 @@ def find_house_from_elastic_search(city, region, alias, roots=None, pdate=None,
def find_sample_pool(query, fields=None):
# s = time.time()
seawater105 = get_collection("fangjia", "seawater", config.get_seawater_host(), 27777)
for err_count in range(0, 10):
for err_count in range(0, 2):
try:
@@ -250,7 +250,7 @@ def find_disanganf_price(query, fields=None):
# dsf = db1.average_statistics
# s = time.time()
seawater105 = get_collection("fangjia", "average_statistics",'mongo.db.fangjia.com', 27017)
for err_count in range(0, 10):
for err_count in range(0, 2):
try:
# print('flag3')
@@ -280,7 +280,7 @@ def dis_feature(query, fields=None):
# dsf = db1.average_statistics
# s = time.time()
seawater105 = get_collection("fangjia_stat", "district_feature", 'mongo.db.fangjia.com', 27017)
for err_count in range(0, 10):
for err_count in range(0, 2):
try:
# print('flag4')
@@ -312,7 +312,7 @@ def find_seaweed(query, fields=None):
# seaweed1 = db1.seaweed
# s = time.time()
seawater105 = get_collection("fangjia", "seaweed", config.get_seaweed_host(), 27017)
for err_count in range(0, 10):
for err_count in range(0,2):
try:
# print('flag5')
@@ -342,7 +342,7 @@ def find_region_district_list_name(query, fields=None):
# db1 = client1.fangjia
# seaweed1 = db1.seaweed
seawater105 = get_collection("fangjia", "seaweed", 'mongo.db.fangjia.com', 27017)
for err_count in range(0, 10):
for err_count in range(0, 2):
try:
@@ -368,7 +368,7 @@ def find_region_district_list_name(query, fields=None):
def rent_sample(query, fields):
# s = time.time()
seawater105 = get_collection("fangjia", "seawater", config.get_seawater_host(), 27777)
for err_count in range(0, 10):
for err_count in range(0, 2):
try:
# lt = seawater105.count(query)
@@ -402,7 +402,7 @@ def rent_disanganf_series(query, fields):
# s = time.time()
seawater105 = get_collection("fangjia", "district_stat", 'mongo.db.fangjia.com', 27017)
for err_count in range(0, 10):
for err_count in range(0, 2):
try:
@@ -410,30 +410,41 @@ def rent_disanganf_series(query, fields):
#print(pos)
data1=pandas.DataFrame(pos)
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
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()
except:
# print('flag2')
pos=list(seawater105.find(query,fields))
data1=pandas.DataFrame(pos)
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
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()
raise Exception("样本查询失败!")
def rent_region_feature(query, fields):
rf = get_collection("fangjia", config.get_sqm_rentprice_db(), 'mongo.db.fangjia.com', 27017)
#client182 = pymongo.MongoClient('192.168.10.182',27017)
#db182 = client182.fangjia_stat.rent_1221
for err_count in range(0, 10):
for err_count in range(0, 2):
try:
pos=list(rf.find(query,fields))