From fb47d36048e94b9a506d5c153e3dd19a01e37df1 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期一, 30 十月 2023 16:30:27 +0800
Subject: [PATCH] bug修复
---
code_attribute/gpcode_manager.py | 200 ++++++++++++++++++++++++++++++++-----------------
1 files changed, 131 insertions(+), 69 deletions(-)
diff --git a/code_attribute/gpcode_manager.py b/code_attribute/gpcode_manager.py
index d07e89a..86ddbee 100644
--- a/code_attribute/gpcode_manager.py
+++ b/code_attribute/gpcode_manager.py
@@ -2,20 +2,23 @@
鑲＄エ浠ｇ爜绠＄悊鍣�
"""
import json
+import random
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.redis_manager_delegate import RedisUtils
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 = []
@@ -83,7 +86,7 @@
# 璁剧疆棣栨澘浠ｇ爜鍚嶇О
@classmethod
def set_first_code_names(cls, datas):
- RedisUtils.set(cls.__get_redis(), "gp_list_names_first", json.dumps(datas))
+ RedisUtils.set_async(cls.__db, "gp_list_names_first", json.dumps(datas))
# 鍒犻櫎棣栨澘浠ｇ爜鍚嶇О
@classmethod
@@ -130,6 +133,7 @@
# 棣栨澘浠ｇ爜绠＄悊
class FirstCodeManager:
__instance = None
+ __db = 0
def __new__(cls, *args, **kwargs):
if not cls.__instance:
@@ -151,11 +155,11 @@
hasChanged = False
for code in codes:
if code not in self.__first_code_record_cache:
- RedisUtils.sadd(self.__get_redis(), "first_code_record", code)
+ RedisUtils.sadd_async(self.__db, "first_code_record", code)
hasChanged = True
self.__first_code_record_cache.add(code)
if hasChanged:
- RedisUtils.expire(self.__get_redis(), "first_code_record", tool.get_expire())
+ RedisUtils.expire_async(self.__db, "first_code_record", tool.get_expire())
def is_in_first_record(self, code):
if RedisUtils.sismember(self.__get_redis(), "first_code_record", code):
@@ -171,11 +175,11 @@
hasChanged = False
for code in codes:
if code not in self.__first_code_limited_up_record_cache:
- RedisUtils.sadd(self.__get_redis(), "first_code_limited_up_record", code)
+ 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(self.__get_redis(), "first_code_limited_up_record", tool.get_expire())
+ RedisUtils.expire_async(self.__db, "first_code_limited_up_record", tool.get_expire())
# 鏄惁娑ㄥ仠杩�
def is_limited_up(self, code):
@@ -225,7 +229,7 @@
codes = self.list_code()
self.__want_buy_codes_cache.clear()
if codes:
- self.__want_buy_codes_cache += set(codes)
+ self.__want_buy_codes_cache |= set(codes)
def is_in(self, code):
return RedisUtils.sismember(self.__get_redis(), self.__redis_key, code)
@@ -244,20 +248,19 @@
# 涓庨粦鍚嶅崟鐨勫尯鍒槸鏆傚仠浜ゆ槗浠ｇ爜鍙槸涓嶄氦鏄擄紝涓嶈兘绉婚櫎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.redisManager = redis_manager.RedisManager(0)
- cls.__instance.__redis_key = "pause_buy_codes"
- cls.__instance.__pause_buy_codes_cache = RedisUtils.smembers(cls.__instance.__get_redis(),
- cls.__instance.__redis_key)
+ cls.__instance.__pause_buy_codes_cache = RedisUtils.smembers(cls.__get_redis(),
+ cls.__redis_key)
return cls.__instance
- def __get_redis(self):
- return self.redisManager.getRedis()
+ @classmethod
+ def __get_redis(cls):
+ return cls.redisManager.getRedis()
def clear(self):
self.__pause_buy_codes_cache.clear()
@@ -343,64 +346,104 @@
RedisUtils.realse(redis_instance)
-__gp_list_first_codes_cache = set()
-
-
# -------------------------------棣栨澘浠ｇ爜绠＄悊-------------------------------
-# 娣诲姞棣栨澘浠ｇ爜
-# code_datas 鎺橀噾杩斿洖鐨勬暟鎹�
-def set_first_gp_codes_with_data(code_datas):
- redis_instance = __redisManager.getRedis()
- try:
- 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, auto_free=False)
- for code in del_set:
- RedisUtils.srem(redis_instance, "gp_list_first", code, auto_free=False)
- if add_codes or del_set:
- RedisUtils.expire(redis_instance, "gp_list_first", tool.get_expire(), auto_free=False)
- # 鏇存柊缂撳瓨
- __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)
- finally:
- RedisUtils.realse(redis_instance)
+ 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()
-# 绉婚櫎棣栨澘浠ｇ爜
-def remove_first_gp_code(codes):
- redis_instance = __redisManager.getRedis()
- try:
- for code in codes:
- RedisUtils.srem(redis_instance, "gp_list_first", code, auto_free=False)
- finally:
- RedisUtils.realse(redis_instance)
+ @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:
+ # 姝ｅ父鐨勮偂绁�
+ 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:
+ name = _data["sec_name"]
+ codes.append(code)
+ # 淇濆瓨浠ｇ爜瀵瑰簲鐨勫悕绉�
+ name_codes[name] = code
+ return codes, name_codes
-# 鑾峰彇棣栨澘浠ｇ爜
-def get_first_gp_codes():
- return RedisUtils.smembers(__redisManager.getRedis(), "gp_list_first")
+ # 娣诲姞棣栨澘浠ｇ爜
+ # 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()
+ 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
+ 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)
+ finally:
+ RedisUtils.realse(redis_instance)
-# 鏄惁鍦ㄩ鏉块噷闈�
-def is_in_first_gp_codes(code):
- return RedisUtils.sismember(__redisManager.getRedis(), "gp_list_first", code)
+ # 绉婚櫎棣栨澘浠ｇ爜
+ 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 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 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
# 鑾峰彇鍚嶇О瀵瑰簲鐨勪唬鐮�
@@ -465,16 +508,17 @@
def rm_gp(code):
RedisUtils.srem(__redisManager.getRedis(), "gp_list", code)
- remove_first_gp_code([code])
+ FirstGPCodesManager().remove_first_gp_code([code])
def is_in_gp_pool(code):
- return RedisUtils.sismember(__redisManager.getRedis(), "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():
codes = RedisUtils.smembers(__redisManager.getRedis(), "gp_list")
- first_codes = get_first_gp_codes()
+ first_codes = FirstGPCodesManager().get_first_gp_codes_cache()
return set.union(codes, first_codes)
@@ -544,6 +588,14 @@
return limit_up_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(price):
if price is None:
return None
@@ -577,6 +629,16 @@
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)
+
+
# 鑾峰彇姝ｅ湪鐩戝惉鐨勪唬鐮�
def get_listen_codes():
redis_instance = __redisManager.getRedis()
--
Gitblit v1.8.0