From fb47d36048e94b9a506d5c153e3dd19a01e37df1 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期一, 30 十月 2023 16:30:27 +0800
Subject: [PATCH] bug修复
---
third_data/data_server.py | 84 +++++++++++++++++++++++++++++++----------
1 files changed, 63 insertions(+), 21 deletions(-)
diff --git a/third_data/data_server.py b/third_data/data_server.py
index 80c90e0..34edcdc 100644
--- a/third_data/data_server.py
+++ b/third_data/data_server.py
@@ -1,5 +1,6 @@
import http
import json
+import logging
import socketserver
import threading
import time
@@ -7,10 +8,10 @@
import dask
from log_module.log import logger_system, logger_debug
-from utils import global_util, tool
+from utils import global_util, tool, data_export_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
+from l2 import code_price_manager, l2_data_util, l2_data_manager_new, cancel_buy_strategy, transaction_progress
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, block_info
@@ -25,6 +26,11 @@
from trade import bidding_money_manager, trade_manager, l2_trade_util
from trade.l2_trade_util import BlackListCodeManager
+import concurrent.futures
+
+# 绂佺敤http.server鐨勬棩蹇楄緭鍑�
+logger = logging.getLogger("http.server")
+logger.setLevel(logging.CRITICAL)
class DataServer(BaseHTTPRequestHandler):
@@ -42,6 +48,11 @@
__jingxuan_cache_dict = {}
__industry_cache_dict = {}
__latest_limit_up_codes_set = set()
+ __data_process_thread_pool = concurrent.futures.ThreadPoolExecutor(max_workers=10)
+
+ # 绂佺敤鏃ュ織杈撳嚭
+ def log_message(self, format, *args):
+ pass
def __get_limit_up_list(self):
# 缁熻鐩墠涓烘鐨勪唬鐮佹定鍋滄暟閲忥紙鍒嗘定鍋滃師鍥狅級
@@ -288,20 +299,36 @@
ps_dict = dict([(k, v[0]) for k, v in parse_qs(url.query).items()])
code = ps_dict['code']
name = ps_dict.get('name')
+ 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:
+ data["code_name"] = f"{name} {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"])
+ if "plate" in data["kpl_code_info"]:
+ self.__blocks_dict[code] = (time.time(), data["kpl_code_info"]["plate"])
- self.__history_plates_dict[code] = (time.time(), data["kpl_code_info"]["code_records"])
- 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)
+ response_data = json.dumps({"code": 0, "data": data})
+ print("get_score_info 鑰楁椂锛�", time.time() - start_time)
+ except Exception as e:
+ logging.exception(e)
# 鑾峰彇璇勫垎淇℃伅
pass
+ 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)
+ response_data = json.dumps({"code": 0, "data": datas})
+ elif url.path == "/get_trade_progress":
+ # 鑾峰彇浜ゆ槗杩涘害
+ ps_dict = dict([(k, v[0]) for k, v in parse_qs(url.query).items()])
+ code = ps_dict['code']
+ trade_progress, is_default = transaction_progress.TradeBuyQueue().get_traded_index(code)
+ datas = data_export_util.get_l2_datas(code)
+ response_data = json.dumps(
+ {"code": 0, "data": {"trade_progress": trade_progress, "is_default": is_default}})
elif url.path == "/kpl/get_limit_up_list":
response_data = self.__get_limit_up_list()
@@ -493,6 +520,17 @@
code_price_manager.Buy1PriceManager().set_limit_up_time(code, limit_up_time)
add_codes = codes_set - self.__latest_limit_up_codes_set
self.__latest_limit_up_codes_set = codes_set
+
+ if limit_up_reasons:
+ # 缁熻娑ㄥ仠鍘熷洜鐨勭エ鐨勪釜鏁�
+ limit_up_reason_code_dict = {}
+ for code in limit_up_reasons:
+ b = limit_up_reasons[code]
+ if b not in limit_up_reason_code_dict:
+ limit_up_reason_code_dict[b] = set()
+ limit_up_reason_code_dict[b].add(code)
+ cancel_buy_strategy.LCancelRateManager.set_block_limit_up_count(limit_up_reason_code_dict)
+
if add_codes:
for code in add_codes:
# 鏍规嵁娑ㄥ仠鍘熷洜鍒ゆ柇鏄惁鍙互涔�
@@ -508,13 +546,17 @@
if not current_limit_up_datas:
current_limit_up_datas = []
if not limit_up_record_datas:
- limit_up_record_datas=[]
- if CodePlateKeyBuyManager.is_need_cancel(code, limit_up_reasons.get(code),
- current_limit_up_datas,
- limit_up_record_datas,
- yesterday_current_limit_up_codes,
- before_blocks_dict):
- l2_data_manager_new.L2TradeDataProcessor.cancel_buy(code, f"娑ㄥ仠鍘熷洜锛坽 limit_up_reasons.get(code)}锛変笉鏄�佸ぇ鎾ゅ崟", "鏉垮潡鎾�")
+ limit_up_record_datas = []
+ # 涔扮粷瀵硅�佸ぇ
+ # 涓�斾笉鑳芥挙鍗�
+ # if CodePlateKeyBuyManager.is_need_cancel(code, limit_up_reasons.get(code),
+ # current_limit_up_datas,
+ # limit_up_record_datas,
+ # yesterday_current_limit_up_codes,
+ # before_blocks_dict):
+ # l2_data_manager_new.L2TradeDataProcessor.cancel_buy(code,
+ # f"娑ㄥ仠鍘熷洜锛坽limit_up_reasons.get(code)}锛変笉鏄�佸ぇ鎾ゅ崟",
+ # "鏉垮潡鎾�")
except Exception as e:
logger_debug.exception(e)
kpl_data_manager.KPLLimitUpDataRecordManager.save_record(tool.get_now_date_str(), result_list_)
@@ -537,7 +579,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)
- threading.Thread(target=lambda: do_limit_up(result_list), daemon=True).start()
+ self.__data_process_thread_pool.submit(lambda: do_limit_up(result_list))
elif type_ == KPLDataType.OPEN_LIMIT_UP.value:
result_list = kpl_util.parseDaBanData(data["data"], kpl_util.DABAN_TYPE_OPEN_LIMIT_UP)
if result_list:
@@ -607,9 +649,9 @@
handler = DataServer
# httpd = socketserver.TCPServer((addr, port), handler)
- httpd = ThreadedHTTPServer((addr, port), handler)
- print("HTTP server is at: http://%s:%d/" % (addr, port))
try:
+ httpd = ThreadedHTTPServer((addr, port), handler)
+ print("HTTP server is at: http://%s:%d/" % (addr, port))
httpd.serve_forever()
except Exception as e:
logger_system.exception(e)
--
Gitblit v1.8.0