From aacc6148dd43a9cffbff9a23a273a55b64bf3d8c Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期六, 12 十月 2024 17:21:42 +0800
Subject: [PATCH] bug修复
---
third_data/kpl_data_manager.py | 83 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 76 insertions(+), 7 deletions(-)
diff --git a/third_data/kpl_data_manager.py b/third_data/kpl_data_manager.py
index a9cbfac..c25b70a 100644
--- a/third_data/kpl_data_manager.py
+++ b/third_data/kpl_data_manager.py
@@ -9,14 +9,15 @@
import constant
from db.redis_manager_delegate import RedisUtils
-from log_module import async_log_util
+from log_module import async_log_util, log
+from third_data.kpl_data_constant import LimitUpDataConstant
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, logger_kpl_limit_up, \
logger_kpl_open_limit_up
-from third_data import kpl_util, kpl_api
+from third_data import kpl_util, kpl_api, kpl_data_constant
from third_data.code_plate_key_manager import LimitUpCodesPlateKeyManager, CodesHisReasonAndBlocksManager
# 浠ｇ爜瀵瑰簲鐨勬定鍋滃師鍥犱繚瀛�
@@ -49,8 +50,12 @@
__LimitUpCodesPlateKeyManager = LimitUpCodesPlateKeyManager()
__CodesPlateKeysManager = CodesHisReasonAndBlocksManager()
__current_code_reasons_dict = {}
+ # 褰撳墠娑ㄥ仠鍘熷洜+鎺ㄨ崘鍘熷洜鐨勪唬鐮侀泦鍚�
__current_reason_codes_dict = {}
+ # 褰撳墠娑ㄥ仠鍘熷洜鐨勪唬鐮侀泦鍚�
+ __current_limit_up_reason_codes_dict = {}
__records_cache = {}
+ record_code_dict = {}
@classmethod
def __load_hist_and_blocks(cls, code):
@@ -85,6 +90,7 @@
# 缁熻浠ｇ爜鎵�灞炴澘鍧�
code_block_dict = {}
for data in records:
+ cls.record_code_dict[data[0]] = data
blocks = set(data[5].split("銆�"))
code = data[0]
for b in blocks:
@@ -92,15 +98,20 @@
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], r[6].split('銆�') if r[6] else []) for r in records])
+ LimitUpDataConstant.set_current_limit_up_datas(records)
code_reasons_dict = {}
reason_codes_dict = {}
+ limit_up_reason_codes_dict = {}
for d in records:
+ if d[5] not in limit_up_reason_codes_dict:
+ limit_up_reason_codes_dict[d[5]] = set()
+ limit_up_reason_codes_dict[d[5]].add(d[0])
+
# 娑ㄥ仠鍘熷洜 + 鎺ㄨ崘鍘熷洜
bs = {d[5]}
if d[6]:
@@ -112,6 +123,7 @@
reason_codes_dict[b].add(d[0])
cls.__current_code_reasons_dict = code_reasons_dict
cls.__current_reason_codes_dict = reason_codes_dict
+ cls.__current_limit_up_reason_codes_dict = limit_up_reason_codes_dict
# 娑ㄥ仠鏁版嵁璁板綍
mysqldb = mysql_data.Mysqldb()
@@ -156,6 +168,7 @@
if dd[0] in cls.latest_datas:
cls.latest_datas.pop(dd[0])
cls.total_datas = KPLLimitUpDataRecordManager.list_all(tool.get_now_date_str())
+ LimitUpDataConstant.set_history_limit_up_datas(cls.total_datas)
@classmethod
def load_total_datas(cls):
@@ -230,6 +243,22 @@
return results
@classmethod
+ def get_latest_block_infos(cls, min_day=tool.date_sub(tool.get_now_date_str(), 180), code=None):
+ """
+
+ @param min_day: 榛樿鑾峰彇180澶╀箣鍓嶇殑
+ @param code: 浠ｇ爜
+ @return: 鏈�杩戠殑娑ㄥ仠鏉垮潡淇℃伅
+ """
+ sql = f"SELECT r.`_code`, r.`_day`, r.`_hot_block_name`, r.`_blocks` FROM `kpl_limit_up_record` r WHERE r.`_day`>'{min_day}'"
+ if code:
+ sql += f" AND _code='{code}'"
+ sql += " order by _create_time"
+ mysqldb = mysql_data.Mysqldb()
+ results = mysqldb.select_all(sql)
+ 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])
@@ -248,10 +277,26 @@
return copy.deepcopy(cls.__current_reason_codes_dict)
@classmethod
+ def get_current_limit_up_reason_codes_dict(cls):
+ return copy.deepcopy(cls.__current_limit_up_reason_codes_dict)
+
+ @classmethod
def get_current_reasons(cls):
if cls.__current_reason_codes_dict:
return cls.__current_reason_codes_dict.keys()
return set()
+
+ @classmethod
+ def get_new_blocks(cls, day):
+ """
+ 鑾峰彇鏌愪竴澶╂柊鍑虹幇鐨勬澘鍧�(鏂版澘鍧�)
+ @param day:
+ @return:
+ """
+ sql = f"SELECT k.`_hot_block_name`, k.`_day` FROM `kpl_limit_up_record` k GROUP BY k.`_hot_block_name` HAVING k.`_day`='{day}' ORDER BY k.`_day` DESC"
+ mysqldb = mysql_data.Mysqldb()
+ results = mysqldb.select_all(sql)
+ return [x[0] for x in results]
class KPLDataManager:
@@ -433,9 +478,16 @@
logger_debug.info("浠诲姟淇-寮�鐩樺暒锛氭定鍋滃垪琛�")
# 澶т簬20s灏遍渶瑕佹洿鏂�
threading.Thread(target=cls.run_limit_up_task, daemon=True).start()
+ key = "jingxuan_rank"
+ if key not in cls.__latest_update_time_dict or time.time() - cls.__latest_update_time_dict[key] > 20:
+ logger_debug.info("浠诲姟淇-寮�鐩樺暒锛氱簿閫夊垪琛�")
+ # 澶т簬20s灏遍渶瑕佹洿鏂�
+ threading.Thread(target=cls.run_market_jingxuan, daemon=True).start()
@classmethod
def run_limit_up_task(cls):
+ # 鍏抽棴log
+ log.close_print()
while True:
try:
if (tool.is_trade_time() and int(tool.get_now_time_str().replace(':', '')) > int("092530")):
@@ -453,6 +505,20 @@
pass
finally:
cls.__latest_update_time_dict["limit_up"] = time.time()
+ time.sleep(3)
+
+ @classmethod
+ def run_market_jingxuan(cls):
+ while True:
+ try:
+ if tool.is_trade_time():
+ results = kpl_api.getMarketJingXuanRealRankingInfo()
+ result = json.loads(results)
+ cls.__upload_data("jingxuan_rank", result)
+ except:
+ pass
+ finally:
+ cls.__latest_update_time_dict["jingxuan_rank"] = time.time()
time.sleep(3)
@classmethod
@@ -490,15 +556,18 @@
cls.__upload_data("jingxuan_rank", result)
except:
pass
- time.sleep(3)
+ finally:
+ cls.__latest_update_time_dict["jingxuan_rank"] = time.time()
+ time.sleep(3)
+ else:
+ time.sleep(3)
threading.Thread(target=cls.run_limit_up_task, daemon=True).start()
# threading.Thread(target=get_bidding_money, daemon=True).start()
# threading.Thread(target=get_market_industry, daemon=True).start()
- # threading.Thread(target=get_market_jingxuan, daemon=True).start()
+ threading.Thread(target=cls.run_market_jingxuan, daemon=True).start()
if __name__ == "__main__":
- print(get_latest_current_limit_up_records())
- print(get_latest_current_limit_up_records())
+ PullTask.run_pull_task()
input()
--
Gitblit v1.8.0