From 5c47775ed35210d989684a84b39a5b7958aef7f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BD=97=E5=B9=B2?= Date: Tue, 3 Apr 2018 17:35:13 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=09=E4=BF=AE=E6=94=B9=EF=BC=9A=20=20=20=20?= =?UTF-8?q?=20PriceSystem/fangjia/=5F=5Finit=5F=5F.py=20=09=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=9A=20=20=20=20=20PriceSystem/sell=5Fprice/zhuge?= =?UTF-8?q?0118A.py=20:=09=E4=BF=AE=E6=94=B9=EF=BC=9A=20=20=20=20=20PriceS?= =?UTF-8?q?ystem/test.py?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PriceSystem/fangjia/__init__.py | 5 +++-- PriceSystem/sell_price/zhuge0118A.py | 8 ++++++-- PriceSystem/test.py | 8 ++++---- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/PriceSystem/fangjia/__init__.py b/PriceSystem/fangjia/__init__.py index 697768d..cca38b5 100644 --- a/PriceSystem/fangjia/__init__.py +++ b/PriceSystem/fangjia/__init__.py @@ -25,7 +25,7 @@ def get_logger(name): file_handler = logging.FileHandler("/home/goojia/logs/" + name + ".log") file_handler.setFormatter(formatter) logger.addHandler(file_handler) - logger.setLevel("INFO") + logger.setLevel("ERROR") return logger @@ -39,7 +39,7 @@ def get_performance_logger(name): file_handler = logging.FileHandler("/home/goojia/logs/" + name + ".performance.log") file_handler.setFormatter(formatter) logger.addHandler(file_handler) - logger.setLevel("INFO") + logger.setLevel("ERROR") return logger now = datetime.datetime.now().replace(hour=0, minute=0, second=0, microsecond=0) @@ -274,6 +274,7 @@ def dis_feature(query, fields=None): # dsf = db1.average_statistics # s = time.time() seawater105 = get_collection("fangjia_stat", "district_feature", config.get_mongodb_host(), config.get_mongodb_port()) + #seawater105 = get_collection("luogan", "district_feature", '192.168.0.136',27017) for err_count in range(0, 10): diff --git a/PriceSystem/sell_price/zhuge0118A.py b/PriceSystem/sell_price/zhuge0118A.py index e6203bb..5c81058 100644 --- a/PriceSystem/sell_price/zhuge0118A.py +++ b/PriceSystem/sell_price/zhuge0118A.py @@ -508,7 +508,7 @@ def commonprice(ct, rl, p): dd = neighbor(location['lng2'].iloc[0], location['lat2'].iloc[0], 5, ct, rl, p) # print(time.time()-t1,'t1'*10) - # print('dd=',dd,'dd'*20) + #print('dd=',dd,'dd'*20) if dd.shape[0] >= factor: # print('$'*50) # dd1=neighbor(location['lng2'][0],location['lat2'][0],5) @@ -916,7 +916,7 @@ def commonprice(ct, rl, p): bl = ['anjuke_esf_price', 'soufang_esf_price', 'tuboshi_esf_price', - 'ganji_esf_price' + ] # ppd3dp=ppd3['total_price'].dropna() @@ -1449,3 +1449,7 @@ def out_put_price(ct, rl, lk, weekend): }, True ) ''' + + + + diff --git a/PriceSystem/test.py b/PriceSystem/test.py index 4342a2f..d9683ad 100644 --- a/PriceSystem/test.py +++ b/PriceSystem/test.py @@ -37,11 +37,11 @@ lk = '会展世界城三期' """ ct='洛阳' rl='涧西' -lk='奥阳康城' +lk='奥阳康城'上海浦东龚家阁龚家花园绍兴越城辕门新村南区亨纳斯花园杨浦 """ -ct='北海' -rl='银海' -lk='汇景公寓' +ct='上海' +rl='杨浦' +lk='亨纳斯花园' #成都双流长滩一号 上海 奉贤 朝阳新村##上海 奉贤 棕榈滩别墅深圳龙岗丽皇阁 #洛阳涧西奥阳康城 From 0f0d03aa79974a5e047a2cc0c90221c3529eb8eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BD=97=E5=B9=B2?= Date: Wed, 4 Apr 2018 11:18:12 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=09=E4=BF=AE=E6=94=B9=EF=BC=9A=20=20=20=20?= =?UTF-8?q?=20PriceSystem/fangjia/=5F=5Finit=5F=5F.py?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PriceSystem/CalcCmdSender.py | 2 +- PriceSystem/fangjia/__init__.py | 4 ++-- PriceSystem/ones_Sender.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/PriceSystem/CalcCmdSender.py b/PriceSystem/CalcCmdSender.py index 671bfa6..2d7d9c5 100644 --- a/PriceSystem/CalcCmdSender.py +++ b/PriceSystem/CalcCmdSender.py @@ -77,7 +77,7 @@ def send_city_calc_cmd(): save_city_calc_command(city, None, weekend) -def district_calc_cmd_finish(): +def district_calc_cimport redismd_finish(): count = client.llen(QUEUE) if count == 0: return True diff --git a/PriceSystem/fangjia/__init__.py b/PriceSystem/fangjia/__init__.py index cca38b5..05a81ca 100644 --- a/PriceSystem/fangjia/__init__.py +++ b/PriceSystem/fangjia/__init__.py @@ -25,7 +25,7 @@ def get_logger(name): file_handler = logging.FileHandler("/home/goojia/logs/" + name + ".log") file_handler.setFormatter(formatter) logger.addHandler(file_handler) - logger.setLevel("ERROR") + logger.setLevel("INFO") return logger @@ -39,7 +39,7 @@ def get_performance_logger(name): file_handler = logging.FileHandler("/home/goojia/logs/" + name + ".performance.log") file_handler.setFormatter(formatter) logger.addHandler(file_handler) - logger.setLevel("ERROR") + logger.setLevel("INFO") return logger now = datetime.datetime.now().replace(hour=0, minute=0, second=0, microsecond=0) diff --git a/PriceSystem/ones_Sender.py b/PriceSystem/ones_Sender.py index 9b45e6a..3da3a88 100644 --- a/PriceSystem/ones_Sender.py +++ b/PriceSystem/ones_Sender.py @@ -42,7 +42,7 @@ def get_weekend(tt): if __name__ == "__main__": weekend = "" #send_cmd({"city": "西安", "region": "雁塔", "name": "鸿景花园", "weekend": get_weekend('20180325')}) - send_cmd({"city": "西安", "region": "雁塔", "name": "鸿景花园", "weekend": get_weekend('20180325')}) + send_cmd({"city": "绍兴", "region": "越城", "name": "辕门新村南区", "weekend": get_weekend('20180401')}) #sys.exit(0)