From fffcecd3062f94913e13dc4943553e20e0350f90 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期二, 15 八月 2023 09:29:47 +0800
Subject: [PATCH] ++++++++++++++++ bug修复-
---
code_attribute/gpcode_manager.py | 262 +++++++++++++++++++++++++++++++++------------------
1 files changed, 168 insertions(+), 94 deletions(-)
diff --git a/code_attribute/gpcode_manager.py b/code_attribute/gpcode_manager.py
index 4eedbae..e38fa6c 100644
--- a/code_attribute/gpcode_manager.py
+++ b/code_attribute/gpcode_manager.py
@@ -5,8 +5,8 @@
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
@@ -191,22 +191,23 @@
# 鎯宠涔扮殑浠ｇ爜
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.redisManager = redis_manager.RedisManager(0)
- cls.__instance.__redis_key = "want_buy_codes"
- cls.__instance.__want_buy_codes_cache = RedisUtils.smembers(cls.__instance.__get_redis(),
- cls.__instance.__redis_key)
+ cls.__instance.__want_buy_codes_cache = RedisUtils.smembers(cls.__get_redis(),
+ cls.__redis_key)
return cls.__instance
__want_buy_codes_cache = set()
- def __get_redis(self):
- return self.redisManager.getRedis()
+ @classmethod
+ def __get_redis(cls):
+ return cls.redisManager.getRedis()
def clear(self):
RedisUtils.delete(self.__get_redis(), self.__redis_key)
@@ -221,10 +222,10 @@
RedisUtils.srem(self.__get_redis(), self.__redis_key, code)
def sync(self):
+ codes = self.list_code()
self.__want_buy_codes_cache.clear()
- codes = RedisUtils.smembers(self.__get_redis(), self.__redis_key)
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)
@@ -242,33 +243,52 @@
# 鏆傚仠涓嬪崟浠ｇ爜绠＄悊
# 涓庨粦鍚嶅崟鐨勫尯鍒槸鏆傚仠浜ゆ槗浠ｇ爜鍙槸涓嶄氦鏄擄紝涓嶈兘绉婚櫎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)
- @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 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
- @classmethod
- def remove_code(cls, code):
- RedisUtils.srem(cls.__get_redis(), cls.__redis_key, code)
+ 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())
- @classmethod
- def is_in(cls, code):
- return RedisUtils.sismember(cls.__get_redis(), cls.__redis_key, code)
+ def remove_code(self, code):
+ self.__pause_buy_codes_cache.discard(code)
+ RedisUtils.srem(self.__get_redis(), self.__redis_key, code)
- @classmethod
- def list_code(cls):
- return RedisUtils.smembers(cls.__get_redis(), cls.__redis_key)
+ 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
def __parse_codes_data(code_datas):
@@ -299,7 +319,7 @@
RedisUtils.sadd(redis_instance, "gp_list", d, auto_free=False)
CodesNameManager.set_second_code_names(name_codes)
finally:
- redis_instance.connection_pool.disconnect()
+ RedisUtils.realse(redis_instance)
# 鏂板浠ｇ爜
@@ -319,67 +339,107 @@
old_name_codes[key] = name_codes[key]
CodesNameManager.set_second_code_names(old_name_codes)
finally:
- redis_instance.connection_pool.disconnect()
-
-
-__gp_list_first_codes_cache = set()
+ RedisUtils.realse(redis_instance)
# -------------------------------棣栨澘浠ｇ爜绠＄悊-------------------------------
-# 娣诲姞棣栨澘浠ｇ爜
-# 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:
- redis_instance.connection_pool.disconnect()
+ 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:
- redis_instance.connection_pool.disconnect()
+ @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(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)
+ # 鏇存柊缂撳瓨
+ 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
# 鑾峰彇鍚嶇О瀵瑰簲鐨勪唬鐮�
@@ -425,9 +485,11 @@
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)
+ RedisUtils.setex(redis_instance, "gp_limit_up_list_update_time", tool.get_expire(), round(time.time() * 1000),
+ auto_free=False)
finally:
- redis_instance.connection_pool.disconnect()
+ RedisUtils.realse(redis_instance)
+
# 鑾峰彇娑ㄥ仠鍒楄〃
def get_limit_up_list():
@@ -437,21 +499,21 @@
auto_free=False), RedisUtils.smembers(redis_instance,
"gp_limit_up_list", auto_free=False)
finally:
- redis_instance.connection_pool.disconnect()
+ RedisUtils.realse(redis_instance)
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()
+ codes = RedisUtils.smembers(__redisManager.getRedis(), "gp_list")
+ first_codes = FirstGPCodesManager().get_first_gp_codes()
return set.union(codes, first_codes)
@@ -501,7 +563,7 @@
codes = get_gp_list()
if code not in codes and not FirstCodeManager().is_in_first_record_cache(code) and not force:
return
- RedisUtils.setex( cls.__redisManager.getRedis(), "price-pre-{}".format(code), tool.get_expire(), str(price))
+ RedisUtils.setex(cls.__redisManager.getRedis(), "price-pre-{}".format(code), tool.get_expire(), str(price))
cls.__price_pre_cache[code] = float(price)
@@ -554,6 +616,18 @@
RedisUtils.setex(__redisManager.getRedis(), "price-{}".format(code), tool.get_expire(), price)
+# datas:[(code,price)]
+def set_prices(datas):
+ pipe = __redisManager.getRedis().pipeline()
+ 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(pipe, "price-{}".format(code), tool.get_expire(), price)
+ pipe.execute()
+
+
# 鑾峰彇姝ｅ湪鐩戝惉鐨勪唬鐮�
def get_listen_codes():
redis_instance = __redisManager.getRedis()
@@ -566,7 +640,7 @@
codes.add(code)
return codes
finally:
- redis_instance.connection_pool.disconnect()
+ RedisUtils.realse(redis_instance)
# 鏍规嵁浣嶇疆鑾峰彇姝ｅ湪鐩戝惉鐨勪唬鐮�
@@ -617,7 +691,7 @@
for code_ in codes_set:
RedisUtils.delete(redis_instance, code_, auto_free=False)
finally:
- redis_instance.connection_pool.disconnect()
+ RedisUtils.realse(redis_instance)
# 鍒濆鍖栦綅缃�
@@ -635,7 +709,7 @@
for key in keys:
RedisUtils.setex(redis_instance, key, tool.get_expire(), "", auto_free=False)
finally:
- redis_instance.connection_pool.disconnect()
+ RedisUtils.realse(redis_instance)
def clear_first_codes():
@@ -646,7 +720,7 @@
RedisUtils.delete(redis_instance, "first_code_record", auto_free=False)
RedisUtils.delete(redis_instance, "first_code_limited_up_record", auto_free=False)
finally:
- redis_instance.connection_pool.disconnect()
+ RedisUtils.realse(redis_instance)
# 鑾峰彇鍙互鎿嶄綔鐨勪綅缃�
@@ -673,7 +747,7 @@
available_positions.append((client_id, int(key.replace("listen_code-{}-".format(client_id), ""))))
else:
codes.append((key, result))
- redis_instance.connection_pool.disconnect()
+ RedisUtils.realse(redis_instance)
# 鏌ヨ鏄惁鏈夐噸澶嶇殑浠ｇ爜
codes_set = set()
count = 0
@@ -711,7 +785,7 @@
if not code:
free_count += 1
finally:
- redis_instance.connection_pool.disconnect()
+ RedisUtils.realse(redis_instance)
return free_count
@@ -760,7 +834,7 @@
# 璁剧疆姝ｅ湪鎿嶄綔鐨勪唬鐮�
def set_operate(code):
- RedisUtils.setex( __redisManager.getRedis(), "gp_operate-{}".format(code), 30, "1")
+ RedisUtils.setex(__redisManager.getRedis(), "gp_operate-{}".format(code), 30, "1")
# 鎵归噺璁剧疆姝ｅ湪鎿嶄綔鐨勪唬鐮�
@@ -781,7 +855,7 @@
for code in codes:
RedisUtils.delete(redis_instance, "gp_operate-{}".format(code), auto_free=False)
finally:
- redis_instance.connection_pool.disconnect()
+ RedisUtils.realse(redis_instance)
if __name__ == '__main__':
--
Gitblit v1.8.0