From 62c99e398d9b05a30fc80f29a0048b95bafa77d7 Mon Sep 17 00:00:00 2001 From: Administrator <admin@example.com> Date: 星期三, 18 六月 2025 10:41:11 +0800 Subject: [PATCH] ‘功能完善 --- api/outside_api_callback.py | 68 ++++++++++++++++++++++++++++++++-- 1 files changed, 64 insertions(+), 4 deletions(-) diff --git a/api/outside_api_callback.py b/api/outside_api_callback.py index 85655a4..b4b640f 100644 --- a/api/outside_api_callback.py +++ b/api/outside_api_callback.py @@ -1,13 +1,18 @@ import json import logging +import os import threading +import constant + from api.outside_api_command_manager import ActionCallback +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_variable_factory import DataLoader from third_data.history_k_data_manager import TradeDateManager +from third_data.kpl_block_manager import KPLCodeJXBlocksManager from utils import socket_util, middle_api_protocol, tool @@ -43,8 +48,20 @@ 鑾峰彇浜ゆ槗鍙傛暟 @return: """ - result = strategy_params_settings.settings.to_json_str() - return {"code": 0, "data": result} + result = strategy_params_settings.StrategyParamsSettingsManager().get_settings().to_json_str() + return {"code": 0, "data": json.loads(result)} + + def __on_set_settings(self, data): + """ + 璁剧疆浜ゆ槗鍙傛暟 + @return: + """ + settings = strategy_params_settings.StrategyParamsSettingsManager().get_settings() + for k in data: + settings.__setattr__(k, data[k]) + strategy_params_settings.StrategyParamsSettingsManager().set_settings(settings) + # 鍚屾鍙傛暟璁剧疆 + return {"code": 0, "data": {}} def __on_get_env(self, need_hsitory_data): """ @@ -57,6 +74,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涔嬪墠閲囩敤褰撳墠鏃ユ湡 @@ -64,7 +82,8 @@ else: # 濡傛灉鍦�16:00涔嬪悗閲囩敤涓嬩竴涓氦鏄撴棩 day = TradeDateManager().get_next_trade_day(tool.get_now_date_str()) - fdata["history_data"]["leading_limit_up_block_codes_count"] = env_info.get_leading_limit_up_block_codes_count( + fdata["history_data"][ + "leading_limit_up_block_codes_count"] = env_info.get_leading_limit_up_block_codes_count( day) if tool.get_now_time_str() < '16:00:00': @@ -74,6 +93,11 @@ # 濡傛灉鍦�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): @@ -98,13 +122,49 @@ 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 OnCommonRequest(self, client_id, request_id, data): ctype = data["ctype"] result_json = {} if ctype == "get_settings": result_json = self.__on_get_settings() + elif ctype == 'set_settings': + 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() self.send_response(result_json, client_id, request_id) -- Gitblit v1.8.0