diff --git a/PriceSystem/fangjia/__init__.py b/PriceSystem/fangjia/__init__.py index 6867b9d..4010e49 100644 --- a/PriceSystem/fangjia/__init__.py +++ b/PriceSystem/fangjia/__init__.py @@ -243,7 +243,7 @@ def find_disanganf_price(query, fields=None): # db1 = client1.fangjia # dsf = db1.average_statistics # s = time.time() - seawater105 = get_collection("fangjia", "average_statistics", "192.168.0.136", 27017) + seawater105 = get_collection("fangjia", "average_statistics", config.get_mongodb_host(), 27017) for err_count in range(0, 10): try: @@ -273,7 +273,7 @@ def dis_feature(query, fields=None): # db1 = client1.fangjia # dsf = db1.average_statistics # s = time.time() - seawater105 = get_collection("fangjia_stat", "district_feature", "192.168.0.136", 27017) + seawater105 = get_collection("fangjia_stat", "district_feature",config.get_mongodb_host(), 27017) for err_count in range(0, 10): try: diff --git a/PriceSystem/sell_price/zhuge0118A.py b/PriceSystem/sell_price/zhuge0118A.py index e0a189f..6236866 100644 --- a/PriceSystem/sell_price/zhuge0118A.py +++ b/PriceSystem/sell_price/zhuge0118A.py @@ -1182,67 +1182,6 @@ def commonprice(ct, rl, p): return neighb[0], float('%.2f' % credit['0.5']), value_type['周边楼盘'], neighb[1] -client65 = pymongo.MongoClient('192.168.0.105', 27777) -db65 = client65.fangjia -seawater65 = db65.seawater - -client136 = pymongo.MongoClient('192.168.0.136', 27017) -db136 = client136.fangjia -dsf136 = db136.average_statistics -seaweed136 = db136.seaweed - -dsf = db136.district_stat - - -# client136 = pymongo.MongoClient('192.168.0.136',27017) -# db136 = client136.fangjia - - -def region_district_list(ct, rl): - # import pandas - # client1 = pymongo.MongoClient('192.168.0.136',27017) - # db1 = client1.fangjia - # seaweed1 = db1.seaweed - - query1 = {"status": 0, "cat": "district", "city": ct, "region": rl} - fields1 = {"lat2": 1, "lng2": 1, "city": 1, "region": 1, - "cat": 1, "name": 1, 'estate_type2': 1, 'alias': 1} - - # lct= list(seaweed136.find(query1, fields1)) - # lf=pandas.DataFrame(lct) - lf = fangjia.find_seaweed(query1, fields1) - return lf - - -def city_list(): - # client = pymongo.MongoClient('192.168.0.136',27017) #'192.168.0.65',27777 - # db = client.fangjia - city = db136.server_area - # seawater.find_one() - - pos = city.find({"display": {"$ne": "全国"}}, - {"display": 1, "city_grade": 1, "_id": 1}).sort([("city_grade", 1), ("_id", 1)]) - - data = pandas.DataFrame(list(pos)) - # print(data) - return data['display'] - - -# print(some_district_information()) - - -def region_list(city): - # client = pymongo.MongoClient('192.168.0.136',27017) - # db = client.fangjia - region = db136.region_block - # seawater.find_one() - query = {"city": city, "category": "region"} - fields1 = {"name": 1} - pos = list(region.find(query, fields1)) - - data = pandas.DataFrame(pos) - return data['name'] - def add_alias(ppd): if 'alias' not in ppd.columns: @@ -1308,7 +1247,7 @@ def make_up_price(ct, rl, lk, weekend): ly = last_sunday(weekend) # stat= fangjia.get_collection("fangjia_stat","test_lg5", '192.168.0.136',27017) - stat = dsf + #stat = stat query = {"city": ct, "region": rl, "district_name": lk, 'weekend': ly } @@ -1337,7 +1276,7 @@ def make_up_price(ct, rl, lk, weekend): else: # stat= fangjia.get_collection("fangjia_stat","test_lg5", '192.168.0.136',27017) - stat = dsf + query = {"city": ct, "region": rl, "district_name": lk, 'weekend': last_sunday } diff --git a/PriceSystem/test.py b/PriceSystem/test.py index e37f9e9..6b19045 100644 --- a/PriceSystem/test.py +++ b/PriceSystem/test.py @@ -34,11 +34,11 @@ rl = '海珠' lk = '会展世界城三期' ''' #成都- 都江堰- 溪岭雪#上海徐汇 灞桥沁水新城百汇园西 安 未央 兴乐园 弘和美邻馆 雁塔鸿景花园上海 奉贤 万隆花苑# -ct='深圳' -rl='龙岗' -lk='丽皇阁' +ct='洛阳' +rl='涧西' +lk='奥阳康城' #成都双流长滩一号 上海 奉贤 朝阳新村##上海 奉贤 棕榈滩别墅深圳龙岗丽皇阁 - +#洛阳涧西奥阳康城 #未央