From f0248f54f90a12f491245f0ee3ccfbe8f477a76b Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期五, 22 十二月 2023 14:24:20 +0800
Subject: [PATCH] bug修复
---
third_data/kpl_data_manager.py | 88 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 82 insertions(+), 6 deletions(-)
diff --git a/third_data/kpl_data_manager.py b/third_data/kpl_data_manager.py
index df23bd8..5b0f2e8 100644
--- a/third_data/kpl_data_manager.py
+++ b/third_data/kpl_data_manager.py
@@ -1,3 +1,4 @@
+import copy
import json
import logging
import os
@@ -8,11 +9,12 @@
import constant
from db.redis_manager_delegate import RedisUtils
+from log_module import async_log_util
from utils import tool
# 寮�鐩樺暒鍘嗗彶娑ㄥ仠鏁版嵁绠＄悊
from db import mysql_data_delegate as mysql_data, redis_manager_delegate as redis_manager
-from log_module.log import logger_kpl_limit_up_reason_change, logger_debug
+from log_module.log import logger_kpl_limit_up_reason_change, logger_debug, logger_kpl_limit_up
from third_data import kpl_util, kpl_api
from third_data.code_plate_key_manager import LimitUpCodesPlateKeyManager, CodesHisReasonAndBlocksManager
@@ -45,6 +47,9 @@
__kplPlatManager = KPLPlatManager()
__LimitUpCodesPlateKeyManager = LimitUpCodesPlateKeyManager()
__CodesPlateKeysManager = CodesHisReasonAndBlocksManager()
+ __current_code_reason_dict = {}
+ __current_reason_codes_dict = {}
+ __records_cache = {}
@classmethod
def __load_hist_and_blocks(cls, code):
@@ -75,6 +80,16 @@
if records:
cls.latest_origin_datas = records
cls.__LimitUpCodesPlateKeyManager.set_today_limit_up([(r[0], r[5]) for r in records])
+
+ code_reason_dict = {}
+ reason_code_dict = {}
+ for d in records:
+ code_reason_dict[d[0]] = d[5]
+ if d[5] not in reason_code_dict:
+ reason_code_dict[d[5]] = set()
+ reason_code_dict[d[5]].add(d[0])
+ cls.__current_code_reason_dict = code_reason_dict
+ cls.__current_reason_codes_dict = reason_code_dict
# 娑ㄥ仠鏁版嵁璁板綍
mysqldb = mysql_data.Mysqldb()
@@ -132,6 +147,15 @@
mysqldb = mysql_data.Mysqldb()
return mysqldb.select_all(f"select * from kpl_limit_up_record where _day='{day}'")
+ @classmethod
+ def list_all_cache(cls, day):
+ if day in cls.__records_cache:
+ return cls.__records_cache[day]
+ fdata = cls.list_all(day)
+ if fdata:
+ cls.__records_cache[day] = fdata
+ return fdata
+
@staticmethod
def list_by_code(code, day):
mysqldb = mysql_data.Mysqldb()
@@ -188,10 +212,29 @@
bs = set([b[0] for b in results])
return bs
+ @classmethod
+ def get_current_block(cls, code):
+ return cls.__current_code_reason_dict.get(code)
+
+ @classmethod
+ def get_current_codes_by_block(cls, block):
+ return cls.__current_reason_codes_dict.get(block)
+
+ @classmethod
+ def get_current_reason_codes_dict(cls):
+ return copy.deepcopy(cls.__current_reason_codes_dict)
+
+ @classmethod
+ def get_current_reasons(cls):
+ if cls.__current_reason_codes_dict:
+ return cls.__current_reason_codes_dict.keys()
+ return set()
+
class KPLDataManager:
__latest_datas = {}
kpl_data_update_info = {}
+ __file_content_cache = {}
@classmethod
def __save_in_file(cls, key, datas):
@@ -223,6 +266,16 @@
if lines:
return json.loads(lines[0])
return None
+
+ @classmethod
+ def get_from_file_cache(cls, type, day):
+ key = f"{type}-{day}"
+ if key in cls.__file_content_cache:
+ return cls.__file_content_cache.get(key)
+ fdata = cls.get_from_file(type, day)
+ if fdata:
+ cls.__file_content_cache[key] = fdata
+ return fdata
@classmethod
# 鑾峰彇鏈�杩戝嚑澶╃殑鏁版嵁锛屾牴鎹棩鏈熷�掑簭杩斿洖
@@ -296,7 +349,7 @@
datas = __limit_up_list_records_dict[day]
else:
logger_debug.info("浠庢枃浠朵腑鑾峰彇鍓嶅嚑澶╃殑瀹炴椂娑ㄥ仠鏁版嵁")
- datas = KPLDataManager().get_latest_from_file(KPLDataType.LIMIT_UP, 10)
+ datas = KPLDataManager().get_latest_from_file(KPLDataType.LIMIT_UP, count + 2)
if datas:
# 淇濆瓨鏁版嵁
__limit_up_list_records_dict[day] = datas
@@ -310,9 +363,26 @@
def get_yesterday_limit_up_codes():
- yesterday_limit_up_data_records = get_current_limit_up_data_records(1)[0][1]
+ yesterday_limit_up_data_records = get_yesterday_current_limit_up_records()
yesterday_codes = set([x[0] for x in yesterday_limit_up_data_records])
return yesterday_codes
+
+
+def get_yesterday_current_limit_up_records():
+ yesterday_limit_up_data_records = get_current_limit_up_data_records(1)[0][1]
+ return yesterday_limit_up_data_records
+
+
+# 鑾峰彇鏈�杩戝嚑澶╂定鍋滃師鍥�
+__latest_current_limit_up_records = {}
+
+
+def get_latest_current_limit_up_records():
+ day = tool.get_now_date_str()
+ if day not in __latest_current_limit_up_records:
+ fdatas = get_current_limit_up_data_records(15)
+ __latest_current_limit_up_records[day] = fdatas
+ return __latest_current_limit_up_records.get(day)
# 杩愯鎷夊彇浠诲姟
@@ -325,14 +395,19 @@
requests.post("http://127.0.0.1:9004/upload_kpl_data", json.dumps(root_data))
def get_limit_up():
+ last_time = 0
while True:
if tool.is_trade_time():
try:
- results = kpl_api.daBanList(kpl_api.DABAN_TYPE_LIMIT_UP)
+ results = kpl_api.getLimitUpInfo()
result = json.loads(results)
start_time = time.time()
__upload_data("limit_up", result)
- logger_kpl_limit_up_reason_change.info("涓婁紶鑰楁椂锛歿}", time.time() - start_time)
+ if start_time - last_time >= 60:
+ last_time = time.time()
+ # 璁板綍娑ㄥ仠鏁版嵁
+ logger_kpl_limit_up.info(result)
+ # logger_kpl_limit_up_reason_change.info("涓婁紶鑰楁椂锛歿}", time.time() - start_time)
except Exception as e:
logging.exception(e)
time.sleep(3)
@@ -378,5 +453,6 @@
if __name__ == "__main__":
- run_pull_task()
+ print(get_latest_current_limit_up_records())
+ print(get_latest_current_limit_up_records())
input()
--
Gitblit v1.8.0