From 7b1e490e275f731b34913c12771a9f1c653fdd61 Mon Sep 17 00:00:00 2001 From: "wangwenyan@fangjia.com" Date: Sun, 17 Jun 2018 11:01:45 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E9=87=8D=E7=AE=97=E5=9D=87=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PriceSystem/CalcCmdSender.py | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/PriceSystem/CalcCmdSender.py b/PriceSystem/CalcCmdSender.py index 4d9bee0..b639f66 100644 --- a/PriceSystem/CalcCmdSender.py +++ b/PriceSystem/CalcCmdSender.py @@ -32,11 +32,24 @@ def get_district(city): keys = {"city": 1, "region": 1, "name": 1, "_id": 0} for dis in fangjia.get_collection("fangjia", "seaweed", config.get_seaweed_host()).find({"cat": "district", "status": 0, "city": city}, keys): dis["weekend"] = weekend - seaweeds.append(dis) - + if not has_price(dis.city, dis.region, dis.name): + seaweeds.append(dis) + else: + logger.info(str(dis) + "放弃") return seaweeds +def has_price(city, region, name): + weekend = fangjia.get_weekend() + district_stat = fangjia.get_collection("fangjia", "district_stat", config.get_district_stat_host(), config.get_district_stat_port()) + query = { + "city": city, + "region": region, + "district_name": name, + "weekend": weekend + } + return district_stat.find_one(query) is not None + def send_cmd(seaweed): json_cmd = json.dumps(seaweed, ensure_ascii=False, cls=CJsonEncoder) client.rpush(QUEUE, json_cmd) From 5452cd655f81c7337abc573ba746d63b8210cae1 Mon Sep 17 00:00:00 2001 From: "wangwenyan@fangjia.com" Date: Sun, 17 Jun 2018 11:13:45 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AE=97=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PriceSystem/CalcCmdSender.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/PriceSystem/CalcCmdSender.py b/PriceSystem/CalcCmdSender.py index b639f66..699406b 100644 --- a/PriceSystem/CalcCmdSender.py +++ b/PriceSystem/CalcCmdSender.py @@ -41,7 +41,8 @@ def get_district(city): def has_price(city, region, name): weekend = fangjia.get_weekend() - district_stat = fangjia.get_collection("fangjia", "district_stat", config.get_district_stat_host(), config.get_district_stat_port()) + district_stat = fangjia.get_collection("fangjia", "district_stat", config.get_district_stat_host(), + config.get_district_stat_port()) query = { "city": city, "region": region, @@ -50,6 +51,7 @@ def has_price(city, region, name): } return district_stat.find_one(query) is not None + def send_cmd(seaweed): json_cmd = json.dumps(seaweed, ensure_ascii=False, cls=CJsonEncoder) client.rpush(QUEUE, json_cmd) From 8467be7c1fc5a1f1fa2d88d21f3b9ce9dc9adc31 Mon Sep 17 00:00:00 2001 From: "wangwenyan@fangjia.com" Date: Sun, 17 Jun 2018 11:46:40 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PriceSystem/CalcCmdSender.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PriceSystem/CalcCmdSender.py b/PriceSystem/CalcCmdSender.py index 699406b..7a4d472 100644 --- a/PriceSystem/CalcCmdSender.py +++ b/PriceSystem/CalcCmdSender.py @@ -32,7 +32,7 @@ def get_district(city): keys = {"city": 1, "region": 1, "name": 1, "_id": 0} for dis in fangjia.get_collection("fangjia", "seaweed", config.get_seaweed_host()).find({"cat": "district", "status": 0, "city": city}, keys): dis["weekend"] = weekend - if not has_price(dis.city, dis.region, dis.name): + if not has_price(dis["city"], dis["region"], dis['name']): seaweeds.append(dis) else: logger.info(str(dis) + "放弃") From 5c97ce11465c014ec09333e7a4a120e84999aeea Mon Sep 17 00:00:00 2001 From: "wangwenyan@fangjia.com" Date: Sun, 17 Jun 2018 12:19:58 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PriceSystem/CalcCmdSender.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PriceSystem/CalcCmdSender.py b/PriceSystem/CalcCmdSender.py index 7a4d472..9bb2632 100644 --- a/PriceSystem/CalcCmdSender.py +++ b/PriceSystem/CalcCmdSender.py @@ -32,7 +32,7 @@ def get_district(city): keys = {"city": 1, "region": 1, "name": 1, "_id": 0} for dis in fangjia.get_collection("fangjia", "seaweed", config.get_seaweed_host()).find({"cat": "district", "status": 0, "city": city}, keys): dis["weekend"] = weekend - if not has_price(dis["city"], dis["region"], dis['name']): + if "region" in dis and not has_price(dis["city"], dis["region"], dis['name']): seaweeds.append(dis) else: logger.info(str(dis) + "放弃") From fa997f3f5b6b97ccf4c6742543d810e4b0372205 Mon Sep 17 00:00:00 2001 From: "wangwenyan@fangjia.com" Date: Sun, 17 Jun 2018 19:05:23 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9D=87=E4=BB=B7?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E8=BF=9B=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PriceSystem/config/__init__.py | 2 +- PriceSystem/sell_price/.zhuge0118A.py.swo | Bin 16384 -> 0 bytes PriceSystem/sell_price/.zhuge0118A.py.swp | Bin 32768 -> 0 bytes 3 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 PriceSystem/sell_price/.zhuge0118A.py.swo delete mode 100644 PriceSystem/sell_price/.zhuge0118A.py.swp diff --git a/PriceSystem/config/__init__.py b/PriceSystem/config/__init__.py index 16be5f6..20e21a6 100644 --- a/PriceSystem/config/__init__.py +++ b/PriceSystem/config/__init__.py @@ -3,7 +3,7 @@ def get_worker_num(): 获取进行均价计算的进程数 :return: """ - return 20 + return 40 diff --git a/PriceSystem/sell_price/.zhuge0118A.py.swo b/PriceSystem/sell_price/.zhuge0118A.py.swo deleted file mode 100644 index 5234bc0201ad0e2df83d04a4c2a7dc5010a62786..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16384 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 diff --git a/PriceSystem/sell_price/.zhuge0118A.py.swp b/PriceSystem/sell_price/.zhuge0118A.py.swp deleted file mode 100644 index f98eca9e6ad8ad556101fa133d125578ecabf4d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32768 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