diff --git a/PriceSystem/config/__init__.py b/PriceSystem/config/__init__.py index 4e4b19a..ebade19 100644 --- a/PriceSystem/config/__init__.py +++ b/PriceSystem/config/__init__.py @@ -65,7 +65,7 @@ def get_65_host(): return 'seawater65.mongo.com' def get_sqm_rentprice_db(): - return "rent_region_feature1" + return "sqmetre_rent" def get_lg_mongo(): return 'luogan.mongo.com' diff --git a/PriceSystem/fangjia/__init__.py b/PriceSystem/fangjia/__init__.py index 0ca9f54..20e462f 100644 --- a/PriceSystem/fangjia/__init__.py +++ b/PriceSystem/fangjia/__init__.py @@ -56,12 +56,12 @@ def timer(func): arg_list = list() for arg in args: arg_list.append(str(arg)) -<<<<<<< HEAD + performance_logger.info("函数名:%-20s\t耗时:%7.4f\t\t参数:(%s)" % (func.__name__, end - begin, arg_list)) -======= + if elapsed > config.get_timeout(): performance_logger.info("函数名:%-20s\t耗时:%7.4f\t\t参数:(%s)" % (func.__name__, end - begin, arg_list)) ->>>>>>> e3a1832f8bd0e1fa8d774d73005729d3c862b083 + return rs return _timer @@ -249,7 +249,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",'mongo.db.fangjia.com', 27017) for err_count in range(0, 10): try: @@ -279,7 +279,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", 'mongo.db.fangjia.com', 27017) for err_count in range(0, 10): try: @@ -311,7 +311,7 @@ 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", 'mongo.db.fangjia.com', 27017) for err_count in range(0, 10): try: @@ -341,7 +341,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", 'mongo.db.fangjia.com', 27017) for err_count in range(0, 10): try: @@ -401,7 +401,7 @@ def rent_sample(query, fields): def rent_disanganf_series(query, fields): # s = time.time() - seawater105 = get_collection("fangjia", "district_stat", '192.168.0.136', 27017) + seawater105 = get_collection("fangjia", "district_stat", 'mongo.db.fangjia.com', 27017) for err_count in range(0, 10): try: @@ -430,7 +430,7 @@ def rent_disanganf_series(query, fields): raise Exception("样本查询失败!") def rent_region_feature(query, fields): - rf = get_collection("fangjia_stat", config.get_sqm_rentprice_db(), '192.168.0.136', 27017) + rf = get_collection("fangjia", config.get_sqm_rentprice_db(), 'mongo.db.fangjia.com', 27017) #client182 = pymongo.MongoClient('192.168.10.182',27017) #db182 = client182.fangjia_stat.rent_1221 for err_count in range(0, 10): diff --git a/PriceSystem/feature/__pycache__/region_feature.cpython-36.pyc b/PriceSystem/feature/__pycache__/region_feature.cpython-36.pyc index b3dbe24..50d0ae4 100644 Binary files a/PriceSystem/feature/__pycache__/region_feature.cpython-36.pyc and b/PriceSystem/feature/__pycache__/region_feature.cpython-36.pyc differ diff --git a/PriceSystem/feature/region_feature.py b/PriceSystem/feature/region_feature.py index be42ef0..6a0a11f 100644 --- a/PriceSystem/feature/region_feature.py +++ b/PriceSystem/feature/region_feature.py @@ -274,7 +274,7 @@ def before_month_lastday(ti,num): def region_make_up_price(ct,rl,lk,ti): - lgg=fangjia.get_collection("fangjia_stat",config.get_sqm_rentprice_db(), config.get_mongodb_host(),27017) + lgg=fangjia.get_collection("fangjia",config.get_sqm_rentprice_db(), config.get_mongodb_host(),27017) #save_lg=client136.fangjia_stat.test_lg5 cc=before_month_lastday(ti,32) @@ -390,7 +390,7 @@ def save_region_feature(ct,rl,timd,timm): avg=region_feature[1] if type(avg)!=str: avg=float(avg) - save_lg = fangjia.get_collection("fangjia_stat",config.get_sqm_rentprice_db(), config.get_mongodb_host(),27017) + save_lg = fangjia.get_collection("fangjia",config.get_sqm_rentprice_db(), config.get_mongodb_host(),27017) save_lg.replace_one( diff --git a/PriceSystem/fix/__pycache__/price_fix.cpython-36.pyc b/PriceSystem/fix/__pycache__/price_fix.cpython-36.pyc index 6fde09d..8d548b2 100644 Binary files a/PriceSystem/fix/__pycache__/price_fix.cpython-36.pyc and b/PriceSystem/fix/__pycache__/price_fix.cpython-36.pyc differ diff --git a/PriceSystem/test.py b/PriceSystem/test.py index e62b895..9e8d570 100644 --- a/PriceSystem/test.py +++ b/PriceSystem/test.py @@ -21,12 +21,12 @@ s = time.time() ct='上海' -rl='黄浦' -lk='伯爵居'#杨浦凤城四村闵行上海康城厦门同安大唐世家二期青岛市北东方小区合肥庐阳海亮红玺台青岛市北东方小区 +rl='闵行' +lk='虹凯小区'#杨浦凤城四村闵行上海康城厦门同安大唐世家二期青岛市北东方小区合肥庐阳海亮红玺台青岛市北东方小区 #深圳龙岗浪背村宝安吉祥公寓门头沟 泷悦长安北京上海闵行金盛小区江苏昆山象屿珑庭 -#for i in range(0, 100):深圳福田世纪豪庭北京海淀前沙涧襄阳樊城国色天襄 +#for i in range(0, 100):深圳福田世纪豪庭北京海淀前沙涧襄阳樊城国色天襄上海闵行虹凯小区 #北区济南章丘朝阳南区上海奉贤嘉安公寓 sellPrice.out_put_price(ct, rl, lk, weekend)