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 | 116 ++++++++++++++++++++++++++++++++--------------------------
1 files changed, 64 insertions(+), 52 deletions(-)
diff --git a/third_data/data_server.py b/third_data/data_server.py
index 13cde15..24bb2de 100644
--- a/third_data/data_server.py
+++ b/third_data/data_server.py
@@ -1,19 +1,13 @@
-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 init
-import log
-import log_analyse
-import tool
+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
@@ -46,40 +40,38 @@
__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 = {}
- if now_limit_up_codes_info:
- 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])
# 鍒ゆ柇鏄緳鍑狅紝鍒ゆ柇鏄惁娑ㄥ仠锛屽垽鏂槸鍚︾偢鏉匡紝鍔犺浇鍒嗘暟
@@ -93,7 +85,7 @@
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:
@@ -215,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:
@@ -290,6 +282,7 @@
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')
@@ -303,6 +296,8 @@
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":
@@ -363,15 +358,29 @@
# 鑾峰彇鏉垮潡涓嬬殑浠ｇ爜
# 缁熻鐩墠涓烘鐨勪唬鐮佹定鍋滄暟閲忥紙鍒嗘定鍋滃師鍥狅級
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 now_limit_up_codes_info:
- if d[5] != plate:
+ for d in record_limit_up_datas:
+ if d[2] != plate:
continue
- codes_info.append([d[0], d[1], 0])
+ # 浠ｇ爜,鍚嶇О,娑ㄥ仠鏃堕棿,鏄惁鐐告澘,鏄惁鎯充拱,鏄惁宸茬粡涓嬭繃鍗�
+ 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()
+ want_codes = gpcode_manager.WantBuyCodesManager().list_code_cache()
for code_info in codes_info:
- code_info[2] = 1 if code_info[0] in want_codes else 0
+ 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()])
@@ -382,11 +391,11 @@
l2_data_util.load_l2_data(code)
total_datas = l2_data_util.local_today_datas.get(code)
- trade_state = trade_manager.get_trade_state(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)
+ hcancel_datas_dict, cancel_indexes_set = HourCancelBigNumComputer().get_watch_index_dict(code)
# 鏍规嵁鏃ュ織璇诲彇瀹炴椂鐨勮绠楁暟鎹�
- h_cancel_latest_compute_info = log.get_h_cancel_compute_info(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])
@@ -427,10 +436,11 @@
datas = self.__kplDataManager.get_from_file(kpl_util.KPLDataType.LIMIT_UP, day)
# (浠ｇ爜,鍚嶇О,棣栨娑ㄥ仠鏃堕棿,鏈�杩戞定鍋滄椂闂�,鍑犳澘,娑ㄥ仠鍘熷洜,鏉垮潡,瀹為檯娴侀��,涓诲姏鍑�棰�,娑ㄥ仠鍘熷洜浠ｇ爜,娑ㄥ仠鍘熷洜浠ｇ爜鏁伴噺)
result_list = []
- for d in datas:
- if d[5] == reason and d[0] != code:
- # (浠ｇ爜,鍚嶇О)
- result_list.append((d[0], d[1]))
+ 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": "鏄ㄦ棩鏈定鍋�"})
@@ -489,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:
@@ -556,7 +566,9 @@
def run(addr, port):
# 杩愯鐪嬬洏娑堟伅閲囬泦
- kp_client_msg_manager.run_capture()
+ # kp_client_msg_manager.run_capture()
+ kpl_data_manager.run_pull_task()
+
handler = DataServer
# httpd = socketserver.TCPServer((addr, port), handler)
httpd = ThreadedHTTPServer((addr, port), handler)
--
Gitblit v1.8.0