From 3188666e40694641e954f3334a28e3bee8cc4b17 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期五, 22 三月 2024 09:08:43 +0800
Subject: [PATCH] bug修复
---
third_data/data_server.py | 246 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 173 insertions(+), 73 deletions(-)
diff --git a/third_data/data_server.py b/third_data/data_server.py
index b3fb515..e3f960f 100644
--- a/third_data/data_server.py
+++ b/third_data/data_server.py
@@ -7,9 +7,9 @@
from http.server import BaseHTTPRequestHandler
import dask
-from code_attribute.gpcode_manager import BlackListCodeManager
+from code_attribute.gpcode_manager import BlackListCodeManager, CodePrePriceManager
from log_module.log import logger_system, logger_debug, logger_kpl_limit_up
-from utils import global_util, tool, data_export_util
+from utils import global_util, tool, data_export_util, init_data_util
from code_attribute import gpcode_manager
from log_module import log, log_analyse, log_export
from l2 import code_price_manager, l2_data_util, l2_data_manager_new, cancel_buy_strategy, transaction_progress
@@ -49,6 +49,8 @@
__industry_cache_dict = {}
__latest_limit_up_codes_set = set()
__data_process_thread_pool = concurrent.futures.ThreadPoolExecutor(max_workers=10)
+ # 浠ｇ爜鐨勬定骞�
+ __code_limit_rate_dict = {}
# 绂佺敤鏃ュ織杈撳嚭
def log_message(self, format, *args):
@@ -302,6 +304,7 @@
ps_dict = dict([(k, v[0]) for k, v in parse_qs(url.query).items()])
code = ps_dict['code']
name = ps_dict.get('name')
+ date = ps_dict.get('date')
try:
data = code_info_output.get_output_params(code, self.__jingxuan_cache_dict, self.__industry_cache_dict)
if data["code_name"].find("None") > -1 and name:
@@ -317,8 +320,23 @@
logger_debug.exception(e)
logging.exception(e)
- # 鑾峰彇璇勫垎淇℃伅
- pass
+ elif url.path == "/get_trade_records":
+ # 鑾峰彇鎸傛挙淇℃伅
+ ps_dict = dict([(k, v[0]) for k, v in parse_qs(url.query).items()])
+ code = ps_dict['code']
+ date = ps_dict.get('date')
+ local_today_datas = log_export.load_l2_from_log(date)
+ total_datas = local_today_datas.get(code)
+ trade_info = code_info_output.load_trade_record(code, total_datas, date)
+ response_data = json.dumps({"code": 0, "data": {"open_limit_up": trade_info[0], "records": trade_info[2]}})
+
+ elif url.path == "/get_l2_cant_buy_reasons":
+ # 鑾峰彇L2娌′拱鐨勫師鍥�
+ ps_dict = dict([(k, v[0]) for k, v in parse_qs(url.query).items()])
+ code = ps_dict['code']
+ fdatas = log_export.get_l2_cant_buy_reasons(code)
+ response_data = json.dumps({"code": 0, "data": fdatas})
+
elif url.path == "/get_kpl_block_info":
start_time = time.time()
ps_dict = dict([(k, v[0]) for k, v in parse_qs(url.query).items()])
@@ -332,12 +350,22 @@
logging.exception(e)
elif url.path == "/get_l2_datas":
- # 鑾峰彇L2鐨勬暟鎹�
- ps_dict = dict([(k, v[0]) for k, v in parse_qs(url.query).items()])
- code = ps_dict['code']
- datas = data_export_util.get_l2_datas(code)
- code_name = gpcode_manager.get_code_name(code)
- response_data = json.dumps({"code": 0, "data": {"code": code, "code_name": code_name, "data": datas}})
+ try:
+ # 鑾峰彇L2鐨勬暟鎹�
+ ps_dict = dict([(k, v[0]) for k, v in parse_qs(url.query).items()])
+ code = ps_dict['code']
+ date = ps_dict.get('date')
+ logger_debug.info(f"get_l2_datas:{code} {date}")
+ total_datas = l2_data_util.local_today_datas.get(code)
+ if date:
+ total_datas = None
+ else:
+ date = tool.get_now_date_str()
+ datas = data_export_util.get_l2_datas(code, total_datas, date=date)
+ code_name = gpcode_manager.get_code_name(code)
+ response_data = json.dumps({"code": 0, "data": {"code": code, "code_name": code_name, "data": datas}})
+ except Exception as e:
+ logger_debug.exception(e)
elif url.path == "/get_trade_progress":
# 鑾峰彇浜ゆ槗杩涘害
ps_dict = dict([(k, v[0]) for k, v in parse_qs(url.query).items()])
@@ -349,10 +377,13 @@
# 鏈�鏂扮殑l鎾ゆ暟鎹�
ps_dict = dict([(k, v[0]) for k, v in parse_qs(url.query).items()])
code = ps_dict['code']
+ date = ps_dict.get('date')
+ if not date:
+ date = tool.get_now_date_str()
buy_single_index = ps_dict.get('buy_single_index')
if buy_single_index is not None:
buy_single_index = int(buy_single_index)
- records = code_info_output.load_trade_record_cancel_watch_indexes(code)
+ records = code_info_output.load_trade_record_cancel_watch_indexes(code, date=date)
# 鑾峰彇鏈�鏂扮殑L涓婁笌L涓�
records.reverse()
up_indexes = []
@@ -443,7 +474,7 @@
elif url.path == "/kpl/get_plate_codes":
# 鑾峰彇娑ㄥ仠鍘熷洜涓嬮潰鐨勪唬鐮�
ps_dict = dict([(k, v[0]) for k, v in parse_qs(url.query).items()])
- plate = ps_dict["plate"]
+ plate = kpl_util.filter_block(ps_dict["plate"])
# 鑾峰彇鏉垮潡涓嬬殑浠ｇ爜
# 缁熻鐩墠涓烘鐨勪唬鐮佹定鍋滄暟閲忥紙鍒嗘定鍋滃師鍥狅級
now_limit_up_codes_info = self.__kplDataManager.get_data(KPLDataType.LIMIT_UP)
@@ -456,12 +487,23 @@
codes_info = []
for d in record_limit_up_datas:
- if d[2] != plate:
+ if kpl_util.filter_block(d[2]) != plate:
continue
# 浠ｇ爜,鍚嶇О,娑ㄥ仠鏃堕棿,鏄惁鐐告澘,鏄惁鎯充拱,鏄惁宸茬粡涓嬭繃鍗�
codes_info.append(
[d[3], d[4], tool.to_time_str(int(d[5])), 1 if d[3] not in now_limit_up_codes else 0, 0, 0, d[12],
- output_util.money_desc(d[13])])
+ output_util.money_desc(d[13]), 1])
+
+ for d in record_limit_up_datas:
+ if kpl_util.filter_block(d[2]) == plate:
+ continue
+ if plate not in [kpl_util.filter_block(k) for k in d[6].split("銆�")]:
+ continue
+ # 浠ｇ爜,鍚嶇О,娑ㄥ仠鏃堕棿,鏄惁鐐告澘,鏄惁鎯充拱,鏄惁宸茬粡涓嬭繃鍗�
+ codes_info.append(
+ [d[3], d[4], tool.to_time_str(int(d[5])), 1 if d[3] not in now_limit_up_codes else 0, 0, 0, d[12],
+ output_util.money_desc(d[13]), 0])
+
codes_info.sort(key=lambda x: x[2])
# 鏌ヨ鏄惁涓烘兂涔板崟
want_codes = gpcode_manager.WantBuyCodesManager().list_code_cache()
@@ -473,6 +515,36 @@
code_info[5] = 1
response_data = json.dumps({"code": 0, "data": codes_info})
+ elif url.path == "/kpl/get_open_limit_up_count_rank":
+ # 鑾峰彇鐐告澘娆℃暟鎺掕
+ ps_dict = dict([(k, v[0]) for k, v in parse_qs(url.query).items()])
+ code = ps_dict.get("code")
+ results = log_export.load_kpl_open_limit_up()
+ statistic = {}
+ for result in results:
+ for c in result[1]:
+ if not tool.is_shsz_code(c):
+ continue
+ if code and code != c:
+ continue
+ if c not in statistic:
+ statistic[c] = 0
+ statistic[c] += 1
+ # 鍊掑簭鎺�
+ statistic_list = [(k, statistic[k]) for k in statistic]
+ statistic_list.sort(key=lambda x: x[1], reverse=True)
+ fresults = []
+ limit_up_records = KPLLimitUpDataRecordManager.list_all_cache(tool.get_now_date_str())
+ limit_up_count_dict = {}
+ if limit_up_records:
+ for d in limit_up_records:
+ limit_up_count_dict[d[3]] = d[12]
+
+ for x in statistic_list:
+ fresults.append((x[0], gpcode_manager.get_code_name(x[0]), x[1],limit_up_count_dict.get(x[0])))
+
+ fresults = fresults[:30]
+ response_data = json.dumps({"code": 0, "data": fresults})
elif url.path == "/get_h_cancel_data":
ps_dict = dict([(k, v[0]) for k, v in parse_qs(url.query).items()])
code = ps_dict["code"]
@@ -512,42 +584,86 @@
response_data = json.dumps({"code": 1, "msg": "璇蜂笂浼燾ode"})
elif url.path == "/get_last_trade_day_reasons":
- # 鑾峰彇涓婁釜浜ゆ槗鏃ョ殑鐩稿悓娑ㄥ仠鍘熷洜鐨勪唬鐮佷俊鎭�
- ps_dict = dict([(k, v[0]) for k, v in parse_qs(url.query).items()])
- code = ps_dict["code"]
- # 鑾峰彇鏄ㄦ棩娑ㄥ仠鏁版嵁
- day = HistoryKDatasUtils.get_previous_trading_date_cache(tool.get_now_date_str())
- limit_up_records = kpl_data_manager.KPLLimitUpDataRecordManager.list_all_cache(day)
- reasons = []
- for d in limit_up_records:
- if d[3] == code:
- reasons.append(d)
- # 鑾峰彇浠ｇ爜鐨勫師鍥�
- if reasons:
- reasons = list(reasons)
- reasons.sort(key=lambda x: x[9])
- reason = reasons[-1][2]
- # 鑾峰彇娑ㄥ仠鏁版嵁
- datas = self.__kplDataManager.get_from_file_cache(kpl_util.KPLDataType.LIMIT_UP, day)
- # (浠ｇ爜,鍚嶇О,棣栨娑ㄥ仠鏃堕棿,鏈�杩戞定鍋滄椂闂�,鍑犳澘,娑ㄥ仠鍘熷洜,鏉垮潡,瀹為檯娴侀��,涓诲姏鍑�棰�,娑ㄥ仠鍘熷洜浠ｇ爜,娑ㄥ仠鍘熷洜浠ｇ爜鏁伴噺)
- yesterday_result_list = []
- if datas:
- for d in datas:
- if d[5] == reason and d[0] != code:
- # (浠ｇ爜,鍚嶇О)
- yesterday_result_list.append((d[0], d[1]))
- current_limit_up_list = kpl_data_manager.KPLLimitUpDataRecordManager.latest_origin_datas
- current_result_list = []
- if current_limit_up_list:
- for c in current_limit_up_list:
- if c[5] == reason and c[0] != code:
- current_result_list.append((c[0], c[1]))
- response_data = json.dumps({"code": 0, "data": {"reason": reason,
- "data": {"yesterday": yesterday_result_list,
- "current": current_result_list}}})
- else:
- response_data = json.dumps({"code": 1, "msg": "鏄ㄦ棩鏈定鍋�"})
+ # 璁＄畻骞冲潎娑ㄥ箙
+ def get_limit_rate_list(codes):
+ if not codes:
+ return []
+ need_request_codes = set()
+ if tool.trade_time_sub(tool.get_now_time_str(), "09:30:00") < 0:
+ need_request_codes |= set(codes)
+ else:
+ now_time = time.time()
+ for c in codes:
+ if c not in self.__code_limit_rate_dict:
+ need_request_codes.add(c)
+ elif now_time - self.__code_limit_rate_dict[c][1] > 60:
+ need_request_codes.add(c)
+ if need_request_codes:
+ _limit_rate_list = HistoryKDatasUtils.get_codes_limit_rate(list(need_request_codes))
+ for d in _limit_rate_list:
+ self.__code_limit_rate_dict[d[0]] = (d[1], time.time())
+ return [(c_, self.__code_limit_rate_dict[c_][0]) for c_ in codes]
+
+ try:
+ raise Exception("鎺ュ彛鏆傚仠浣跨敤")
+ # 鑾峰彇涓婁釜浜ゆ槗鏃ョ殑鐩稿悓娑ㄥ仠鍘熷洜鐨勪唬鐮佷俊鎭�
+ ps_dict = dict([(k, v[0]) for k, v in parse_qs(url.query).items()])
+ code = ps_dict["code"]
+ # 鑾峰彇鏄ㄦ棩娑ㄥ仠鏁版嵁
+ day = HistoryKDatasUtils.get_previous_trading_date_cache(tool.get_now_date_str())
+
+ limit_up_records = kpl_data_manager.KPLLimitUpDataRecordManager.list_all_cache(day)
+ reasons = []
+ for d in limit_up_records:
+ if d[3] == code:
+ reasons.append(d)
+ # 鑾峰彇浠ｇ爜鐨勫師鍥�
+ if reasons:
+ reasons = list(reasons)
+ reasons.sort(key=lambda x: x[9])
+ reason = reasons[-1][2]
+ # 鑾峰彇娑ㄥ仠鏁版嵁
+ datas = self.__kplDataManager.get_from_file_cache(kpl_util.KPLDataType.LIMIT_UP, day)
+ # (浠ｇ爜,鍚嶇О,棣栨娑ㄥ仠鏃堕棿,鏈�杩戞定鍋滄椂闂�,鍑犳澘,娑ㄥ仠鍘熷洜,鏉垮潡,瀹為檯娴侀��,涓诲姏鍑�棰�,娑ㄥ仠鍘熷洜浠ｇ爜,娑ㄥ仠鍘熷洜浠ｇ爜鏁伴噺)
+ yesterday_result_list = []
+ percent_rate = 0
+ if datas:
+ yesterday_codes = set()
+ for d in datas:
+ if d[5] == reason:
+ yesterday_codes.add(d[0])
+ # 鑾峰彇娑ㄥ箙
+ limit_rate_list = get_limit_rate_list(yesterday_codes)
+ limit_rate_dict = {}
+ if limit_rate_list:
+ total_rate = 0
+ for d in limit_rate_list:
+ limit_rate_dict[d[0]] = d[1]
+ total_rate += d[1]
+ percent_rate = round(total_rate / len(limit_rate_list), 2)
+
+ for d in datas:
+ if d[5] == reason:
+ yesterday_codes.add(d[0])
+ if d[0] != code:
+ # (浠ｇ爜,鍚嶇О, 娑ㄥ箙)
+ yesterday_result_list.append((d[0], d[1], limit_rate_dict.get(d[0])))
+
+ current_limit_up_list = kpl_data_manager.KPLLimitUpDataRecordManager.latest_origin_datas
+ current_result_list = []
+ if current_limit_up_list:
+ for c in current_limit_up_list:
+ if c[5] == reason and c[0] != code:
+ current_result_list.append((c[0], c[1]))
+ response_data = json.dumps({"code": 0, "data": {"reason": reason, "reason_rate": percent_rate,
+ "data": {"yesterday": yesterday_result_list,
+ "current": current_result_list}}})
+ else:
+ response_data = json.dumps({"code": 1, "msg": "鏄ㄦ棩鏈定鍋�"})
+ except Exception as e:
+ logger_debug.exception(e)
+ raise e
elif url.path == "/pull_kp_client_msg":
# 鎷夊彇瀹㈡埛绔秷鎭�
@@ -579,7 +695,7 @@
result_str = self.__process_kpl_data(params)
self.__send_response(result_str)
- def __process_kpl_data(self, data):
+ def __process_kpl_data(self, data_origin):
def do_limit_up(result_list_):
if result_list_:
# 淇濆瓨娑ㄥ仠鏃堕棿
@@ -635,8 +751,9 @@
logger_debug.exception(e)
kpl_data_manager.KPLLimitUpDataRecordManager.save_record(tool.get_now_date_str(), result_list_)
self.__kplDataManager.save_data(type_, result_list_)
+
# 灏�"姒傚康"浜屽瓧鏇挎崲鎺�
- data = json.loads(json.dumps(data).replace("姒傚康", ""))
+ data = data_origin
type_ = data["type"]
print("寮�鐩樺暒type:", type_)
if type_ == KPLDataType.BIDDING.value:
@@ -653,7 +770,7 @@
self.__kplDataManager.save_data(type_, result_list)
elif type_ == KPLDataType.LIMIT_UP.value:
- result_list = kpl_util.parseDaBanData(data["data"], kpl_util.DABAN_TYPE_LIMIT_UP)
+ result_list = kpl_util.parseLimitUpData(data["data"])
self.__data_process_thread_pool.submit(lambda: do_limit_up(result_list))
# 璁板綍娑ㄥ仠鏃ュ織
logger_kpl_limit_up.info(result_list)
@@ -736,25 +853,8 @@
if __name__ == "__main__":
- code = "002676"
- buy_single_index = 716
- records = code_info_output.load_trade_record_cancel_watch_indexes(code)
- # 鑾峰彇鏈�鏂扮殑L涓婁笌L涓�
- records.reverse()
- up_indexes = []
- down_indexes = []
- for r in records:
- if buy_single_index and buy_single_index != r[1]:
- continue
- if r[0] == trade_record_log_util.CancelWatchIndexesInfo.CANCEL_TYPE_L_UP:
- up_indexes = r[2]
- break
- for r in records:
- if buy_single_index and buy_single_index != r[1]:
- continue
- if r[0] == trade_record_log_util.CancelWatchIndexesInfo.CANCEL_TYPE_L_DOWN:
- down_indexes = r[2]
- break
+ code = "600822"
+ records = code_info_output.load_trade_record_cancel_watch_indexes(code, date="2024-03-12")
- response_data = json.dumps(
- {"code": 0, "data": {"up": up_indexes, "down": down_indexes}})
+ # data = code_info_output.get_output_params(code, self.__jingxuan_cache_dict, self.__industry_cache_dict,
+ # trade_record_date=date)
--
Gitblit v1.8.0