From ba52d7ac92a36f413eacaa686f8535e859664ec6 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期一, 28 八月 2023 09:45:11 +0800
Subject: [PATCH] bug修改
---
third_data/data_server.py | 269 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 221 insertions(+), 48 deletions(-)
diff --git a/third_data/data_server.py b/third_data/data_server.py
index b1fa9a3..24bb2de 100644
--- a/third_data/data_server.py
+++ b/third_data/data_server.py
@@ -1,26 +1,25 @@
-import base64
+import http
import json
-import logging
import socketserver
import time
from http.server import BaseHTTPRequestHandler
-import cv2
import dask
-import global_util
-import gpcode_manager
-import log
-import tool
-from l2 import code_price_manager
+from utils import global_util, tool
+from code_attribute import gpcode_manager
+from log_module import log, log_analyse, log_export
+from l2 import code_price_manager, l2_data_util
+from l2.cancel_buy_strategy import HourCancelBigNumComputer
from output.limit_up_data_filter import IgnoreCodeManager
from third_data import kpl_util, kpl_data_manager, kpl_api
-from third_data.code_plate_key_manager import RealTimeKplMarketData
-from third_data.kpl_data_manager import KPLDataManager, KPLLimitUpDataRecordManager, KPLPlatManager, \
+from third_data.code_plate_key_manager import RealTimeKplMarketData, KPLPlateForbiddenManager
+from third_data.history_k_data_util import HistoryKDatasUtils
+from third_data.kpl_data_manager import KPLDataManager, KPLLimitUpDataRecordManager, \
KPLCodeLimitUpReasonManager
-from third_data.kpl_util import KPLDataType
+from third_data.kpl_util import KPLDataType, KPLPlatManager
import urllib.parse as urlparse
from urllib.parse import parse_qs
-from output import code_info_output, limit_up_data_filter, output_util
+from output import code_info_output, limit_up_data_filter, output_util, kp_client_msg_manager
from trade import bidding_money_manager, trade_manager
from trade.l2_trade_util import BlackListCodeManager
@@ -32,44 +31,47 @@
__IgnoreCodeManager = IgnoreCodeManager()
__KPLPlatManager = KPLPlatManager()
__KPLCodeLimitUpReasonManager = KPLCodeLimitUpReasonManager()
+ __KPLPlateForbiddenManager = KPLPlateForbiddenManager()
# 鍘嗗彶鏉垮潡
__history_plates_dict = {}
# 鏉垮潡
__blocks_dict = {}
+ # 绮鹃��,琛屼笟鏁版嵁缂撳瓨
+ __jingxuan_cache_dict = {}
+ __industry_cache_dict = {}
+
def __get_limit_up_list(self):
# 缁熻鐩墠涓烘鐨勪唬鐮佹定鍋滄暟閲忥紙鍒嗘定鍋滃師鍥狅級
- now_limit_up_codes_info = self.__kplDataManager.get_data(KPLDataType.LIMIT_UP)
- limit_up_reason_dict = {}
- for d in now_limit_up_codes_info:
- if d[5] not in limit_up_reason_dict:
- limit_up_reason_dict[d[5]] = [0, 0]
- limit_up_reason_dict[d[5]][0] += 1
- # 鑾峰彇鎯充拱鍘熷洜鎯充拱鍗曠殑浠ｇ爜鏁伴噺
- reason_map = self.__KPLCodeLimitUpReasonManager.list_all()
- want_codes = gpcode_manager.WantBuyCodesManager.list_code()
- # 鍏朵粬鎯充拱鍗�
- other_count = 0
- for k in reason_map:
- reson = reason_map[k]
- if k in want_codes and reson in limit_up_reason_dict:
- limit_up_reason_dict[reson][1] += 1
- elif k in want_codes:
- other_count += 1
-
- limit_up_reason_statistic_info = [(k, limit_up_reason_dict[k][0], limit_up_reason_dict[k][1]) for k in
- limit_up_reason_dict]
- limit_up_reason_statistic_info.sort(key=lambda x: x[1])
- limit_up_reason_statistic_info.reverse()
- if other_count > 0:
- limit_up_reason_statistic_info.insert(0, ('鍏朵粬', other_count, other_count))
-
total_datas = KPLLimitUpDataRecordManager.total_datas
if not total_datas:
KPLLimitUpDataRecordManager.load_total_datas()
total_datas = KPLLimitUpDataRecordManager.total_datas
# 閫氳繃娑ㄥ仠鏃堕棿鎺掑簭
total_datas = list(total_datas)
+
+ # 缁熻娑ㄥ仠鍘熷洜
+ limit_up_reason_dict = {}
+ for d in total_datas:
+ if d[2] not in limit_up_reason_dict:
+ limit_up_reason_dict[d[2]] = []
+ limit_up_reason_dict[d[2]].append(d)
+ for k in limit_up_reason_dict:
+ limit_up_reason_dict[k].sort(key=lambda x: int(x[5]))
+ # 缁熻鎯充拱鍗曟暟閲�
+ want_codes = gpcode_manager.WantBuyCodesManager().list_code_cache()
+ limit_up_reason_want_count_dict = {}
+ for d in total_datas:
+ if d[2] not in limit_up_reason_want_count_dict:
+ limit_up_reason_want_count_dict[d[2]] = 0
+ if d[3] in want_codes:
+ limit_up_reason_want_count_dict[d[2]] += 1
+ # (鏉垮潡鍚嶇О锛屾定鍋滀唬鐮佹暟閲忥紝鎯充拱鍗曟暟閲�,娑ㄥ仠鏃堕棿)
+ limit_up_reason_statistic_info = [
+ (k, len(limit_up_reason_dict[k]), limit_up_reason_want_count_dict.get(k), limit_up_reason_dict[k][0][5]) for
+ k in
+ limit_up_reason_dict]
+ limit_up_reason_statistic_info.sort(key=lambda x: int(x[3]))
codes_set = set([d[3] for d in total_datas])
# 鍒ゆ柇鏄緳鍑狅紝鍒ゆ柇鏄惁娑ㄥ仠锛屽垽鏂槸鍚︾偢鏉匡紝鍔犺浇鍒嗘暟
@@ -83,16 +85,19 @@
total_datas.reverse()
# 鑾峰彇娑ㄥ仠鍘熷洜鍙樺寲璁板綍
- reason_changes = log.load_kpl_reason_changes()
+ reason_changes = log_export.load_kpl_reason_changes()
reason_changes.reverse()
reason_changes_dict = {}
for r in reason_changes:
if r[0] not in reason_changes_dict:
reason_changes_dict[r[0]] = r[1]
+ # 缁熻鏈�杩戜笅鍗曞姩浣滃弽棣�
+ order_reasons_dict = log_analyse.get_cant_order_reasons_dict()
+ kpl_can_buy_reasons_dict = log_analyse.get_kpl_can_buy_reasons_dict()
for d in total_datas:
code = d[3]
- # (浠ｇ爜, 鍚嶇О, 娑ㄥ仠鐘舵��(0 - 鏃犵姸鎬� 1-娑ㄥ仠 2-鐐告澘), 榫欏嚑, 棣栨澘, 鍒嗗��, 娑ㄥ仠鏃堕棿, 鍘熷洜, 鐩稿悓鍘熷洜浠ｇ爜鏁伴噺, 鑷敱娴侀��, 娑ㄥ仠鍘熷洜鏄惁鍙樺寲)
+ # (浠ｇ爜, 鍚嶇О, 娑ㄥ仠鐘舵��(0 - 鏃犵姸鎬� 1-娑ㄥ仠 2-鐐告澘), 榫欏嚑, 棣栨澘, 鍒嗗��, 娑ㄥ仠鏃堕棿, 鍘熷洜, 鐩稿悓鍘熷洜浠ｇ爜鏁伴噺, 鑷敱娴侀��, 娑ㄥ仠鍘熷洜鏄惁鍙樺寲,娑ㄥ仠鍘熷洜鐨勬祦鍏ュ噣棰�,涓嬪崟绠�浠�)
limit_up_state = 0
if code in limit_up_dict:
if limit_up_dict[code][0]:
@@ -104,9 +109,33 @@
score = score_dict[code]
if code in ignore_codes:
continue
+
+ # 娑ㄥ仠鍘熷洜鐨勫噣娴佸叆閲戦
+ reason = d[2]
+ reason_money = ''
+ if reason in self.__jingxuan_cache_dict:
+ reason_money = output_util.money_desc(self.__jingxuan_cache_dict[reason][3])
+ elif reason in self.__industry_cache_dict:
+ reason_money = output_util.money_desc(self.__industry_cache_dict[reason][3])
+
+ # 鍖归厤涓嬪崟鍙嶉
+ order_desc = ''
+ order_reason = order_reasons_dict.get(code)
+ kpl_can_buy_reason = kpl_can_buy_reasons_dict.get(code)
+ if order_reason and kpl_can_buy_reason:
+ if int(order_reason[0].replace(":", "").replace(".", "")) > int(
+ kpl_can_buy_reason[0].replace(":", "").replace(".", "")):
+ order_desc = f"涓嶏細{order_reason[1]}"
+ else:
+ order_desc = f"涔帮細{kpl_can_buy_reason[1]}"
+ elif order_reason:
+ order_desc = f"涓嶏細{order_reason[1]}"
+ elif kpl_can_buy_reason:
+ order_desc = f"涔帮細{kpl_can_buy_reason[1]}"
+
fresult.append((code, d[4], limit_up_state, f"榫檣rank_dict.get(code)}", d[12], score,
output_util.time_format(int(d[5])), d[2], d[10], output_util.money_desc(d[13]),
- reason_changes_dict.get(code)))
+ reason_changes_dict.get(code), reason_money, order_desc))
response_data = json.dumps({"code": 0, "data": {"limit_up_count": len(limit_up_codes),
"open_limit_up_count": len(open_limit_up_codes),
"limit_up_reason_statistic": limit_up_reason_statistic_info,
@@ -178,8 +207,8 @@
codes_set = set([d[0] for d in temps])
limit_up_dict, limit_up_codes, open_limit_up_codes = limit_up_data_filter.get_limit_up_info(codes_set)
score_dict = limit_up_data_filter.get_codes_scores_dict(codes_set)
- want_codes = gpcode_manager.WantBuyCodesManager.list_code()
- black_codes = BlackListCodeManager.list_codes()
+ want_codes = gpcode_manager.WantBuyCodesManager().list_code_cache()
+ black_codes = BlackListCodeManager().list_codes()
total_datas = KPLLimitUpDataRecordManager.total_datas
code_info_dict = {}
for val in total_datas:
@@ -235,28 +264,40 @@
response_data = ""
if url.path == "/get_kpl_data":
best_feng_kou = self.__kplDataManager.get_data(kpl_util.KPLDataType.BEST_FENG_KOU)
+ if not best_feng_kou:
+ best_feng_kou = []
best_feng_kou = best_feng_kou[:22]
feng_kou = self.__kplDataManager.get_data(kpl_util.KPLDataType.FENG_KOU)
+ if not feng_kou:
+ feng_kou = []
feng_kou = feng_kou[:22]
industry_rank = self.__kplDataManager.get_data(kpl_util.KPLDataType.INDUSTRY_RANK)
+ if not industry_rank:
+ industry_rank = []
industry_rank = industry_rank[:22]
feng_xiang = self.__kplDataManager.get_data(kpl_util.KPLDataType.FENG_XIANG)
+ if not feng_xiang:
+ feng_xiang = []
feng_xiang = feng_xiang[:22]
response_data = json.dumps({"code": 0, "data": {"best_feng_kou": best_feng_kou, "feng_kou": feng_kou,
"industry_rank": industry_rank, "feng_xiang": feng_xiang}})
elif url.path == "/get_score_info":
+ start_time = time.time()
ps_dict = dict([(k, v[0]) for k, v in parse_qs(url.query).items()])
code = ps_dict['code']
name = ps_dict.get('name')
- data = code_info_output.get_output_params(code)
+ 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:
data["code_name"] = f"{name} {code}"
self.__history_plates_dict[code] = (time.time(), data["kpl_code_info"]["code_records"])
- self.__blocks_dict[code] = (time.time(), data["kpl_code_info"]["plate"])
+ if "plate" in data["kpl_code_info"]:
+ self.__blocks_dict[code] = (time.time(), data["kpl_code_info"]["plate"])
response_data = json.dumps({"code": 0, "data": data})
+ print("get_score_info 鑰楁椂锛�", time.time() - start_time)
+
# 鑾峰彇璇勫垎淇℃伅
pass
elif url.path == "/kpl/get_limit_up_list":
@@ -287,14 +328,137 @@
# 绮鹃�夛紝涓诲姏鍑�棰濋『搴�
result = kpl_api.getMarketJingXuanRealRankingInfo(False)
result = kpl_util.parseMarketJingXuan(result)
-
- response_data = json.dumps({"code": 0, "data": result})
+ forbidden_plates = self.__KPLPlateForbiddenManager.list_all()
+ fresult = []
+ for d in result:
+ if type_ == 2 or type_ == 3:
+ self.__jingxuan_cache_dict[d[1]] = d
+ elif type_ == 0 or type_ == 1:
+ self.__industry_cache_dict[d[1]] = d
+ d = list(d)
+ d.append(1 if d[1] in forbidden_plates else 0)
+ fresult.append(d)
+ response_data = json.dumps({"code": 0, "data": fresult})
elif url.path == "/kpl/add_ignore_code":
ps_dict = dict([(k, v[0]) for k, v in parse_qs(url.query).items()])
code = ps_dict['code']
type_ = ps_dict['type']
self.__IgnoreCodeManager.ignore_code(type_, code)
response_data = json.dumps({"code": 0})
+ elif url.path == "/kpl/forbidden_plate":
+ ps_dict = dict([(k, v[0]) for k, v in parse_qs(url.query).items()])
+ plate = ps_dict["plate"]
+ # 鍔犲叆绂佹
+ self.__KPLPlateForbiddenManager.save_plate(plate)
+ response_data = json.dumps({"code": 0})
+ 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"]
+ # 鑾峰彇鏉垮潡涓嬬殑浠ｇ爜
+ # 缁熻鐩墠涓烘鐨勪唬鐮佹定鍋滄暟閲忥紙鍒嗘定鍋滃師鍥狅級
+ now_limit_up_codes_info = self.__kplDataManager.get_data(KPLDataType.LIMIT_UP)
+ now_limit_up_codes = set([d[0] for d in now_limit_up_codes_info])
+ # 鑾峰彇鍘嗗彶娑ㄥ仠
+ record_limit_up_datas = KPLLimitUpDataRecordManager.total_datas
+ if not record_limit_up_datas:
+ KPLLimitUpDataRecordManager.load_total_datas()
+ record_limit_up_datas = KPLLimitUpDataRecordManager.total_datas
+
+ codes_info = []
+ for d in record_limit_up_datas:
+ if 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])
+ codes_info.sort(key=lambda x: x[2])
+ # 鏌ヨ鏄惁涓烘兂涔板崟
+ want_codes = gpcode_manager.WantBuyCodesManager().list_code_cache()
+ for code_info in codes_info:
+ code_info[4] = 1 if code_info[0] in want_codes else 0
+ # 鑾峰彇浠ｇ爜鐘舵��
+ if trade_manager.CodesTradeStateManager().get_trade_state_cache(code_info[0]) != trade_manager.TRADE_STATE_NOT_TRADE:
+ code_info[5] = 1
+
+ response_data = json.dumps({"code": 0, "data": codes_info})
+ 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"]
+ if code:
+ total_datas = l2_data_util.local_today_datas.get(code)
+ if total_datas is None:
+ l2_data_util.load_l2_data(code)
+ total_datas = l2_data_util.local_today_datas.get(code)
+
+ trade_state = trade_manager.CodesTradeStateManager().get_trade_state_cache(code)
+ if trade_state == trade_manager.TRADE_STATE_BUY_PLACE_ORDER or trade_state == trade_manager.TRADE_STATE_BUY_DELEGATED or trade_state == trade_manager.TRADE_STATE_BUY_SUCCESS:
+ hcancel_datas_dict, cancel_indexes_set = HourCancelBigNumComputer().get_watch_index_dict(code)
+ # 鏍规嵁鏃ュ織璇诲彇瀹炴椂鐨勮绠楁暟鎹�
+ h_cancel_latest_compute_info = log_export.get_h_cancel_compute_info(code)
+ if hcancel_datas_dict:
+ temp_list = [(k, hcancel_datas_dict[k][0]) for k in hcancel_datas_dict]
+ canceled_indexs = set([int(k.split("-")[0]) for k in cancel_indexes_set])
+ temp_list.sort(key=lambda x: x[0])
+ fdata = {
+ "computed_info": list(
+ h_cancel_latest_compute_info) if h_cancel_latest_compute_info else None,
+ "datas": []}
+ for i in range(0, len(temp_list)):
+ temp = temp_list[i]
+ val = total_datas[temp[0]]["val"]
+ canceled = temp[0] in canceled_indexs
+ fdata["datas"].append(
+ (val["time"], val["num"],
+ code_info_output.money_desc(val["num"] * float(val["price"]) * 100),
+ (1 if canceled else 0)))
+ response_data = json.dumps({"code": 0, "data": fdata})
+ else:
+ response_data = json.dumps({"code": 1, "msg": "鏃燞鎾ゆ暟鎹�"})
+ else:
+ response_data = json.dumps({"code": 1, "msg": "鏃燞鎾ゆ暟鎹�"})
+ else:
+ 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(tool.get_now_date_str())
+ # 鑾峰彇娑ㄥ仠鏁版嵁
+
+ # 鑾峰彇浠ｇ爜鐨勫師鍥�
+ reasons = kpl_data_manager.KPLLimitUpDataRecordManager.list_by_code(code, day)
+ if reasons:
+ reasons = list(reasons)
+ reasons.sort(key=lambda x: x[9])
+ reason = reasons[-1][2]
+ datas = self.__kplDataManager.get_from_file(kpl_util.KPLDataType.LIMIT_UP, day)
+ # (浠ｇ爜,鍚嶇О,棣栨娑ㄥ仠鏃堕棿,鏈�杩戞定鍋滄椂闂�,鍑犳澘,娑ㄥ仠鍘熷洜,鏉垮潡,瀹為檯娴侀��,涓诲姏鍑�棰�,娑ㄥ仠鍘熷洜浠ｇ爜,娑ㄥ仠鍘熷洜浠ｇ爜鏁伴噺)
+ result_list = []
+ if datas:
+ for d in datas:
+ if d[5] == reason and d[0] != code:
+ # (浠ｇ爜,鍚嶇О)
+ result_list.append((d[0], d[1]))
+ response_data = json.dumps({"code": 0, "data": {"reason": reason, "data": result_list}})
+ else:
+ response_data = json.dumps({"code": 1, "msg": "鏄ㄦ棩鏈定鍋�"})
+
+ elif url.path == "/pull_kp_client_msg":
+ # 鎷夊彇瀹㈡埛绔秷鎭�
+ ps_dict = dict([(k, v[0]) for k, v in parse_qs(url.query).items()])
+ client = ps_dict["client"]
+ msg = kp_client_msg_manager.read_msg(client)
+ if msg:
+ response_data = json.dumps({"code": 0, "data": msg})
+ else:
+ response_data = json.dumps({"code": 1, "msg": "鏆傛棤娑堟伅"})
+ elif url.path == "/list_kp_client_msg":
+ msg_list = kp_client_msg_manager.list_msg_from_local()
+ msg_list.reverse()
+ msg_list = [f"{msg.split('|')[0]}{msg.split('|')[-1].split('-')[1].strip()}" for msg in msg_list]
+ response_data = json.dumps({"code": 0, "data": msg_list})
self.send_response(200)
# 鍙戠粰璇锋眰瀹㈡埛绔殑鍝嶅簲鏁版嵁
@@ -335,7 +499,7 @@
code = d[0]
if code.find("00") == 0 or code.find("60") == 0:
limit_up_time = time.strftime("%H:%M:%S", time.localtime(d[2]))
- code_price_manager.Buy1PriceManager.set_limit_up_time(code, limit_up_time)
+ code_price_manager.Buy1PriceManager().set_limit_up_time(code, limit_up_time)
self.__kplDataManager.save_data(type_, result_list)
kpl_data_manager.KPLLimitUpDataRecordManager.save_record(tool.get_now_date_str(), result_list)
elif type_ == KPLDataType.OPEN_LIMIT_UP.value:
@@ -396,9 +560,18 @@
return params
+class ThreadedHTTPServer(socketserver.ThreadingMixIn, http.server.HTTPServer):
+ pass
+
+
def run(addr, port):
+ # 杩愯鐪嬬洏娑堟伅閲囬泦
+ # kp_client_msg_manager.run_capture()
+ kpl_data_manager.run_pull_task()
+
handler = DataServer
- httpd = socketserver.TCPServer((addr, port), handler)
+ # httpd = socketserver.TCPServer((addr, port), handler)
+ httpd = ThreadedHTTPServer((addr, port), handler)
print("HTTP server is at: http://%s:%d/" % (addr, port))
httpd.serve_forever()
--
Gitblit v1.8.0