From a846b46f15ad309a62fe400cf78dd7fc888155d7 Mon Sep 17 00:00:00 2001 From: Administrator <admin@example.com> Date: 星期一, 26 五月 2025 16:39:19 +0800 Subject: [PATCH] 完善大单够了加白机制 --- code_attribute/gpcode_manager.py | 792 ++++++++++++++++++++++++++++++++------------------------ 1 files changed, 451 insertions(+), 341 deletions(-) diff --git a/code_attribute/gpcode_manager.py b/code_attribute/gpcode_manager.py index 425d809..4dbcfc1 100644 --- a/code_attribute/gpcode_manager.py +++ b/code_attribute/gpcode_manager.py @@ -1,132 +1,122 @@ """ 鑲$エ浠g爜绠$悊鍣� """ +import copy import json import time -import constant 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, logger_debug +from trade import trade_record_log_util 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: - __db = 0 - redisManager = redis_manager.RedisManager(0) - __gp_list_names_first_cache = [] +class BuyOpenLimitUpCodeManager: + """ + 鎺�1浠g爜绠$悊 + """ + __db = 2 + __redisManager = redis_manager.RedisManager(2) + __instance = None + __codes_cache = set() + + def __new__(cls, *args, **kwargs): + if not cls.__instance: + cls.__instance = super(BuyOpenLimitUpCodeManager, cls).__new__(cls, *args, **kwargs) + cls.__load_data() + return cls.__instance @classmethod def __get_redis(cls): - return cls.redisManager.getRedis() + return cls.__redisManager.getRedis() + + @classmethod + def __load_data(cls): + val = RedisUtils.get(cls.__get_redis(), "buy_open_limit_up_codes") + if val: + val = json.loads(val) + cls.__codes_cache = set(val) + + def set_codes(self, codes): + self.__codes_cache = copy.deepcopy(codes) + RedisUtils.set_async(self.__db, "buy_open_limit_up_codes", json.dumps(list(codes))) + + def get_codes(self): + return self.__codes_cache + + def is_in_cache(self, code): + if not self.__codes_cache: + return False + if code in self.__codes_cache: + return True + return False + + +class CodesNameManager: + __mysqldb = Mysqldb() + __code_name_dict = {} + __instance = None + + def __new__(cls, *args, **kwargs): + if not cls.__instance: + cls.__instance = super(CodesNameManager, cls).__new__(cls, *args, **kwargs) + cls.__load_data() + return cls.__instance + + @classmethod + def __load_data(cls): + cls.__code_name_dict = cls.list_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 + 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 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_names(cls, code_name_dict): + """ + 鎵归噺娣诲姞浠g爜鍚嶇О + @param code_name_dict: + @return: + """ + for code in code_name_dict: + if code in cls.__code_name_dict and cls.__code_name_dict[code] == code_name_dict[code]: + continue + cls.add_code_name(code, code_name_dict[code]) @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_async(cls.__db, "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爜绠$悊 @@ -142,8 +132,6 @@ 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): @@ -169,31 +157,11 @@ def is_in_first_record_cache(self, code): return code in self.__first_code_record_cache - # 鍔犲叆棣栨澘娑ㄥ仠杩囦唬鐮侀泦鍚� - def add_limited_up_record(self, codes): - hasChanged = False - for code in codes: - 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()) - - # 鏄惁娑ㄥ仠杩� - 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 + __db = 0 redisManager = redis_manager.RedisManager(0) __redis_key = "want_buy_codes" @@ -222,7 +190,7 @@ def remove_code(self, code): self.__want_buy_codes_cache.discard(code) - RedisUtils.srem(self.__get_redis(), self.__redis_key, code) + RedisUtils.srem_async(self.__db, self.__redis_key, code) def sync(self): codes = self.list_code() @@ -241,6 +209,81 @@ def list_code_cache(self): return self.__want_buy_codes_cache + + +@tool.singleton +class HumanRemoveForbiddenManager: + """ + 璁や负绉婚粦绠$悊 + """ + __db = 0 + redisManager = redis_manager.RedisManager(0) + __redis_key = "human_remove_forbidden_codes" + + __codes_cache = set() + + def __init__(self): + self.__load_data() + + @classmethod + def __get_redis(cls): + return cls.redisManager.getRedis() + + def __load_data(self): + self.__codes_cache = RedisUtils.smembers(self.__get_redis(), self.__redis_key) + if self.__codes_cache is None: + self.__codes_cache = set() + + def add_code(self, code): + self.__codes_cache.add(code) + RedisUtils.sadd_async(self.__db, self.__redis_key, code) + RedisUtils.expire_async(self.__db, self.__redis_key, tool.get_expire()) + + def remove_code(self, code): + self.__codes_cache.discard(code) + RedisUtils.srem_async(self.__db, self.__redis_key, code) + + def is_in_cache(self, code): + return code in self.__codes_cache + + +@tool.singleton +class HumanForbiddenManager: + """ + 浜轰负鎷夐粦绠$悊 + """ + __db = 0 + redisManager = redis_manager.RedisManager(0) + __redis_key = "human_forbidden_codes" + + __codes_cache = set() + + def __init__(self): + self.__load_data() + + @classmethod + def __get_redis(cls): + return cls.redisManager.getRedis() + + def __load_data(self): + self.__codes_cache = RedisUtils.smembers(self.__get_redis(), self.__redis_key) + if self.__codes_cache is None: + self.__codes_cache = set() + + def add_code(self, code): + trade_record_log_util.add_common_msg(code, "浜轰负鍔犻粦", f"") + self.__codes_cache.add(code) + RedisUtils.sadd_async(self.__db, self.__redis_key, code) + RedisUtils.expire_async(self.__db, self.__redis_key, tool.get_expire()) + + def remove_code(self, code): + trade_record_log_util.add_common_msg(code, "浜轰负绉婚粦", f"") + self.__codes_cache.discard(code) + RedisUtils.srem_async(self.__db, self.__redis_key, code) + + def is_in_cache(self, code): + return code in self.__codes_cache + # 鏆傚仠涓嬪崟浠g爜绠$悊 @@ -294,6 +337,253 @@ 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 __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) + __human_remove_codes = set() + + 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 __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, is_human=False): + + if not is_human and code in self.__human_remove_codes: + # 鏈哄櫒鍔犵櫧锛屼笖琚汉涓虹Щ鐧戒簡灏变笉鑳藉啀鍔犵櫧 + return + + 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, is_human=False): + self.__white_codes_cache.discard(code) + RedisUtils.srem(self.__get_redis(), "white_list_codes", code) + if is_human: + self.human_remove(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") + + def human_remove(self, code): + """ + 浜轰负绉荤櫧 + @param code: + @return: + """ + self.__human_remove_codes.add(code) + + def clear_huamn_info(self, code): + """ + 绉婚櫎浜轰负骞查淇℃伅 + @param code: + @return: + """ + if code in self.__human_remove_codes: + self.__human_remove_codes.discard(code) + + + +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") + logger_debug.info(f"鍔犺浇鍔犻粦鍒楄〃锛歿cls.__instance.__forbidden_trade_codes_cache}") + + return cls.__instance + + @classmethod + def __get_redis(cls): + return cls.__redis_manager.getRedis() + + 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") + + +class GreenListCodeManager: + """ + 缁垮悕鍗曪細涔板叆鍗冲姞绾紝鎾ゅ崟涓嶇Щ绾� + """ + __instance = None + __db = 2 + __redis_manager = redis_manager.RedisManager(2) + __codes_set = set() + + def __new__(cls, *args, **kwargs): + if not cls.__instance: + cls.__instance = super(GreenListCodeManager, cls).__new__(cls, *args, **kwargs) + # 鍒濆鍖栬缃� + # 鑾峰彇浜ゆ槗绐楀彛鐨勯攣 + cls.__codes_set = RedisUtils.smembers(cls.__get_redis(), "green-trade-codes") + return cls.__instance + + @classmethod + def __get_redis(cls): + return cls.__redis_manager.getRedis() + + def add_code(self, code): + self.__codes_set.add(code) + RedisUtils.sadd_async(self.__db, "green-trade-codes", code) + RedisUtils.expire_async(self.__db, "green-trade-codes", tool.get_expire()) + + def sync(self): + data = RedisUtils.smembers(self.__get_redis(), + "green-trade-codes") + self.__codes_set.clear() + if data: + self.__codes_set |= data + + def remove_code(self, code): + self.__codes_set.discard(code) + RedisUtils.srem_async(self.__db, "green-trade-codes", code) + + def is_in(self, code): + return RedisUtils.sismember(self.__get_redis(), "green-trade-codes", code) + + def is_in_cache(self, code): + return code in self.__codes_set + + def list_codes(self): + codes = RedisUtils.smembers(self.__get_redis(), "green-trade-codes") + self.__codes_set = codes + return codes + + def list_codes_cache(self): + return self.__codes_set + + def clear(self): + self.__codes_set.clear() + RedisUtils.delete(self.__get_redis(), "green-trade-codes") + + def __parse_codes_data(code_datas): codes = [] name_codes = {} @@ -301,48 +591,12 @@ # 姝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爜瀵瑰簲鐨勫悕绉� name_codes[name] = code return codes, name_codes - - -# -------------------------------浜屾澘浠g爜绠$悊--------------------------------- - -def set_gp_list(code_datas): - codes, name_codes = __parse_codes_data(code_datas) - redis_instance = __redisManager.getRedis() - try: - # 鍒犻櫎涔嬪墠鐨� - RedisUtils.delete(redis_instance, "gp_list", auto_free=False) - CodesNameManager.clear_second_code_names() - for d in codes: - RedisUtils.sadd(redis_instance, "gp_list", d, auto_free=False) - CodesNameManager.set_second_code_names(name_codes) - finally: - RedisUtils.realse(redis_instance) - - -# 鏂板浠g爜 -def add_gp_list(code_datas): - if len(code_datas) > 200: - raise Exception("涓嶈兘瓒呰繃200涓暟鎹�") - redis_instance = __redisManager.getRedis() - try: - codes, name_codes = __parse_codes_data(code_datas) - for d in codes: - RedisUtils.sadd(redis_instance, "gp_list", d, auto_free=False) - 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) - finally: - RedisUtils.realse(redis_instance) # -------------------------------棣栨澘浠g爜绠$悊------------------------------- @@ -378,7 +632,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爜瀵瑰簲鐨勫悕绉� @@ -388,7 +642,6 @@ # 娣诲姞棣栨澘浠g爜 # code_datas 鎺橀噾杩斿洖鐨勬暟鎹� def set_first_gp_codes_with_data(self, code_datas): - redis_instance = self.__get_redis() try: codes, name_codes = self.__parse_codes_data(code_datas) codes_set = set() @@ -408,16 +661,10 @@ # 鏇存柊缂撳瓨 self.__gp_list_first_codes_cache.clear() self.__gp_list_first_codes_cache |= codes_set - - 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) + for key in name_codes: + CodesNameManager.add_code_name(name_codes[key], key) finally: - RedisUtils.realse(redis_instance) + pass # 绉婚櫎棣栨澘浠g爜 def remove_first_gp_code(self, codes): @@ -445,35 +692,18 @@ return code in 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 - - # 浠g爜鍚嶅瓧缂撳瓨 __code_name_dict = {} # 鑾峰彇浠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} # 娑ㄥ仠鏁版嵁淇濆瓨 @@ -532,9 +762,9 @@ 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 @@ -546,9 +776,9 @@ # 鑾峰彇鏀剁洏浠� @classmethod def get_price_pre(cls, code): - result = RedisUtils.get(cls.__redisManager.getRedis(), "price-pre-{}".format(code)) - if result is not None: - return float(result) + fdatas = log_export.load_pre_close_price() + if code in fdatas: + return round(float(fdatas.get(code)), 2) return None # 鑾峰彇缂撳瓨 @@ -564,11 +794,11 @@ # 璁剧疆鏀剁洏浠� @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: + if code in cls.__price_pre_cache and not force: return - RedisUtils.setex(cls.__redisManager.getRedis(), "price-pre-{}".format(code), tool.get_expire(), str(price)) - cls.__price_pre_cache[code] = float(price) + price = round(float(price), 2) + logger_pre_close_price.info(f"{code}-{price}") + cls.__price_pre_cache[code] = price __limit_up_price_dict = {} @@ -582,15 +812,34 @@ 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_as_num(code): + limit_up_price = get_limit_up_price(code) + if limit_up_price: + return round(float(limit_up_price), 2) + return None + + +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)}")) # 鑾峰彇璺屽仠浠� @@ -598,7 +847,7 @@ 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)}")) # 鑾峰彇鐜颁环 @@ -722,143 +971,4 @@ 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) - - -# 鑾峰彇鍙互鎿嶄綔鐨勪綅缃� -def get_can_listen_pos(client_id=0): - client_ids = [] - if client_id <= 0: - client_ids = client_manager.getValidL2Clients() - else: - client_ids.append(client_id) - # random.shuffle(client_ids) - available_positions = [] - for client_id in client_ids: - redis_instance = __redisManager.getRedis() - k = "listen_code-{}-*".format(client_id) - 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, 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 - for code in codes: - count = count + 1 - codes_set.add(code[1]) - if len(codes_set) < count: - return client_id, int(code[0].replace("listen_code-{}-".format(client_id), "")) - - if available_positions: - # 鑾峰彇鍋ュ悍鐘舵�� - available_positions_health_states = l2_listen_pos_health_manager.list_health_state(available_positions) - # 灏介噺涓嶅垎閰嶇涓�涓綅缃� - available_positions_new = sorted(available_positions, - key=lambda x: (available_positions_health_states[x], 0 if x[1] == 0 else 1), - reverse=True) - # available_positions.sort(key=lambda x: available_positions_health_states[x], reverse=True) - # 鍙栫1涓暟鎹� - return available_positions_new[0][0], available_positions_new[0][1] - - return None, None - - -# 鑾峰彇鍙互鎿嶄綔鐨勪綅缃� -def get_free_listen_pos_count(): - client_ids = client_manager.getValidL2Clients() - free_count = 0 - for client_id in client_ids: - redis_instance = __redisManager.getRedis() - 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): - val = RedisUtils.get(__redisManager.getRedis(), "code_listen_pos-{}".format(code)) - if val is None: - return None, None - val = json.loads(val) - cid, pid = val[0], val[1] - code_ = get_listen_code_by_pos(cid, pid) - # 鏍¢獙浠g爜 - if code_ == code: - return cid, pid - else: - return None, None - - -# 鏄惁姝e湪鐩戝惉 -def is_listen(code): - val = RedisUtils.get(__redisManager.getRedis(), "code_listen_pos-{}".format(code)) - if val is None: - return False - else: - return True - # codes = get_listen_codes() - # return codes.__contains__(code) - - -def is_listen_old(code): - codes = get_listen_codes() - return codes.__contains__(code) - - -# 鐩戝惉鏄惁婊′簡 -def is_listen_full(): - clients = client_manager.getValidL2Clients() - codes = get_listen_codes() - return len(codes) >= constant.L2_CODE_COUNT_PER_DEVICE * len(clients) - - -# 鏄惁姝e湪鎿嶄綔 -def is_operate(code): - return RedisUtils.get(__redisManager.getRedis(), "gp_operate-{}".format(code)) is not None - - -# 璁剧疆姝e湪鎿嶄綔鐨勪唬鐮� -def set_operate(code): - RedisUtils.setex(__redisManager.getRedis(), "gp_operate-{}".format(code), 30, "1") - - -# 鎵归噺璁剧疆姝e湪鎿嶄綔鐨勪唬鐮� -def set_operates(codes): - for code in codes: - RedisUtils.setex(__redisManager.getRedis(), "gp_operate-{}".format(code), 30, "1") - - -# 绉婚櫎姝e湪鎿嶄綔鐨勪唬鐮� -def rm_operate(code): - RedisUtils.delete(__redisManager.getRedis(), "gp_operate-{}".format(code)) - - -# 鎵归噺绉婚櫎姝e湪鎿嶄綔鐨勪唬鐮� -def rm_operates(codes): - redis_instance = __redisManager.getRedis() - try: - for code in codes: - RedisUtils.delete(redis_instance, "gp_operate-{}".format(code), auto_free=False) - finally: - RedisUtils.realse(redis_instance) - - -if __name__ == '__main__': - get_can_listen_pos() + RedisUtils.realse(redis_instance) \ No newline at end of file -- Gitblit v1.8.0