From bccc14e6d890cefb5309c904a6413bea1270ff03 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期二, 01 七月 2025 10:59:46 +0800
Subject: [PATCH] bug修复/策略完善
---
api/outside_api_callback.py | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 104 insertions(+), 2 deletions(-)
diff --git a/api/outside_api_callback.py b/api/outside_api_callback.py
index 647730f..e43b9f4 100644
--- a/api/outside_api_callback.py
+++ b/api/outside_api_callback.py
@@ -1,14 +1,29 @@
import json
import logging
+import os
import threading
+import constant
+
from api.outside_api_command_manager import ActionCallback
+from code_attribute import gpcode_manager
+from huaxin_client import l1_subscript_codes_manager
from huaxin_client.client_network import SendResponseSkManager
-from strategy import strategy_params_settings, env_info
+from strategy import strategy_params_settings, env_info, strategy_manager
from strategy.env_info import RealTimeEnvInfo
+from strategy.strategy_manager import PlateWhiteListManager
+from strategy.strategy_params_settings import StrategyParamsSettingsManager, StrategyParamsSettings
from strategy.strategy_variable_factory import DataLoader
from third_data.history_k_data_manager import TradeDateManager
+from third_data.kpl_block_manager import KPLCodeJXBlocksManager
+from trade import trade_record_log_util
+from trade.trade_manager import TradeStateManager
from utils import socket_util, middle_api_protocol, tool
+
+OPERRATE_SET = 1 # 璁剧疆
+OPERRATE_DELETE = 2 # 鍒犻櫎
+OPERRATE_GET = 3 # 鑾峰彇
+OPERRATE_ADD = 4 # 鏂板
class MyAPICallback(ActionCallback):
@@ -44,7 +59,10 @@
@return:
"""
result = strategy_params_settings.StrategyParamsSettingsManager().get_settings().to_json_str()
- return {"code": 0, "data": json.loads(result)}
+ result = json.loads(result)
+ result["trade_state"] = 1 if TradeStateManager().is_can_buy_cache() else 0
+
+ return {"code": 0, "data": result}
def __on_set_settings(self, data):
"""
@@ -52,7 +70,17 @@
@return:
"""
settings = strategy_params_settings.StrategyParamsSettingsManager().get_settings()
+ settings_vars = vars(settings)
for k in data:
+ if k == "trade_state":
+ if data[k]:
+ TradeStateManager().open_buy()
+ else:
+ TradeStateManager().close_buy()
+ continue
+ if k not in settings_vars:
+ # 娌℃湁鍦ㄥ睘鎬ч噷闈�
+ continue
settings.__setattr__(k, data[k])
strategy_params_settings.StrategyParamsSettingsManager().set_settings(settings)
# 鍚屾鍙傛暟璁剧疆
@@ -69,6 +97,7 @@
fdata["real_time_data"] = RealTimeEnvInfo().to_dict()
# 鍘嗗彶鏁版嵁
fdata["history_data"] = {}
+ print("鑾峰彇鐜", os.getpid())
if need_hsitory_data:
if tool.get_now_time_str() < '16:00:00':
# 濡傛灉鍦�16:00涔嬪墠閲囩敤褰撳墠鏃ユ湡
@@ -87,6 +116,10 @@
# 濡傛灉鍦�16:00涔嬪悗閲囩敤涓嬩竴涓氦鏄撴棩
day = tool.get_now_date_str()
fdata["history_data"]["k_bars_count"] = env_info.get_history_k_bars(day)
+
+ day = tool.get_now_date_str()
+ fdata["history_data"]["kpl_code_jx_blocks_count"] = env_info.get_kpl_code_jx_blocks(day)
+
return {"code": 0, "data": fdata, "msg": "娴嬭瘯缁撴灉"}
def __on_update_leading_limit_up_datas(self):
@@ -111,6 +144,46 @@
threading.Thread(target=lambda: update(), daemon=True).start()
return {"code": 0}
+ def __on_update_kpl_code_jx_blocks_datas(self):
+ """
+ 鏇存柊寮�鐩樺暒绮鹃�夋澘鍧楁暟鎹�
+ @return:
+ """
+
+ def update():
+ codes = set()
+ codes_sh, codes_sz = l1_subscript_codes_manager.get_codes()
+ codes |= set([x.decode() for x in codes_sh])
+ codes |= set([x.decode() for x in codes_sz])
+ KPLCodeJXBlocksManager(day, codes).start_download_blocks()
+ # 濡傛灉鍦�16:00涔嬪墠閲囩敤褰撳墠鏃ユ湡
+
+ day = tool.get_now_date_str()
+ threading.Thread(target=lambda: update(), daemon=True).start()
+ return {"code": 0}
+
+ def __on_init_data(self):
+ try:
+ strategy_manager.low_suction_strtegy.load_data()
+ return {"code": 0}
+ except Exception as e:
+ logging.exception(e)
+ return {"code": 1, "msg": str(e)}
+
+ def __on_plate_white_list(self, data):
+ operate = data["operate"]
+ if operate == OPERRATE_GET:
+ plates = PlateWhiteListManager().get_plates()
+ return {"code": 0, "data": list(plates)}
+ elif operate == OPERRATE_ADD:
+ plate = data["plate"]
+ PlateWhiteListManager().add_plate(plate)
+ return {"code": 0}
+ elif operate == OPERRATE_DELETE:
+ plate = data["plate"]
+ PlateWhiteListManager().remove_plate(plate)
+ return {"code": 0}
+
def OnCommonRequest(self, client_id, request_id, data):
ctype = data["ctype"]
result_json = {}
@@ -120,7 +193,36 @@
del data["ctype"]
result_json = self.__on_set_settings(data)
elif ctype == 'get_env':
+ # 鑾峰彇鐜鏁版嵁
result_json = self.__on_get_env(data.get("history"))
elif ctype == 'update_leading_limit_up_datas':
+ # 鏇存柊棰嗘定鏁版嵁
result_json = self.__on_update_leading_limit_up_datas()
+ elif ctype == 'update_kpl_code_jx_blocks_datas':
+ # 鏇存柊寮�鐩樺暒绮鹃�夋暟鎹�
+ result_json = self.__on_update_kpl_code_jx_blocks_datas()
+ elif ctype == 'init_datas':
+ # 鍒濆鍖栨暟鎹�
+ result_json = self.__on_init_data()
+ elif ctype == 'get_place_order_records':
+ # 鑾峰彇涓嬪崟璁板綍
+ datas = trade_record_log_util.get_trade_records(trade_record_log_util.TYPE_PLACE_ORDER)
+ for data in datas:
+ data[3]["code_name"] = gpcode_manager.CodesNameManager().get_code_name(data[3]["code"])
+ result_json = {"code": 0, "data": datas}
+ elif ctype == 'get_can_buy_plates':
+ # 鑾峰彇鍙互涔扮殑鏉垮潡
+ settings: StrategyParamsSettings = StrategyParamsSettingsManager().get_settings()
+ try:
+ current_limit_up_plate_codes = strategy_manager.low_suction_strtegy.current_limit_up_plate_codes
+ plates = [plate for plate, codes in current_limit_up_plate_codes.items() if
+ len(codes) >= settings.limit_up_count_of_new_plate]
+ except:
+ plates = []
+ result_json = {"code": 0, "data": plates}
+
+
+
+ elif ctype == 'plate_white_list':
+ result_json = self.__on_plate_white_list(data)
self.send_response(result_json, client_id, request_id)
--
Gitblit v1.8.0