From c20c3c10635ce78db4a86ce9c0bb1d02e90f525d Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期二, 08 八月 2023 17:40:42 +0800
Subject: [PATCH] 单例+缓存优化
---
third_data/kpl_data_manager.py | 214 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 187 insertions(+), 27 deletions(-)
diff --git a/third_data/kpl_data_manager.py b/third_data/kpl_data_manager.py
index 04d1513..b841f41 100644
--- a/third_data/kpl_data_manager.py
+++ b/third_data/kpl_data_manager.py
@@ -1,21 +1,60 @@
import json
import os
+import time
import constant
-import tool
+from db.redis_manager import RedisUtils
+from utils import tool
# 寮�鐩樺暒鍘嗗彶娑ㄥ仠鏁版嵁绠＄悊
-from db import mysql_data
-from l2 import code_price_manager
-from third_data import kpl_util
+from db import mysql_data, redis_manager
+from log_module.log import logger_kpl_limit_up_reason_change
+from third_data import kpl_util, kpl_api
+from third_data.code_plate_key_manager import LimitUpCodesPlateKeyManager, CodesHisReasonAndBlocksManager
-INVALID_BLOCKS = ["涓�瀛ｆ姤澧為暱", "浜屽鎶ュ闀�", "涓夊鎶ュ闀�", "鍥涘鎶ュ闀�", "涓氱哗澧為暱", "涓姤澧為暱", "骞存姤澧為暱", "骞存姤棰勫", "鏃�", "娆℃柊鑲�", "ST鎽樺附", "瓒呰穼", "鑲℃潈杞",
- "骞惰喘閲嶇粍"]
+# 浠ｇ爜瀵瑰簲鐨勬定鍋滃師鍥犱繚瀛�
+from third_data.kpl_util import KPLPlatManager, KPLDataType
+
+
+class KPLCodeLimitUpReasonManager:
+ __redisManager = redis_manager.RedisManager(3)
+
+ def __get_redis(self):
+ return self.__redisManager.getRedis()
+
+ def save_reason(self, code, reason):
+ RedisUtils.setex(self.__get_redis(),f"kpl_limitup_reason-{code}", tool.get_expire(), reason)
+
+ def list_all(self):
+ keys = RedisUtils.keys(self.__get_redis(), "kpl_limitup_reason-*")
+ dict_ = {}
+ for k in keys:
+ val = RedisUtils.get(self.__get_redis(), k)
+ dict_[k.split("-")[1]] = val
+ return dict_
class KPLLimitUpDataRecordManager:
total_datas = None
latest_datas = {}
+ latest_origin_datas = []
+ __kplPlatManager = KPLPlatManager()
+ __LimitUpCodesPlateKeyManager = LimitUpCodesPlateKeyManager()
+ __CodesPlateKeysManager = CodesHisReasonAndBlocksManager()
+
+ @classmethod
+ def __load_hist_and_blocks(cls, code):
+ # 鏈夋暟鎹柊澧烇紝鍔犺浇鍘嗗彶鍘熷洜涓庢澘鍧�
+ his_reasons = cls.get_latest_infos(code, 10, False)
+ his_reasons = set([r[0] for r in his_reasons])
+ cls.__CodesPlateKeysManager.set_history_limit_up_reason(code, his_reasons)
+ try:
+ if not cls.__CodesPlateKeysManager.get_blocks(code):
+ results = kpl_api.getStockIDPlate(code)
+ bs = [r[1] for r in results]
+ cls.__CodesPlateKeysManager.set_blocks(code, bs)
+ except Exception as e:
+ pass
@classmethod
def save_record(cls, day, records):
@@ -28,22 +67,34 @@
if not code_block_dict.get(code):
code_block_dict[code] = set()
code_block_dict[code].add(b)
+ # 璁剧疆娑ㄥ仠鏁版嵁
+ if records:
+ cls.latest_origin_datas = records
+ cls.__LimitUpCodesPlateKeyManager.set_today_limit_up([(r[0], r[5]) for r in records])
# 娑ㄥ仠鏁版嵁璁板綍
mysqldb = mysql_data.Mysqldb()
+ # 缁熻娑ㄥ仠鍘熷洜鍜屾蹇典唬鐮�
+ plats = {}
for d in records:
- # (浠ｇ爜, 鍚嶇О, 棣栨娑ㄥ仠鏃堕棿, 鏈�杩戞定鍋滄椂闂�, 鍑犳澘, 娑ㄥ仠鍘熷洜, 鏉垮潡, 瀹為檯娴侀��, 涓诲姏鍑�棰�)
+ plats[d[5]] = d[9]
+ for p in plats:
+ cls.__kplPlatManager.save_plat(plats[p], p)
+
+ for d in records:
+ # (浠ｇ爜, 鍚嶇О, 棣栨娑ㄥ仠鏃堕棿, 鏈�杩戞定鍋滄椂闂�, 鍑犳澘, 娑ㄥ仠鍘熷洜, 鏉垮潡, 瀹為檯娴侀��, 涓诲姏鍑�棰�,娑ㄥ仠鍘熷洜浠ｇ爜,娑ㄥ仠鍘熷洜浠ｇ爜鏁伴噺)
code = d[0]
_id = f"{day}_{code}_{d[5]}"
result = mysqldb.select_one("select * from kpl_limit_up_record where _id='{}'".format(_id))
if not result:
mysqldb.execute(
- f"insert into kpl_limit_up_record(_id,_day,_hot_block_name,_code,_code_name,_limit_up_time,_blocks,_latest_limit_up_time,_update_time,_create_time) values('{_id}','{day}','{d[5]}','{d[0]}','{d[1]}','{d[2]}','{d[6]}','{d[3]}',now(),now())")
+ f"insert into kpl_limit_up_record(_id,_day,_hot_block_name,_code,_code_name,_limit_up_time,_blocks,_latest_limit_up_time,_update_time,_create_time,_hot_block_code_count,_limit_up_high_info,_zylt_val) values('{_id}','{day}','{d[5]}','{d[0]}','{d[1]}','{d[2]}','{d[6]}','{d[3]}',now(),now(),{d[10]},'{d[4]}',{d[7]})")
+ cls.__load_hist_and_blocks(code)
else:
if _id in cls.latest_datas and json.dumps(cls.latest_datas.get(_id)) != json.dumps(d):
mysqldb.execute(
- f"update kpl_limit_up_record set _latest_limit_up_time='{d[3]}',_limit_up_time='{d[2]}' ,_update_time=now() where _id='{_id}'")
+ f"update kpl_limit_up_record set _latest_limit_up_time='{d[3]}',_limit_up_time='{d[2]}',_hot_block_code_count={d[10]},_limit_up_high_info='{d[4]}' ,_update_time=now() where _id='{_id}'")
cls.latest_datas[_id] = d
cls.latest_datas[_id] = d
@@ -53,6 +104,14 @@
for dd in old_datas:
if dd[2] not in code_block_dict[code]:
mysqldb.execute(f"delete from kpl_limit_up_record where _id='{dd[0]}'")
+ logger_kpl_limit_up_reason_change.info(f"code-{dd[3]}:{dd[2]}-{code_block_dict[code]}")
+ # 鏉垮潡鏇存敼杩�
+ mysqldb.execute(
+ f"update kpl_limit_up_record set _hot_block_change = f'{dd[2]}' where _day='{dd[1]}' and _code='{code}'")
+
+ cls.__LimitUpCodesPlateKeyManager.set_today_limit_up_reason_change(code, dd[2],
+ code_block_dict[code])
+
if dd[0] in cls.latest_datas:
cls.latest_datas.pop(dd[0])
cls.total_datas = KPLLimitUpDataRecordManager.list_all(tool.get_now_date_str())
@@ -60,6 +119,9 @@
@classmethod
def load_total_datas(cls):
cls.total_datas = KPLLimitUpDataRecordManager.list_all(tool.get_now_date_str())
+ cls.__LimitUpCodesPlateKeyManager.set_today_total_limit_up([(r[3], r[2]) for r in cls.total_datas])
+ for d in cls.total_datas:
+ cls.__load_hist_and_blocks(d[3])
@staticmethod
def list_all(day):
@@ -93,25 +155,50 @@
@staticmethod
def get_latest_blocks(code):
wheres = []
- for b in INVALID_BLOCKS:
+ for b in constant.KPL_INVALID_BLOCKS:
wheres.append(f"hb.`_hot_block_name` != '{b}'")
wheres = " and ".join(wheres)
- sql = f"SELECT GROUP_CONCAT(_hot_block_name) FROM (SELECT hb.`_hot_block_name`,hb.`_day` FROM `kpl_limit_up_record` hb WHERE hb.`_code`='{code}' AND {wheres} ORDER BY hb.`_day` DESC LIMIT 10) a GROUP BY a._day ORDER BY a._day DESC LIMIT 1"
+ sql = f"SELECT GROUP_CONCAT(_hot_block_name) FROM (SELECT hb.`_hot_block_name`,hb.`_day` FROM `kpl_limit_up_record` hb WHERE hb.`_code`='{code}' AND {wheres} ORDER BY hb.`_day` DESC LIMIT 2) a GROUP BY a._day ORDER BY a._day DESC LIMIT 1"
mysqldb = mysql_data.Mysqldb()
return mysqldb.select_one(sql)
+
+ # 鑾峰彇浠ｇ爜鏈�杩戠殑鏉垮潡锛岃繑鍥瀃(鏉垮潡,鏃ユ湡)]
+ @classmethod
+ def get_latest_infos(cls, code, count, contains_today=True):
+ wheres = []
+ for b in constant.KPL_INVALID_BLOCKS:
+ wheres.append(f"hb.`_hot_block_name` != '{b}'")
+ wheres = " and ".join(wheres)
+ # 鍙幏鍙栨渶杩�180澶╃殑鏁版嵁
+ min_day = tool.date_sub(tool.get_now_date_str(), 180)
+ sql = f"SELECT GROUP_CONCAT(_hot_block_name),`_day`,_blocks FROM (SELECT hb.`_hot_block_name`,hb.`_day`,hb._blocks FROM `kpl_limit_up_record` hb WHERE hb.`_code`='{code}' and {wheres} and hb.`_day` > '{min_day}' ORDER BY hb.`_day` DESC LIMIT 10) a GROUP BY a._day ORDER BY a._day DESC LIMIT {count}"
+ mysqldb = mysql_data.Mysqldb()
+ results = mysqldb.select_all(sql)
+ if results and not contains_today and results[0][1] == tool.get_now_date_str():
+ return results[1:]
+ return results
+
+ @classmethod
+ def get_latest_blocks_set(cls, code):
+ results = cls.get_latest_infos(code, 2, False)
+ bs = set([b[0] for b in results])
+ return bs
class KPLDataManager:
__latest_datas = {}
+ kpl_data_update_info = {}
- def __save_in_file(self, key, datas):
+ @classmethod
+ def __save_in_file(cls, key, datas):
name = f"{tool.get_now_date_str()}_{key}.log"
path = f"{constant.CACHE_PATH}/{name}"
with open(path, 'w') as f:
f.write(json.dumps(datas))
- def __get_from_file(self, key):
- name = f"{tool.get_now_date_str()}_{key}.log"
+ @classmethod
+ def __get_from_file(cls, key, day=tool.get_now_date_str()):
+ name = f"{day}_{key}.log"
path = f"{constant.CACHE_PATH}/{name}"
if not os.path.exists(path):
return None
@@ -121,34 +208,107 @@
return json.loads(lines[0])
return None
- def save_data(self, type, datas):
- self.__latest_datas[type] = datas
- self.__save_in_file(type, datas)
+ @classmethod
+ def get_from_file(cls, type, day):
+ name = f"{day}_{type.value}.log"
+ path = f"{constant.CACHE_PATH}/{name}"
+ if not os.path.exists(path):
+ return None
+ with open(path, 'r') as f:
+ lines = f.readlines()
+ if lines:
+ return json.loads(lines[0])
+ return None
- def get_data(self, type):
+ @classmethod
+ # 鑾峰彇鏈�杩戝嚑澶╃殑鏁版嵁锛屾牴鎹棩鏈熷�掑簭杩斿洖
+ def get_latest_from_file(cls, type, count):
+ files = os.listdir(constant.CACHE_PATH)
+ file_name_list = []
+ for f in files:
+ if f[10:] == f"_{type.value}.log":
+ file_name_list.append((f.split("_")[0], f))
+
+ file_name_list.sort(key=lambda x: x[0], reverse=True)
+ file_name_list = file_name_list[:count]
+ fresults = []
+ for file in file_name_list:
+ path = f"{constant.CACHE_PATH}/{file[1]}"
+ if not os.path.exists(path):
+ continue
+ with open(path, 'r') as f:
+ lines = f.readlines()
+ if lines:
+ fresults.append((file[0], json.loads(lines[0])))
+
+ return fresults
+
+ @classmethod
+ def save_data(cls, type, datas):
+ cls.kpl_data_update_info[type] = (tool.get_now_time_str(), len(datas))
+ cls.__latest_datas[type] = datas
+ cls.__save_in_file(type, datas)
+
+ @classmethod
+ def get_data(cls, type):
type = type.value
- if type in self.__latest_datas:
- return self.__latest_datas[type]
- result = self.__get_from_file(type)
+ if type in cls.__latest_datas:
+ return cls.__latest_datas[type]
+ result = cls.__get_from_file(type)
if result is not None:
- self.__latest_datas[type] = result
+ cls.__latest_datas[type] = result
return result
def load_history_limit_up():
- for file_name in os.listdir("D:/kpl/his"):
+ for file_name in os.listdir(f"{constant.get_path_prefix()}/kpl/his"):
if file_name.find("HisDaBanList_1.log") < 0:
continue
day = file_name[:10]
- with open(f"D:/kpl/his/{file_name}", 'r', encoding="utf-16") as f:
+ with open(f"{constant.get_path_prefix()}/kpl/his/{file_name}", 'r', encoding="utf-16") as f:
lines = f.readlines()
line = lines[0]
result = json.loads(line)
list_ = kpl_util.parseDaBanData(result, kpl_util.DABAN_TYPE_LIMIT_UP)
- KPLLimitUpDataRecordManager.save_record(day, list_)
+ # KPLLimitUpDataRecordManager.save_record(day, list_)
+ for r in list_:
+ print(r[-1], r[5])
+ KPLPlatManager().save_plat(r[-1], r[5])
- print(day, list_)
+ # print(day, list_)
+
+
+# 鍘嗗彶娑ㄥ仠鍒楄〃
+__limit_up_list_records_dict = {}
+
+
+# 鑾峰彇鏈�杩戝嚑澶╃殑瀹炴椂娑ㄥ仠淇℃伅
+# 杩斿洖鏍煎紡锛圼鏃ユ湡,鏁版嵁]锛�
+def get_current_limit_up_data_records(count):
+ fresults = []
+ day = tool.get_now_date_str()
+ datas = []
+ if day in __limit_up_list_records_dict:
+ datas = __limit_up_list_records_dict[day]
+ else:
+ datas = KPLDataManager().get_latest_from_file(KPLDataType.LIMIT_UP, 10)
+ if datas:
+ # 淇濆瓨鏁版嵁
+ __limit_up_list_records_dict[day] = datas
+ for i in range(len(datas)):
+ if datas[i][0] == day:
+ continue
+ fresults.append(datas[i])
+ if len(fresults) >= count:
+ break
+ return fresults
+
+
+def get_yesterday_limit_up_codes():
+ yesterday_limit_up_data_records = get_current_limit_up_data_records(1)[0][1]
+ yesterday_codes = set([x[0] for x in yesterday_limit_up_data_records])
+ return yesterday_codes
if __name__ == "__main__":
- load_history_limit_up()
+ print(KPLLimitUpDataRecordManager.get_latest_blocks_set("002671"))
--
Gitblit v1.8.0