From 2f82a47b1744e27f9667181e6dba1348edfd3ef6 Mon Sep 17 00:00:00 2001 From: Administrator <admin@example.com> Date: 星期五, 07 六月 2024 18:20:55 +0800 Subject: [PATCH] 代码名称优化 --- code_attribute/gpcode_manager.py | 918 ++++++++++++++++++++++++++++++++++----------------------- 1 files changed, 544 insertions(+), 374 deletions(-) diff --git a/code_attribute/gpcode_manager.py b/code_attribute/gpcode_manager.py index 40ca2a9..c09906c 100644 --- a/code_attribute/gpcode_manager.py +++ b/code_attribute/gpcode_manager.py @@ -5,241 +5,384 @@ import time import constant -from db import redis_manager -from db.redis_manager import RedisUtils +from db import redis_manager_delegate as redis_manager +from db.mysql_data_delegate import Mysqldb +from db.redis_manager_delegate import RedisUtils +from log_module import log_export +from log_module.log import logger_pre_close_price from utils import tool import decimal from ths import l2_listen_pos_health_manager, client_manager __redisManager = redis_manager.RedisManager(0) +__db = 0 class CodesNameManager: - redisManager = redis_manager.RedisManager(0) - __gp_list_names_first_cache = [] - - @classmethod - def __get_redis(cls): - return cls.redisManager.getRedis() + __mysqldb = Mysqldb() + __code_name_dict = {} @classmethod def list_code_name_dict(cls): + # 鑾峰彇鎵�鏈夌殑浠g爜鍚嶇О瀵瑰簲琛� dict_ = {} - val = cls.list_first_code_name_dict() - if val is not None: - for k in val: - dict_[k] = val[k] - val = cls.list_second_code_name_dict() - if val is not None: - for k in val: - dict_[k] = val[k] + fresults = cls.__mysqldb.select_all("select code, code_name from code_name") + for result in fresults: + dict_[result[0]] = result[1] return dict_ @classmethod - def list_first_code_name_dict(cls): - val = RedisUtils.get(cls.__get_redis(), "gp_list_names_first") - if val is not None: - val = json.loads(val) - return val + def get_code_name(cls, code): + if code in cls.__code_name_dict: + return cls.__code_name_dict[code] + fresults = cls.__mysqldb.select_one(f"select code_name from code_name where code = {code}") + if fresults: + cls.__code_name_dict[code] = fresults[0] + return fresults[0] return None @classmethod - def list_first_code_name_dict_cache(cls): - val = RedisUtils.get(cls.__get_redis(), "gp_list_names_first") - if val is not None: - val = json.loads(val) - return val - return None - - @classmethod - def get_first_code_name(cls, code): - val = RedisUtils.get(cls.__get_redis(), "gp_list_names_first") - if not val: - return None - val = json.loads(val) - for k in val: - if val[k] == code: - return k - return None - - @classmethod - def get_first_name_code(cls, name): - val = RedisUtils.get(cls.__get_redis(), "gp_list_names_first") - if not val: - return None - val = json.loads(val) - return val.get(name) + def add_code_name(cls, code, name): + cls.__code_name_dict[code] = name + fresults = cls.__mysqldb.select_one(f"select code_name from code_name where code = {code}") + if fresults: + cls.__mysqldb.execute(f"update code_name set code_name ='{name}', update_time = now() where code= {code}") + else: + cls.__mysqldb.execute(f"insert into code_name(code,code_name,update_time ) values({code},'{name}',now())") @classmethod def add_first_code_name(cls, code, name): - val = RedisUtils.get(cls.__get_redis(), "gp_list_names_first") - if not val: - return None - val = json.loads(val) - val[name] = code - cls.set_first_code_names(val) - - # 璁剧疆棣栨澘浠g爜鍚嶇О - @classmethod - def set_first_code_names(cls, datas): - RedisUtils.set(cls.__get_redis(), "gp_list_names_first", json.dumps(datas)) - - # 鍒犻櫎棣栨澘浠g爜鍚嶇О - @classmethod - def clear_first_code_names(cls): - RedisUtils.delete(cls.__get_redis(), "gp_list_names_first") - - @classmethod - def list_second_code_name_dict(cls): - val = RedisUtils.get(cls.__get_redis(), "gp_list_names") - if val is not None: - val = json.loads(val) - return val - return None - - @classmethod - def get_second_code_name(cls, code): - val = RedisUtils.get(cls.__get_redis(), "gp_list_names") - if not val: - return None - val = json.loads(val) - for k in val: - if val[k] == code: - return k - - @classmethod - def get_second_name_code(cls, name): - val = RedisUtils.get(cls.__get_redis(), "gp_list_names") - if not val: - return None - val = json.loads(val) - return val.get(name) - - # 璁剧疆浜屾澘浠g爜鍚嶇О - @classmethod - def set_second_code_names(cls, datas): - RedisUtils.set(cls.__get_redis(), "gp_list_names", json.dumps(datas)) - - # 璁剧疆浜屾澘浠g爜鍚嶇О - @classmethod - def clear_second_code_names(cls): - RedisUtils.delete(cls.__get_redis(), "gp_list_names") + cls.add_code_name(code, name) # 棣栨澘浠g爜绠$悊 class FirstCodeManager: - redisManager = redis_manager.RedisManager(0) + __instance = None + __db = 0 - @classmethod - def __get_redis(cls): - return cls.redisManager.getRedis() + def __new__(cls, *args, **kwargs): + if not cls.__instance: + cls.__instance = super(FirstCodeManager, cls).__new__(cls, *args, **kwargs) + # 鍒濆鍖栬缃� + # 鑾峰彇浜ゆ槗绐楀彛鐨勯攣 + cls.__instance.redisManager = redis_manager.RedisManager(0) + cls.__instance.__first_code_record_cache = RedisUtils.smembers(cls.__instance.__get_redis(), + "first_code_record") + cls.__instance.__first_code_limited_up_record_cache = RedisUtils.smembers(cls.__instance.__get_redis(), + "first_code_limited_up_record") + return cls.__instance + + def __get_redis(self): + return self.redisManager.getRedis() # 鍔犲叆棣栨澘鍘嗗彶璁板綍 - @classmethod - def add_record(cls, codes): + def add_record(self, codes): + hasChanged = False for code in codes: - RedisUtils.sadd(cls.__get_redis(), "first_code_record", code) - RedisUtils.expire(cls.__get_redis(), "first_code_record", tool.get_expire()) + if code not in self.__first_code_record_cache: + RedisUtils.sadd_async(self.__db, "first_code_record", code) + hasChanged = True + self.__first_code_record_cache.add(code) + if hasChanged: + RedisUtils.expire_async(self.__db, "first_code_record", tool.get_expire()) - @classmethod - def is_in_first_record(cls, code): - if RedisUtils.sismember(cls.__get_redis(), "first_code_record", code): + def is_in_first_record(self, code): + if RedisUtils.sismember(self.__get_redis(), "first_code_record", code): return True else: return False + + def is_in_first_record_cache(self, code): + return code in self.__first_code_record_cache # 鍔犲叆棣栨澘娑ㄥ仠杩囦唬鐮侀泦鍚� - @classmethod - def add_limited_up_record(cls, codes): + def add_limited_up_record(self, codes): + hasChanged = False for code in codes: - RedisUtils.sadd(cls.__get_redis(), "first_code_limited_up_record", code) - RedisUtils.expire(cls.__get_redis(), "first_code_limited_up_record", tool.get_expire()) + if code not in self.__first_code_limited_up_record_cache: + RedisUtils.sadd_async(self.__db, "first_code_limited_up_record", code) + hasChanged = True + self.__first_code_limited_up_record_cache.add(code) + if hasChanged: + RedisUtils.expire_async(self.__db, "first_code_limited_up_record", tool.get_expire()) # 鏄惁娑ㄥ仠杩� - @classmethod - def is_limited_up(cls, code): - if RedisUtils.sismember(cls.__get_redis(), "first_code_limited_up_record", code): + def is_limited_up(self, code): + if RedisUtils.sismember(self.__get_redis(), "first_code_limited_up_record", code): return True else: return False + + def is_limited_up_cache(self, code): + return code in self.__first_code_limited_up_record_cache # 鎯宠涔扮殑浠g爜 class WantBuyCodesManager: + __instance = None redisManager = redis_manager.RedisManager(0) __redis_key = "want_buy_codes" + + def __new__(cls, *args, **kwargs): + if not cls.__instance: + cls.__instance = super(WantBuyCodesManager, cls).__new__(cls, *args, **kwargs) + # 鍒濆鍖栬缃� + # 鑾峰彇浜ゆ槗绐楀彛鐨勯攣 + cls.__instance.__want_buy_codes_cache = RedisUtils.smembers(cls.__get_redis(), + cls.__redis_key) + return cls.__instance + __want_buy_codes_cache = set() @classmethod def __get_redis(cls): return cls.redisManager.getRedis() - @classmethod - def clear(cls): - RedisUtils.delete(cls.__get_redis(), cls.__redis_key) + def clear(self): + RedisUtils.delete(self.__get_redis(), self.__redis_key) - @classmethod - def add_code(cls, code): - cls.__want_buy_codes_cache.add(code) - RedisUtils.sadd(cls.__get_redis(), cls.__redis_key, code) - RedisUtils.expire(cls.__get_redis(), cls.__redis_key, tool.get_expire()) + def add_code(self, code): + self.__want_buy_codes_cache.add(code) + RedisUtils.sadd(self.__get_redis(), self.__redis_key, code) + RedisUtils.expire(self.__get_redis(), self.__redis_key, tool.get_expire()) - @classmethod - def remove_code(cls, code): - cls.__want_buy_codes_cache.discard(code) - RedisUtils.srem(cls.__get_redis(), cls.__redis_key, code) + def remove_code(self, code): + self.__want_buy_codes_cache.discard(code) + RedisUtils.srem(self.__get_redis(), self.__redis_key, code) - @classmethod - def sync(cls): - cls.__want_buy_codes_cache.clear() - codes = RedisUtils.smembers(cls.__get_redis(), cls.__redis_key) + def sync(self): + codes = self.list_code() + self.__want_buy_codes_cache.clear() if codes: - cls.__want_buy_codes_cache += set(codes) + self.__want_buy_codes_cache |= set(codes) - @classmethod - def is_in(cls, code): - return RedisUtils.sismember(cls.__get_redis(), cls.__redis_key, code) + def is_in(self, code): + return RedisUtils.sismember(self.__get_redis(), self.__redis_key, code) - @classmethod - def is_in_cache(cls, code): - return code in cls.__want_buy_codes_cache + def is_in_cache(self, code): + return code in self.__want_buy_codes_cache - @classmethod - def list_code(cls): - return RedisUtils.smembers(cls.__get_redis(), cls.__redis_key) + def list_code(self): + return RedisUtils.smembers(self.__get_redis(), self.__redis_key) + + def list_code_cache(self): + return self.__want_buy_codes_cache # 鏆傚仠涓嬪崟浠g爜绠$悊 # 涓庨粦鍚嶅崟鐨勫尯鍒槸鏆傚仠浜ゆ槗浠g爜鍙槸涓嶄氦鏄擄紝涓嶈兘绉婚櫎L2鐩戞帶浣� class PauseBuyCodesManager: + __instance = None redisManager = redis_manager.RedisManager(0) __redis_key = "pause_buy_codes" + + def __new__(cls, *args, **kwargs): + if not cls.__instance: + cls.__instance = super(PauseBuyCodesManager, cls).__new__(cls, *args, **kwargs) + cls.__instance.__pause_buy_codes_cache = RedisUtils.smembers(cls.__get_redis(), + cls.__redis_key) + return cls.__instance @classmethod def __get_redis(cls): return cls.redisManager.getRedis() - @classmethod - def clear(cls): - RedisUtils.delete(cls.__get_redis(), cls.__redis_key) + def clear(self): + self.__pause_buy_codes_cache.clear() + RedisUtils.delete(self.__get_redis(), self.__redis_key) + + def sync(self): + data = RedisUtils.smembers(self.__get_redis(), + self.__redis_key) + self.__pause_buy_codes_cache.clear() + if data: + self.__pause_buy_codes_cache |= data + + def add_code(self, code): + self.__pause_buy_codes_cache.add(code) + RedisUtils.sadd(self.__get_redis(), self.__redis_key, code) + RedisUtils.expire(self.__get_redis(), self.__redis_key, tool.get_expire()) + + def remove_code(self, code): + self.__pause_buy_codes_cache.discard(code) + RedisUtils.srem(self.__get_redis(), self.__redis_key, code) + + def is_in(self, code): + return RedisUtils.sismember(self.__get_redis(), self.__redis_key, code) + + def is_in_cache(self, code): + return code in self.__pause_buy_codes_cache + + def list_code(self): + return RedisUtils.smembers(self.__get_redis(), self.__redis_key) + + def list_code_cache(self): + return self.__pause_buy_codes_cache + + +# 蹇呬拱鍗�/绾㈠悕鍗� +class MustBuyCodesManager: + __instance = None + __db = 0 + redisManager = redis_manager.RedisManager(0) + __redis_key = "must_buy_rate-" + __must_buy_code_cancel_rate_cache = {} + + def __new__(cls, *args, **kwargs): + if not cls.__instance: + cls.__instance = super(MustBuyCodesManager, cls).__new__(cls, *args, **kwargs) + keys = RedisUtils.keys(cls.__get_redis(), cls.__redis_key + "*") + for k in keys: + code = k.split("-")[-1] + val = RedisUtils.get(cls.__get_redis(), k) + cls.__must_buy_code_cancel_rate_cache[code] = round(float(val), 2) + return cls.__instance @classmethod - def add_code(cls, code): - RedisUtils.sadd(cls.__get_redis(), cls.__redis_key, code) - RedisUtils.expire(cls.__get_redis(), cls.__redis_key, tool.get_expire()) + def __get_redis(cls): + return cls.redisManager.getRedis() + + def clear(self): + self.__must_buy_code_cancel_rate_cache.clear() + keys = RedisUtils.keys(self.__get_redis(), self.__redis_key + "*") + for k in keys: + RedisUtils.delete(self.__get_redis(), k) + + def add_code(self, code, rate=0.9): + self.__must_buy_code_cancel_rate_cache[code] = round(rate, 2) + RedisUtils.setex_async(self.__db, self.__redis_key + str(code), tool.get_expire(), str(round(rate, 2))) + + def remove_code(self, code): + if code in self.__must_buy_code_cancel_rate_cache: + self.__must_buy_code_cancel_rate_cache.pop(code) + RedisUtils.delete_async(self.__db, self.__redis_key + str(code)) + + def is_in(self, code): + return RedisUtils.get(self.__get_redis(), self.__redis_key + str(code)) + + def is_in_cache(self, code): + return code in self.__must_buy_code_cancel_rate_cache + + def list_code(self): + codes = set() + keys = RedisUtils.keys(self.__get_redis(), self.__redis_key + "*") + if keys: + for k in keys: + code = k.split("-")[-1] + codes.add(code) + return codes + + def list_code_cache(self): + return self.__must_buy_code_cancel_rate_cache.keys() + + def get_cancel_rate_cache(self, code): + if code not in self.__must_buy_code_cancel_rate_cache: + return None + return self.__must_buy_code_cancel_rate_cache[code] + + +class WhiteListCodeManager: + __instance = None + __redis_manager = redis_manager.RedisManager(2) + + def __new__(cls, *args, **kwargs): + if not cls.__instance: + cls.__instance = super(WhiteListCodeManager, cls).__new__(cls, *args, **kwargs) + # 鍒濆鍖栬缃� + # 鑾峰彇浜ゆ槗绐楀彛鐨勯攣 + cls.__instance.__white_codes_cache = RedisUtils.smembers(cls.__get_redis(), "white_list_codes") + + return cls.__instance @classmethod - def remove_code(cls, code): - RedisUtils.srem(cls.__get_redis(), cls.__redis_key, code) + def __get_redis(cls): + return cls.__redis_manager.getRedis() + + def sync(self): + data = RedisUtils.smembers(self.__get_redis(), "white_list_codes") + self.__white_codes_cache.clear() + if data: + self.__white_codes_cache |= data + + def add_code(self, code): + self.__white_codes_cache.add(code) + RedisUtils.sadd(self.__get_redis(), "white_list_codes", code) + RedisUtils.expire(self.__get_redis(), "white_list_codes", tool.get_expire()) + + def remove_code(self, code): + self.__white_codes_cache.discard(code) + RedisUtils.srem(self.__get_redis(), "white_list_codes", code) + + def is_in(self, code): + return RedisUtils.sismember(self.__get_redis(), "white_list_codes", code) + + def is_in_cache(self, code): + return code in self.__white_codes_cache + + def list_codes(self): + return RedisUtils.smembers(self.__get_redis(), "white_list_codes") + + def list_codes_cache(self): + return self.__white_codes_cache + + def clear(self): + self.__white_codes_cache.clear() + RedisUtils.delete(self.__get_redis(), "white_list_codes") + + +class BlackListCodeManager: + __instance = None + __db = 2 + __redis_manager = redis_manager.RedisManager(2) + + def __new__(cls, *args, **kwargs): + if not cls.__instance: + cls.__instance = super(BlackListCodeManager, cls).__new__(cls, *args, **kwargs) + # 鍒濆鍖栬缃� + # 鑾峰彇浜ゆ槗绐楀彛鐨勯攣 + cls.__instance.__forbidden_trade_codes_cache = RedisUtils.smembers(cls.__get_redis(), + "forbidden-trade-codes") + + return cls.__instance @classmethod - def is_in(cls, code): - return RedisUtils.sismember(cls.__get_redis(), cls.__redis_key, code) + def __get_redis(cls): + return cls.__redis_manager.getRedis() - @classmethod - def list_code(cls): - return RedisUtils.smembers(cls.__get_redis(), cls.__redis_key) + def add_code(self, code): + self.__forbidden_trade_codes_cache.add(code) + RedisUtils.sadd_async(self.__db, "forbidden-trade-codes", code) + RedisUtils.expire_async(self.__db, "forbidden-trade-codes", tool.get_expire()) + + def sync(self): + data = RedisUtils.smembers(self.__get_redis(), + "forbidden-trade-codes") + self.__forbidden_trade_codes_cache.clear() + if data: + self.__forbidden_trade_codes_cache |= data + + def remove_code(self, code): + self.__forbidden_trade_codes_cache.discard(code) + RedisUtils.srem(self.__get_redis(), "forbidden-trade-codes", code) + + def is_in(self, code): + return RedisUtils.sismember(self.__get_redis(), "forbidden-trade-codes", code) + + def is_in_cache(self, code): + return code in self.__forbidden_trade_codes_cache + + def list_codes(self): + codes = RedisUtils.smembers(self.__get_redis(), "forbidden-trade-codes") + self.__forbidden_trade_codes_cache = codes + return codes + + def list_codes_cache(self): + return self.__forbidden_trade_codes_cache + + def clear(self): + self.__forbidden_trade_codes_cache.clear() + RedisUtils.delete(self.__get_redis(), "forbidden-trade-codes") def __parse_codes_data(code_datas): @@ -249,7 +392,7 @@ # 姝e父鐨勮偂绁� if _data["sec_type"] == 1 and _data["sec_level"] == 1: code = _data["symbol"].split(".")[1] - if code.find("30") != 0 and code.find("68") != 0: + if tool.is_can_buy_code(code): name = _data["sec_name"] codes.append(code) # 淇濆瓨浠g爜瀵瑰簲鐨勫悕绉� @@ -257,99 +400,97 @@ return codes, name_codes -# -------------------------------浜屾澘浠g爜绠$悊--------------------------------- - -def set_gp_list(code_datas): - codes, name_codes = __parse_codes_data(code_datas) - redis_instance = __redisManager.getRedis() - # 鍒犻櫎涔嬪墠鐨� - RedisUtils.delete(redis_instance, "gp_list") - CodesNameManager.clear_second_code_names() - for d in codes: - RedisUtils.sadd(redis_instance, "gp_list", d) - CodesNameManager.set_second_code_names(name_codes) - - -# 鏂板浠g爜 -def add_gp_list(code_datas): - if len(code_datas) > 200: - raise Exception("涓嶈兘瓒呰繃200涓暟鎹�") - redis_instance = __redisManager.getRedis() - codes, name_codes = __parse_codes_data(code_datas) - for d in codes: - RedisUtils.sadd(redis_instance, "gp_list", d) - old_name_codes = CodesNameManager.list_second_code_name_dict() - if old_name_codes is None: - old_name_codes = name_codes - else: - for key in name_codes: - old_name_codes[key] = name_codes[key] - CodesNameManager.set_second_code_names(old_name_codes) - - -__gp_list_first_codes_cache = set() - - # -------------------------------棣栨澘浠g爜绠$悊------------------------------- -# 娣诲姞棣栨澘浠g爜 -# code_datas 鎺橀噾杩斿洖鐨勬暟鎹� -def set_first_gp_codes_with_data(code_datas): - redis_instance = __redisManager.getRedis() - codes, name_codes = __parse_codes_data(code_datas) - codes_set = set() - for code in codes: - codes_set.add(code) - old_codes_set = __gp_list_first_codes_cache - if old_codes_set is None: - old_codes_set = set() - del_set = old_codes_set - codes_set - add_codes = codes_set - old_codes_set - for code in add_codes: - RedisUtils.sadd(redis_instance, "gp_list_first", code) - for code in del_set: - RedisUtils.srem(redis_instance, "gp_list_first", code) - if add_codes or del_set: - RedisUtils.expire(redis_instance, "gp_list_first", tool.get_expire()) - # 鏇存柊缂撳瓨 - __gp_list_first_codes_cache.clear() - for code in codes_set: - __gp_list_first_codes_cache.add(code) +class FirstGPCodesManager: + __db = 0 + __redisManager = redis_manager.RedisManager(0) + __gp_list_first_codes_cache = set() + __instance = None - old_name_codes = CodesNameManager.list_first_code_name_dict() - if old_name_codes is None: - old_name_codes = name_codes - else: - for key in name_codes: - old_name_codes[key] = name_codes[key] - CodesNameManager.set_first_code_names(old_name_codes) + def __new__(cls, *args, **kwargs): + if not cls.__instance: + cls.__instance = super(FirstGPCodesManager, cls).__new__(cls, *args, **kwargs) + cls.__load_datas() + return cls.__instance + @classmethod + def __get_redis(cls): + return cls.__redisManager.getRedis() -# 绉婚櫎棣栨澘浠g爜 -def remove_first_gp_code(codes): - redis_instance = __redisManager.getRedis() - for code in codes: - RedisUtils.srem(redis_instance, "gp_list_first", code) + @classmethod + def __load_datas(cls): + __redis = cls.__get_redis() + try: + cls.__gp_list_first_codes_cache = RedisUtils.smembers(__redis, "gp_list_first") + finally: + RedisUtils.realse(__redis) + @classmethod + def __parse_codes_data(cls, code_datas): + codes = [] + name_codes = {} + for _data in code_datas: + # 姝e父鐨勮偂绁� + if _data["sec_type"] == 1 and _data["sec_level"] == 1: + code = _data["symbol"].split(".")[1] + if tool.is_can_buy_code(code): + name = _data["sec_name"] + codes.append(code) + # 淇濆瓨浠g爜瀵瑰簲鐨勫悕绉� + name_codes[name] = code + return codes, name_codes -# 鑾峰彇棣栨澘浠g爜 -def get_first_gp_codes(): - redis_instance = __redisManager.getRedis() - return RedisUtils.smembers(redis_instance, "gp_list_first") + # 娣诲姞棣栨澘浠g爜 + # code_datas 鎺橀噾杩斿洖鐨勬暟鎹� + def set_first_gp_codes_with_data(self, code_datas): + try: + codes, name_codes = self.__parse_codes_data(code_datas) + codes_set = set() + for code in codes: + codes_set.add(code) + old_codes_set = self.__gp_list_first_codes_cache + if old_codes_set is None: + old_codes_set = set() + del_set = old_codes_set - codes_set + add_codes = codes_set - old_codes_set + for code in add_codes: + RedisUtils.sadd_async(self.__db, "gp_list_first", code, auto_free=False) + for code in del_set: + RedisUtils.srem_async(self.__db, "gp_list_first", code, auto_free=False) + if add_codes or del_set: + RedisUtils.expire_async(self.__db, "gp_list_first", tool.get_expire(), auto_free=False) + # 鏇存柊缂撳瓨 + self.__gp_list_first_codes_cache.clear() + self.__gp_list_first_codes_cache |= codes_set + for key in name_codes: + CodesNameManager.add_code_name(name_codes[key], key) + finally: + pass + # 绉婚櫎棣栨澘浠g爜 + def remove_first_gp_code(self, codes): + redis_instance = self.__get_redis() + try: + for code in codes: + self.__gp_list_first_codes_cache.discard(code) + RedisUtils.srem(redis_instance, "gp_list_first", code, auto_free=False) + finally: + RedisUtils.realse(redis_instance) -# 鏄惁鍦ㄩ鏉块噷闈� -def is_in_first_gp_codes(code): - redis_instance = __redisManager.getRedis() - return RedisUtils.sismember(redis_instance, "gp_list_first", code) + # 鑾峰彇棣栨澘浠g爜 + def get_first_gp_codes(self): + return RedisUtils.smembers(self.__get_redis(), "gp_list_first") + def get_first_gp_codes_cache(self): + return self.__gp_list_first_codes_cache -# 鑾峰彇鍚嶇О瀵瑰簲鐨勪唬鐮� -def get_name_code(name): - code = CodesNameManager.get_second_name_code(name) - if code is not None: - return code - code = CodesNameManager.get_first_name_code(name) - return code + # 鏄惁鍦ㄩ鏉块噷闈� + def is_in_first_gp_codes(self, code): + return RedisUtils.sismember(self.__get_redis(), "gp_list_first", code) + + # 鏄惁鍦ㄩ鏉块噷闈� + def is_in_first_gp_codes_cache(self, code): + return code in self.__gp_list_first_codes_cache # 浠g爜鍚嶅瓧缂撳瓨 @@ -358,20 +499,12 @@ # 鑾峰彇浠g爜鐨勫悕绉� def get_code_name(code): - if code in __code_name_dict: - return __code_name_dict.get(code) - name = CodesNameManager.get_second_code_name(code) - if name is not None: - __code_name_dict[code] = name - return name - name = CodesNameManager.get_first_code_name(code) - if name: - __code_name_dict[code] = name - return name + return CodesNameManager.get_code_name(code) def get_name_codes(): - return CodesNameManager.list_code_name_dict() + code_name_dict = CodesNameManager.list_code_name_dict() + return {code_name_dict[x]: x for x in code_name_dict} # 娑ㄥ仠鏁版嵁淇濆瓨 @@ -380,43 +513,48 @@ return # 鑾峰彇鍩烘湰淇℃伅 redis_instance = __redisManager.getRedis() - # 鍒犻櫎涔嬪墠鐨� - RedisUtils.delete(redis_instance, "gp_limit_up_list") - for d in gpset: - RedisUtils.sadd(redis_instance, "gp_limit_up_list", json.dumps(d)) - RedisUtils.expire(redis_instance, "gp_limit_up_list", tool.get_expire()) - RedisUtils.setex(redis_instance, "gp_limit_up_list_update_time", tool.get_expire(), round(time.time() * 1000)) + try: + # 鍒犻櫎涔嬪墠鐨� + RedisUtils.delete(redis_instance, "gp_limit_up_list", auto_free=False) + for d in gpset: + RedisUtils.sadd(redis_instance, "gp_limit_up_list", json.dumps(d), auto_free=False) + RedisUtils.expire(redis_instance, "gp_limit_up_list", tool.get_expire(), auto_free=False) + RedisUtils.setex(redis_instance, "gp_limit_up_list_update_time", tool.get_expire(), round(time.time() * 1000), + auto_free=False) + finally: + RedisUtils.realse(redis_instance) # 鑾峰彇娑ㄥ仠鍒楄〃 def get_limit_up_list(): redis_instance = __redisManager.getRedis() - return RedisUtils.get(redis_instance, "gp_limit_up_list_update_time"), RedisUtils.smembers(redis_instance, - "gp_limit_up_list") + try: + return RedisUtils.get(redis_instance, "gp_limit_up_list_update_time", + auto_free=False), RedisUtils.smembers(redis_instance, + "gp_limit_up_list", auto_free=False) + finally: + RedisUtils.realse(redis_instance) def rm_gp(code): - redis_instance = __redisManager.getRedis() - RedisUtils.srem(redis_instance, "gp_list", code) - remove_first_gp_code([code]) + RedisUtils.srem(__redisManager.getRedis(), "gp_list", code) + FirstGPCodesManager().remove_first_gp_code([code]) def is_in_gp_pool(code): - redis_instance = __redisManager.getRedis() - return RedisUtils.sismember(redis_instance, "gp_list", code) or is_in_first_gp_codes(code) + return RedisUtils.sismember(__redisManager.getRedis(), "gp_list", + code) or FirstGPCodesManager().is_in_first_gp_codes_cache(code) def get_gp_list(): - redis_instance = __redisManager.getRedis() - codes = RedisUtils.smembers(redis_instance, "gp_list") - first_codes = get_first_gp_codes() + codes = RedisUtils.smembers(__redisManager.getRedis(), "gp_list") + first_codes = FirstGPCodesManager().get_first_gp_codes_cache() return set.union(codes, first_codes) # 鑾峰彇浜屾澘浠g爜 def get_second_gp_list(): - redis_instance = __redisManager.getRedis() - codes = RedisUtils.smembers(redis_instance, "gp_list") + codes = RedisUtils.smembers(__redisManager.getRedis(), "gp_list") return codes @@ -425,42 +563,44 @@ data = get_gp_list() list = [] for d in data: - if d[0:2] == '00': + if tool.is_sz_code(d): list.append("SZSE.{}".format(d)) - elif d[0:2] == '60': + elif tool.is_sh_code(d): list.append("SHSE.{}".format(d)) return list -# 鑾峰彇鏀剁洏浠� -def get_price_pre(code): - redis_instance = __redisManager.getRedis() - result = RedisUtils.get(redis_instance, "price-pre-{}".format(code)) - if result is not None: - return float(result) - return None +class CodePrePriceManager: + __price_pre_cache = {} + __redisManager = redis_manager.RedisManager(0) + # 鑾峰彇鏀剁洏浠� + @classmethod + def get_price_pre(cls, code): + fdatas = log_export.load_pre_close_price() + if code in fdatas: + return round(float(fdatas.get(code)), 2) + return None -__price_pre_cache = {} + # 鑾峰彇缂撳瓨 + @classmethod + def get_price_pre_cache(cls, code): + if code in cls.__price_pre_cache: + return float(cls.__price_pre_cache[code]) + val = cls.get_price_pre(code) + if val: + cls.__price_pre_cache[code] = val + return val - -# 鑾峰彇缂撳瓨 -def get_price_pre_cache(code): - if code in __price_pre_cache: - return __price_pre_cache[code] - val = get_price_pre(code) - if val: - __price_pre_cache[code] = val - return val - - -# 璁剧疆鏀剁洏浠� -def set_price_pre(code, price, force=False): - codes = get_gp_list() - if code not in codes and not FirstCodeManager.is_in_first_record(code) and not force: - return - redis_instance = __redisManager.getRedis() - RedisUtils.setex(redis_instance, "price-pre-{}".format(code), tool.get_expire(), str(price)) + # 璁剧疆鏀剁洏浠� + @classmethod + def set_price_pre(cls, code, price, force=False): + codes = get_gp_list() + if code not in codes and not FirstCodeManager().is_in_first_record_cache(code) and not force: + return + price = round(float(price), 2) + logger_pre_close_price.info(f"{code}-{price}") + cls.__price_pre_cache[code] = price __limit_up_price_dict = {} @@ -471,32 +611,43 @@ # 璇诲彇鍐呭瓨涓殑鍊� if code in __limit_up_price_dict: return __limit_up_price_dict[code] - price = get_price_pre_cache(code) + price = CodePrePriceManager.get_price_pre_cache(code) if price is None: return None - limit_up_price = tool.to_price(decimal.Decimal(str(price)) * decimal.Decimal("1.1")) + limit_up_price = tool.to_price(decimal.Decimal(str(price)) * decimal.Decimal(tool.get_limit_up_rate(code))) __limit_up_price_dict[code] = limit_up_price return limit_up_price -def get_limit_up_price_by_preprice(price): +def get_limit_up_price_cache(code): + if code in __limit_up_price_dict: + return __limit_up_price_dict[code] + return None + + +def get_limit_up_price_by_preprice(code, price): if price is None: return None - return tool.to_price(decimal.Decimal(str(price)) * decimal.Decimal("1.1")) + return tool.to_price(decimal.Decimal(str(price)) * decimal.Decimal(f"{tool.get_limit_up_rate(code)}")) + + +def get_limit_down_price_by_preprice(code, price): + if price is None: + return None + return tool.to_price(decimal.Decimal(str(price)) * decimal.Decimal(f"{tool.get_limit_down_rate(code)}")) # 鑾峰彇璺屽仠浠� def get_limit_down_price(code): - price = get_price_pre_cache(code) + price = CodePrePriceManager.get_price_pre_cache(code) if price is None: return None - return tool.to_price(decimal.Decimal(str(price)) * decimal.Decimal("0.9")) + return tool.to_price(decimal.Decimal(str(price)) * decimal.Decimal(f"{tool.get_limit_down_rate(code)}")) # 鑾峰彇鐜颁环 def get_price(code): - redis_instance = __redisManager.getRedis() - result = RedisUtils.get(redis_instance, "price-{}".format(code)) + result = RedisUtils.get(__redisManager.getRedis(), "price-{}".format(code)) if result is not None: return float(result) return None @@ -510,35 +661,45 @@ if code in __current_price_cache and __current_price_cache[code] == price: return __current_price_cache[code] = price - redis_instance = __redisManager.getRedis() - RedisUtils.setex(redis_instance, "price-{}".format(code), tool.get_expire(), price) + RedisUtils.setex(__redisManager.getRedis(), "price-{}".format(code), tool.get_expire(), price) + + +# datas:[(code,price)] +def set_prices(datas): + for d in datas: + code, price = d[0], d[1] + if code in __current_price_cache and __current_price_cache[code] == price: + continue + __current_price_cache[code] = price + RedisUtils.setex_async(__db, "price-{}".format(code), tool.get_expire(), price) # 鑾峰彇姝e湪鐩戝惉鐨勪唬鐮� def get_listen_codes(): redis_instance = __redisManager.getRedis() - keys = RedisUtils.keys(redis_instance, "listen_code-*-*") - codes = set() - for k in keys: - code = RedisUtils.get(redis_instance, k) - if code is not None and len(code) > 0: - codes.add(code) - return codes + try: + keys = RedisUtils.keys(redis_instance, "listen_code-*-*", auto_free=False) + codes = set() + for k in keys: + code = RedisUtils.get(redis_instance, k, auto_free=False) + if code is not None and len(code) > 0: + codes.add(code) + return codes + finally: + RedisUtils.realse(redis_instance) # 鏍规嵁浣嶇疆鑾峰彇姝e湪鐩戝惉鐨勪唬鐮� def get_listen_code_by_pos(client_id, pos): - redis_instance = __redisManager.getRedis() key = "listen_code-{}-{}".format(client_id, pos) - value = RedisUtils.get(redis_instance, key) + value = RedisUtils.get(__redisManager.getRedis(), key) # print("redis:", key,value) return value # 璁剧疆浣嶇疆鐨勭洃鍚唬鐮� def set_listen_code_by_pos(client_id, pos, code): - redis_instance = __redisManager.getRedis() - RedisUtils.setex(redis_instance, "listen_code-{}-{}".format(client_id, pos), tool.get_expire(), code) + RedisUtils.setex(__redisManager.getRedis(), "listen_code-{}-{}".format(client_id, pos), tool.get_expire(), code) # 鍚屾鐩戝惉鐨勪唬鐮侀泦鍚� __sync_listen_codes_pos() @@ -546,56 +707,66 @@ # 鍚屾鐩戝惉浠g爜浣嶇疆淇℃伅 def __sync_listen_codes_pos(): redis_instance = __redisManager.getRedis() - # 鑾峰彇宸茬粡姝e湪鐩戝惉鐨勪唬鐮� - keys = RedisUtils.keys(redis_instance, "code_listen_pos-*") - codes_set = set() - for key in keys: - codes_set.add(key.replace("code_listen_pos-", "")) + try: + # 鑾峰彇宸茬粡姝e湪鐩戝惉鐨勪唬鐮� + keys = RedisUtils.keys(redis_instance, "code_listen_pos-*", auto_free=False) + codes_set = set() + for key in keys: + codes_set.add(key.replace("code_listen_pos-", "")) - keys = RedisUtils.keys(redis_instance, "listen_code-*-*") + keys = RedisUtils.keys(redis_instance, "listen_code-*-*", auto_free=False) - for key in keys: - result = RedisUtils.get(redis_instance, key) - if result: - # 绉婚櫎闇�瑕佹坊鍔犵殑浠g爜 - codes_set.discard(result) - client_id_, pos_, code_ = int(key.split("-")[1]), int(key.split("-")[2]), result - key_ = "code_listen_pos-{}".format(code_) - val = RedisUtils.get(redis_instance, key_) - if val is None: - RedisUtils.setex(redis_instance, key_, tool.get_expire(), json.dumps((client_id_, pos_))) - else: - val = json.loads(val) - if val[0] != client_id_ or val[1] != pos_: - RedisUtils.setex(redis_instance, key_, tool.get_expire(), json.dumps((client_id_, pos_))) + for key in keys: + result = RedisUtils.get(redis_instance, key, auto_free=False) + if result: + # 绉婚櫎闇�瑕佹坊鍔犵殑浠g爜 + codes_set.discard(result) + client_id_, pos_, code_ = int(key.split("-")[1]), int(key.split("-")[2]), result + key_ = "code_listen_pos-{}".format(code_) + val = RedisUtils.get(redis_instance, key_, auto_free=False) + if val is None: + RedisUtils.setex(redis_instance, key_, tool.get_expire(), json.dumps((client_id_, pos_)), + auto_free=False) + else: + val = json.loads(val) + if val[0] != client_id_ or val[1] != pos_: + RedisUtils.setex(redis_instance, key_, tool.get_expire(), json.dumps((client_id_, pos_)), + auto_free=False) - # 绉婚櫎娌℃湁鐩戝惉鐨勪唬鐮� - for code_ in codes_set: - RedisUtils.delete(redis_instance, code_) + # 绉婚櫎娌℃湁鐩戝惉鐨勪唬鐮� + for code_ in codes_set: + RedisUtils.delete(redis_instance, code_, auto_free=False) + finally: + RedisUtils.realse(redis_instance) # 鍒濆鍖栦綅缃� def init_listen_code_by_pos(client_id, pos): - redis_instance = __redisManager.getRedis() key = "listen_code-{}-{}".format(client_id, pos) - RedisUtils.setnx(redis_instance, key, "") - RedisUtils.expire(redis_instance, key, tool.get_expire()) + RedisUtils.setnx(__redisManager.getRedis(), key, "") + RedisUtils.expire(__redisManager.getRedis(), key, tool.get_expire()) # 娓呴櫎鎵�鏈夌洃鍚唬鐮� def clear_listen_codes(): redis_instance = __redisManager.getRedis() - keys = RedisUtils.keys(redis_instance, "listen_code-*-*") - for key in keys: - RedisUtils.setex(redis_instance, key, tool.get_expire(), "") + try: + keys = RedisUtils.keys(redis_instance, "listen_code-*-*", auto_free=False) + for key in keys: + RedisUtils.setex(redis_instance, key, tool.get_expire(), "", auto_free=False) + finally: + RedisUtils.realse(redis_instance) def clear_first_codes(): redis_instance = __redisManager.getRedis() - RedisUtils.delete(redis_instance, "gp_list_first") - RedisUtils.delete(redis_instance, "gp_list_names_first") - RedisUtils.delete(redis_instance, "first_code_record") - RedisUtils.delete(redis_instance, "first_code_limited_up_record") + try: + RedisUtils.delete(redis_instance, "gp_list_first", auto_free=False) + RedisUtils.delete(redis_instance, "gp_list_names_first", auto_free=False) + RedisUtils.delete(redis_instance, "first_code_record", auto_free=False) + RedisUtils.delete(redis_instance, "first_code_limited_up_record", auto_free=False) + finally: + RedisUtils.realse(redis_instance) # 鑾峰彇鍙互鎿嶄綔鐨勪綅缃� @@ -610,18 +781,19 @@ for client_id in client_ids: redis_instance = __redisManager.getRedis() k = "listen_code-{}-*".format(client_id) - keys = RedisUtils.keys(redis_instance, k) + keys = RedisUtils.keys(redis_instance, k, auto_free=False) # random.shuffle(keys) codes = [] for key in keys: index = key.split("-")[-1] if int(index) + 1 > constant.L2_CODE_COUNT_PER_DEVICE: continue - result = RedisUtils.get(redis_instance, key) + result = RedisUtils.get(redis_instance, key, auto_free=False) if result is None or len(result) == 0: available_positions.append((client_id, int(key.replace("listen_code-{}-".format(client_id), "")))) else: codes.append((key, result)) + RedisUtils.realse(redis_instance) # 鏌ヨ鏄惁鏈夐噸澶嶇殑浠g爜 codes_set = set() count = 0 @@ -651,19 +823,21 @@ free_count = 0 for client_id in client_ids: redis_instance = __redisManager.getRedis() - k = "listen_code-{}-*".format(client_id) - keys = RedisUtils.keys(redis_instance, k) - for key in keys: - code = RedisUtils.get(redis_instance, key) - if not code: - free_count += 1 + try: + k = "listen_code-{}-*".format(client_id) + keys = RedisUtils.keys(redis_instance, k, auto_free=False) + for key in keys: + code = RedisUtils.get(redis_instance, key, auto_free=False) + if not code: + free_count += 1 + finally: + RedisUtils.realse(redis_instance) return free_count # 鑾峰彇姝e湪鐩戝惉鐨勪唬鐮佺殑浣嶇疆 def get_listen_code_pos(code): - redis_instance = __redisManager.getRedis() - val = RedisUtils.get(redis_instance, "code_listen_pos-{}".format(code)) + val = RedisUtils.get(__redisManager.getRedis(), "code_listen_pos-{}".format(code)) if val is None: return None, None val = json.loads(val) @@ -678,8 +852,7 @@ # 鏄惁姝e湪鐩戝惉 def is_listen(code): - redis_instance = __redisManager.getRedis() - val = RedisUtils.get(redis_instance, "code_listen_pos-{}".format(code)) + val = RedisUtils.get(__redisManager.getRedis(), "code_listen_pos-{}".format(code)) if val is None: return False else: @@ -702,36 +875,33 @@ # 鏄惁姝e湪鎿嶄綔 def is_operate(code): - redis_instance = __redisManager.getRedis() - return RedisUtils.get(redis_instance, "gp_operate-{}".format(code)) is not None + return RedisUtils.get(__redisManager.getRedis(), "gp_operate-{}".format(code)) is not None # 璁剧疆姝e湪鎿嶄綔鐨勪唬鐮� def set_operate(code): - redis_instance = __redisManager.getRedis() - RedisUtils.setex( - redis_instance, "gp_operate-{}".format(code), 30, "1") + RedisUtils.setex(__redisManager.getRedis(), "gp_operate-{}".format(code), 30, "1") # 鎵归噺璁剧疆姝e湪鎿嶄綔鐨勪唬鐮� def set_operates(codes): - redis_instance = __redisManager.getRedis() for code in codes: - RedisUtils.setex( - redis_instance, "gp_operate-{}".format(code), 30, "1") + RedisUtils.setex(__redisManager.getRedis(), "gp_operate-{}".format(code), 30, "1") # 绉婚櫎姝e湪鎿嶄綔鐨勪唬鐮� def rm_operate(code): - redis_instance = __redisManager.getRedis() - RedisUtils.delete(redis_instance, "gp_operate-{}".format(code)) + RedisUtils.delete(__redisManager.getRedis(), "gp_operate-{}".format(code)) # 鎵归噺绉婚櫎姝e湪鎿嶄綔鐨勪唬鐮� def rm_operates(codes): redis_instance = __redisManager.getRedis() - for code in codes: - RedisUtils.delete(redis_instance, "gp_operate-{}".format(code)) + try: + for code in codes: + RedisUtils.delete(redis_instance, "gp_operate-{}".format(code), auto_free=False) + finally: + RedisUtils.realse(redis_instance) if __name__ == '__main__': -- Gitblit v1.8.0