From 0db1b7f07710cc25f85d104ce016540985e941b0 Mon Sep 17 00:00:00 2001 From: "wangwenyan@fangjia.com" Date: Mon, 2 Apr 2018 10:38:39 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PriceSystem/fangjia/__init__.py | 4 ++-- PriceSystem/test.py | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/PriceSystem/fangjia/__init__.py b/PriceSystem/fangjia/__init__.py index 6867b9d..276f69e 100644 --- a/PriceSystem/fangjia/__init__.py +++ b/PriceSystem/fangjia/__init__.py @@ -267,13 +267,13 @@ 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() - seawater105 = get_collection("fangjia_stat", "district_feature", "192.168.0.136", 27017) + seawater105 = get_collection("fangjia_stat", "district_feature", config.get_mongodb_host(), config.get_mongodb_port()) for err_count in range(0, 10): try: diff --git a/PriceSystem/test.py b/PriceSystem/test.py index e37f9e9..18091f9 100644 --- a/PriceSystem/test.py +++ b/PriceSystem/test.py @@ -34,18 +34,18 @@ rl = '海珠' lk = '会展世界城三期' ''' #成都- 都江堰- 溪岭雪#上海徐汇 灞桥沁水新城百汇园西 安 未央 兴乐园 弘和美邻馆 雁塔鸿景花园上海 奉贤 万隆花苑# -ct='深圳' -rl='龙岗' -lk='丽皇阁' +ct='北海' +rl='银海' +lk='汇景公寓' #成都双流长滩一号 上海 奉贤 朝阳新村##上海 奉贤 棕榈滩别墅深圳龙岗丽皇阁 #未央 -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) From 032557c5a3399a5e5f64dbf481050011fedd53bb Mon Sep 17 00:00:00 2001 From: "wangwenyan@fangjia.com" Date: Mon, 2 Apr 2018 11:23:19 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BF=9B=E7=A8=8B?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PriceSystem/config/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PriceSystem/config/__init__.py b/PriceSystem/config/__init__.py index 32bb56b..98f9075 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(): From 006bbc906494abc4ee4cd4336433dd774959c48e Mon Sep 17 00:00:00 2001 From: "wangwenyan@fangjia.com" Date: Mon, 2 Apr 2018 14:03:18 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=88=87=E8=8A=B1DB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PriceSystem/CalcCmdReceiver.py | 2 +- PriceSystem/config/__init__.py | 8 ++++++++ PriceSystem/fangjia/__init__.py | 14 +++++--------- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/PriceSystem/CalcCmdReceiver.py b/PriceSystem/CalcCmdReceiver.py index 722b11d..90f4bb1 100644 --- a/PriceSystem/CalcCmdReceiver.py +++ b/PriceSystem/CalcCmdReceiver.py @@ -18,7 +18,7 @@ def worker(): client = redis.Redis(connection_pool=redis_pool) while True: try: - cmd = client.lpop(QUEUE) + cmd = client.blpop(QUEUE, 60) except Exception as ex: cmd = None print(ex) diff --git a/PriceSystem/config/__init__.py b/PriceSystem/config/__init__.py index 98f9075..29331ed 100644 --- a/PriceSystem/config/__init__.py +++ b/PriceSystem/config/__init__.py @@ -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 276f69e..6918c50 100644 --- a/PriceSystem/fangjia/__init__.py +++ b/PriceSystem/fangjia/__init__.py @@ -297,7 +297,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 +305,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 +331,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: From fe6f3b2922e34e93a7c0d131f91fefad01fbc638 Mon Sep 17 00:00:00 2001 From: "wangwenyan@fangjia.com" Date: Mon, 2 Apr 2018 14:13:43 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PriceSystem/sell_price/zhuge0118A.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PriceSystem/sell_price/zhuge0118A.py b/PriceSystem/sell_price/zhuge0118A.py index e0a189f..a6a21c9 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} From 09017dda8ec82bf1b4eea67648f8c33417df32f7 Mon Sep 17 00:00:00 2001 From: "wangwenyan@fangjia.com" Date: Mon, 2 Apr 2018 14:21:34 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PriceSystem/CalcCmdReceiver.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PriceSystem/CalcCmdReceiver.py b/PriceSystem/CalcCmdReceiver.py index 90f4bb1..722b11d 100644 --- a/PriceSystem/CalcCmdReceiver.py +++ b/PriceSystem/CalcCmdReceiver.py @@ -18,7 +18,7 @@ def worker(): client = redis.Redis(connection_pool=redis_pool) while True: try: - cmd = client.blpop(QUEUE, 60) + cmd = client.lpop(QUEUE) except Exception as ex: cmd = None print(ex)