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 | 167 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 110 insertions(+), 57 deletions(-)
diff --git a/code_attribute/gpcode_manager.py b/code_attribute/gpcode_manager.py
index 465250e..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
@@ -254,8 +254,9 @@
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()
@@ -341,64 +342,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(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
# 鑾峰彇鍚嶇О瀵瑰簲鐨勪唬鐮�
@@ -463,16 +504,16 @@
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()
return set.union(codes, first_codes)
@@ -575,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()
--
Gitblit v1.8.0