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 | 291 ++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 241 insertions(+), 50 deletions(-)
diff --git a/third_data/kpl_data_manager.py b/third_data/kpl_data_manager.py
index df23bd8..c25b70a 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,12 +9,15 @@
import constant
from db.redis_manager_delegate import RedisUtils
+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
-from third_data import kpl_util, kpl_api
+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, kpl_data_constant
from third_data.code_plate_key_manager import LimitUpCodesPlateKeyManager, CodesHisReasonAndBlocksManager
# 浠ｇ爜瀵瑰簲鐨勬定鍋滃師鍥犱繚瀛�
@@ -45,6 +49,13 @@
__kplPlatManager = KPLPlatManager()
__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):
@@ -62,9 +73,24 @@
@classmethod
def save_record(cls, day, records):
+ # 缁熻鐐告澘
+ try:
+ last_codes = set()
+ if cls.latest_origin_datas:
+ last_codes = set([x[0] for x in cls.latest_origin_datas])
+ now_codes = set()
+ if records:
+ now_codes = set([x[0] for x in records])
+ open_limit_up_codes = last_codes - now_codes
+ if open_limit_up_codes:
+ logger_kpl_open_limit_up.info(f"鐐告澘浠ｇ爜锛歿open_limit_up_codes}")
+ except Exception as e:
+ pass
+
# 缁熻浠ｇ爜鎵�灞炴澘鍧�
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:
@@ -74,7 +100,30 @@
# 璁剧疆娑ㄥ仠鏁版嵁
if records:
cls.latest_origin_datas = records
- cls.__LimitUpCodesPlateKeyManager.set_today_limit_up([(r[0], r[5]) for r in 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]:
+ bs |= set(d[6].split("銆�"))
+ code_reasons_dict[d[0]] = bs
+ for b in bs:
+ if b not in reason_codes_dict:
+ reason_codes_dict[b] = set()
+ 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()
@@ -119,11 +168,13 @@
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):
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])
+ cls.__LimitUpCodesPlateKeyManager.set_today_total_limit_up(
+ [(r[3], r[2], r[6].split("銆�") if r[6] else []) for r in cls.total_datas])
for d in cls.total_datas:
cls.__load_hist_and_blocks(d[3])
@@ -131,6 +182,15 @@
def list_all(day):
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):
@@ -183,15 +243,66 @@
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])
return bs
+ @classmethod
+ def get_current_blocks(cls, code):
+ return cls.__current_code_reasons_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_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:
__latest_datas = {}
kpl_data_update_info = {}
+ __file_content_cache = {}
@classmethod
def __save_in_file(cls, key, datas):
@@ -223,6 +334,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 +417,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,73 +431,143 @@
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 run_pull_task():
- def __upload_data(type, datas):
+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)
+
+
+class PullTask:
+ # 鏈�杩戞洿鏂版椂闂�
+ __latest_update_time_dict = {}
+
+ @classmethod
+ def __upload_data(cls, type, datas):
root_data = {
"type": type,
"data": datas
}
requests.post("http://127.0.0.1:9004/upload_kpl_data", json.dumps(root_data))
- def get_limit_up():
+ @classmethod
+ def repaire_pull_task(cls):
+ """
+ 淇鎷夊彇浠诲姟
+ @return:
+ """
+ # 淇娑ㄥ仠
+ logger_debug.info("浠诲姟淇-寮�鐩樺暒锛氬惎鍔ㄤ慨澶�")
+ key = "limit_up"
+ 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_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:
- if tool.is_trade_time():
- try:
- results = kpl_api.daBanList(kpl_api.DABAN_TYPE_LIMIT_UP)
+ try:
+ if (tool.is_trade_time() and int(tool.get_now_time_str().replace(':', '')) > int("092530")):
+ results = kpl_api.getLimitUpInfoNew()
result = json.loads(results)
start_time = time.time()
- __upload_data("limit_up", result)
- logger_kpl_limit_up_reason_change.info("涓婁紶鑰楁椂锛歿}", time.time() - start_time)
- except Exception as e:
+ cls.__upload_data("limit_up", result)
+ except Exception as e:
+ try:
logging.exception(e)
- time.sleep(3)
-
- def get_bidding_money():
- # 绔炰环鏁版嵁涓婁紶
- while True:
- if int("092600") < int(tool.get_now_time_str().replace(":", "")) < int("092700"):
- try:
- results = kpl_api.daBanList(kpl_api.DABAN_TYPE_BIDDING)
- result = json.loads(results)
- __upload_data("biddings", result)
- except Exception as e:
- pass
- time.sleep(3)
-
- def get_market_industry():
- while True:
- if tool.is_trade_time():
- try:
- results = kpl_api.getMarketIndustryRealRankingInfo()
- result = json.loads(results)
- __upload_data("industry_rank", result)
+ logger_debug.exception(e)
except:
pass
- time.sleep(3)
+ except:
+ pass
+ finally:
+ cls.__latest_update_time_dict["limit_up"] = time.time()
+ time.sleep(3)
- def get_market_jingxuan():
+ @classmethod
+ def run_market_jingxuan(cls):
while True:
- if tool.is_trade_time():
- try:
+ try:
+ if tool.is_trade_time():
results = kpl_api.getMarketJingXuanRealRankingInfo()
result = json.loads(results)
- __upload_data("jingxuan_rank", result)
- except:
- pass
- time.sleep(3)
+ cls.__upload_data("jingxuan_rank", result)
+ except:
+ pass
+ finally:
+ cls.__latest_update_time_dict["jingxuan_rank"] = time.time()
+ time.sleep(3)
- threading.Thread(target=get_limit_up, 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()
+ @classmethod
+ # 杩愯鎷夊彇浠诲姟
+ def run_pull_task(cls):
+ def get_bidding_money():
+ # 绔炰环鏁版嵁涓婁紶
+ while True:
+ if int("092600") < int(tool.get_now_time_str().replace(":", "")) < int("092700"):
+ try:
+ results = kpl_api.daBanList(kpl_api.DABAN_TYPE_BIDDING)
+ result = json.loads(results)
+ cls.__upload_data("biddings", result)
+ except Exception as e:
+ pass
+ time.sleep(3)
+
+ def get_market_industry():
+ while True:
+ if tool.is_trade_time():
+ try:
+ results = kpl_api.getMarketIndustryRealRankingInfo()
+ result = json.loads(results)
+ cls.__upload_data("industry_rank", result)
+ except:
+ pass
+ time.sleep(3)
+
+ def get_market_jingxuan():
+ while True:
+ if tool.is_trade_time():
+ try:
+ 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)
+ 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=cls.run_market_jingxuan, daemon=True).start()
if __name__ == "__main__":
- run_pull_task()
+ PullTask.run_pull_task()
input()
--
Gitblit v1.8.0