diff --git a/PriceSystem/config/__init__.py b/PriceSystem/config/__init__.py index 32bb56b..29331ed 100644 --- a/PriceSystem/config/__init__.py +++ b/PriceSystem/config/__init__.py @@ -1,5 +1,5 @@ def get_worker_num(): - return 15 + return 20 def get_redis_host(): @@ -44,3 +44,11 @@ def get_timeout(): def get_seawater_host(): return "seawater.db.fangjia.com" + + +def get_seaweed_host(): + return "192.168.10.182" + + +def get_seaweed_port(): + return 27017 diff --git a/PriceSystem/fangjia/__init__.py b/PriceSystem/fangjia/__init__.py index 4010e49..b4350b4 100644 --- a/PriceSystem/fangjia/__init__.py +++ b/PriceSystem/fangjia/__init__.py @@ -267,13 +267,17 @@ def find_disanganf_price(query, fields=None): raise Exception("yang ben cha xun shi bai1") - +@timer def dis_feature(query, fields=None): # client1 = pymongo.MongoClient('192.168.0.136',27017) # db1 = client1.fangjia # dsf = db1.average_statistics # s = time.time() +<<<<<<< HEAD seawater105 = get_collection("fangjia_stat", "district_feature",config.get_mongodb_host(), 27017) +======= + seawater105 = get_collection("fangjia_stat", "district_feature", config.get_mongodb_host(), config.get_mongodb_port()) +>>>>>>> 09017dda8ec82bf1b4eea67648f8c33417df32f7 for err_count in range(0, 10): try: @@ -297,7 +301,7 @@ def dis_feature(query, fields=None): raise Exception("yang ben cha xun shi bai1") - +@timer def find_seaweed(query, fields=None): # dirlt=p[0] @@ -305,24 +309,20 @@ def find_seaweed(query, fields=None): # db1 = client1.fangjia # seaweed1 = db1.seaweed # s = time.time() - seawater105 = get_collection("fangjia", "seaweed", "192.168.0.136", 27017) + seawater105 = get_collection("fangjia", "seaweed", config.get_seaweed_host(), config.get_seaweed_port()) for err_count in range(0, 10): try: # print('flag5') - lt = seawater105.count(query) - pos = list(seawater105.find(query).limit(lt)) + pos = list(seawater105.find(query)) 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)) + pos = list(seawater105.find(query)) data = pandas.DataFrame(pos) del pos return data @@ -335,7 +335,7 @@ def find_region_district_list_name(query, fields=None): # client1 = pymongo.MongoClient('192.168.0.136',27017) # db1 = client1.fangjia # seaweed1 = db1.seaweed - seawater105 = get_collection("fangjia", "seaweed", "192.168.0.136", 27017) + seawater105 = get_collection("fangjia", "seaweed", config.get_seaweed_host(), config.get_seaweed_port()) for err_count in range(0, 10): try: diff --git a/PriceSystem/sell_price/zhuge0118A.py b/PriceSystem/sell_price/zhuge0118A.py index 6236866..ba9e156 100644 --- a/PriceSystem/sell_price/zhuge0118A.py +++ b/PriceSystem/sell_price/zhuge0118A.py @@ -129,7 +129,7 @@ def commonprice(ct, rl, p): # client1 = pymongo.MongoClient('192.168.0.136',27017) # db1 = client1.fangjia # seaweed1 = db1.seaweed - seaweed136 = fangjia.get_collection("fangjia", "seaweed", '192.168.0.136', 27017) + seaweed136 = fangjia.get_collection("fangjia", "seaweed", config.get_seaweed_host(), 27017) query1 = {"status": 0, "cat": "district", "city": ct, "region": rl, "name": dirlt} diff --git a/PriceSystem/test.py b/PriceSystem/test.py index 6b19045..890f666 100644 --- a/PriceSystem/test.py +++ b/PriceSystem/test.py @@ -34,18 +34,24 @@ rl = '海珠' lk = '会展世界城三期' ''' #成都- 都江堰- 溪岭雪#上海徐汇 灞桥沁水新城百汇园西 安 未央 兴乐园 弘和美邻馆 雁塔鸿景花园上海 奉贤 万隆花苑# +<<<<<<< HEAD ct='洛阳' rl='涧西' lk='奥阳康城' +======= +ct='北海' +rl='银海' +lk='汇景公寓' +>>>>>>> 09017dda8ec82bf1b4eea67648f8c33417df32f7 #成都双流长滩一号 上海 奉贤 朝阳新村##上海 奉贤 棕榈滩别墅深圳龙岗丽皇阁 #洛阳涧西奥阳康城 #未央 -weekend = datetime.datetime.strptime("2018-03-25", "%Y-%m-%d") +weekend = datetime.datetime.strptime("2018-04-01", "%Y-%m-%d") #for i in range(0, 100): -sellPrice.out_put_price(ct, rl, lk, fangjia.get_weekend()) +sellPrice.out_put_price(ct, rl, lk, weekend) e = time.time() print(e - s)