From 36731498e1b7c65a69cd15d626fedca4c92c1042 Mon Sep 17 00:00:00 2001
From: admin <admin@example.com>
Date: 星期四, 20 二月 2025 17:39:54 +0800
Subject: [PATCH] 增加撤单
---
main.py | 72 ++++++++++--------------------------
1 files changed, 20 insertions(+), 52 deletions(-)
diff --git a/main.py b/main.py
index a9a05e2..9d92bd5 100644
--- a/main.py
+++ b/main.py
@@ -2,9 +2,7 @@
from __future__ import print_function, absolute_import, unicode_literals
import logging
import json
-import multiprocessing
import os.path
-# import multiprocessing
# from log import logger
import threading
import time
@@ -18,15 +16,14 @@
# 寮曞叆鍘嗗彶K绾挎柟娉曟ā鍧�
# 寮曞叆鐬椂鍒嗘椂琛屾儏妯″潡
# 寮曞叆璐︽埛绠＄悊妯″潡銆愯繘琛岃祫閲戝拰浠撲綅绠＄悊銆�
-from strategy import kpl_api, data_cache, check_timer, all_K_line, instant_time_market, account_management
+from strategy import kpl_api, data_cache, check_timer, all_K_line, instant_time_market, account_management, order_methods
from huaxin_client import l2_market_client
from log_module import async_log_util
-# 寮曞叆鏃ュ織妯″潡
-from strategy.logging_config import get_logger
-from strategy import order_methods
from trade import huaxin_trade_data_update
from utils import hx_qc_value_util
+# 寮曞叆鏃ュ織妯″潡
+from strategy.logging_config import get_logger
# 鑾峰彇logger瀹炰緥
logger = get_logger()
# 寮曞叆琛屾儏璁㈤槄妯″潡
@@ -46,16 +43,26 @@
def init_data():
# logging.info("main鍒濆鍖栨暟鎹紑濮�")
logger.info(f"main鍒濆鍖栨暟鎹紑濮�")
- # 鍒濆鍖栨墍鏈夌洰鏍囩エ鏍囩殑淇℃伅
- data_cache.all_stocks = utils.juejin_api.JueJinApi.get_target_codes()
- # 鑾峰彇K绾�
+ '''
+ 璧勯噾绠＄悊鍒濆鍖�
+ 浠撲綅绠＄悊鍒濆鍖�
+ 閮藉湪main鐨勫垵濮嬪寲鏁版嵁鍑芥暟閲岄潰瀹屾垚
+ 鏃犻渶鎺橀噾鑰冭檻鐨勭嚎绋嬫垨杩涚▼鏂瑰紡瀹炵幇
+ '''
+ # 鍒濆鍖栬处鎴蜂粨浣嶇鐞嗘暟鎹�
+ account_management.finance_management()
+ # 鍒濆鍖栬处鎴蜂粨浣嶇鐞嗘暟鎹�
+ account_management.position_management()
+ # 鍒濆鍖�.瀹炰緥鍖栫紦瀛樹腑鐨勫叏灞�鏁版嵁
data_cache.DataCache()
-
+ # 鍒濆鍖朅鑲℃墍鏈夌洰鏍囩エ鏍囩殑淇℃伅
+ data_cache.all_stocks = utils.juejin_api.JueJinApi.get_target_codes()
+ # 鑾峰彇鐩爣绁ㄦ爣鐨凨绾�
all_K_line.k_line_history.init(data_cache.DataCache().today_date, data_cache.DataCache().next_trading_day,
data_cache.DataCache().filtered_stocks)
- # 璋冪敤鎸囨爣K绾垮啓鍏ユ湰鍦版枃浠�
- all_K_line.all_stocks_all_k_line_dict_write()
+ # 鐩存帴璋冪敤鎸囨爣K绾垮啓鍏ユ湰鍦版枃浠�
+ # all_K_line.all_stocks_all_k_line_dict_write()
# 鍏堜娇鐢╦son.load()鐩存帴浠庢枃浠朵腑璇诲彇銆愬凡缁忓瓨鍌ㄥ湪鏈湴鐨凨绾挎寚鏍囧睘鎬у瓧鍏搞�戝苟瑙ｆ瀽JSON鏁版嵁
if os.path.exists(constant.K_BARS_PATH):
@@ -63,9 +70,6 @@
data_cache.all_stocks_all_K_line_property_dict = json.load(f)
print(
f"data_cache.all_stocks_all_K_line_property_dict鐨勪釜鏁�==={len(data_cache.all_stocks_all_K_line_property_dict)}")
-
- # current_data_info = current(symbols='SHSE.603839', fields='open')
- # print(f"current_data_info==={current_data_info}")
# 绗竴姝ワ細鍒濆鍖朿ontext鍑芥暟锛屽苟寮�鍚幏鍙栧疄鏃舵暟鎹殑绾跨▼
@@ -79,19 +83,6 @@
# 瀹炴椂妫�娴嬫槸鍚︽媺鍙朘绾跨嚎绋�
threading.Thread(target=lambda: all_K_line.check_time_and_data_date(), daemon=True).start()
# print(f"all_stocks_all_K_line_property_dict== {type(data_cache.all_stocks_all_K_line_property_dict)}")
-
- '''
- 鐩墠璁炬兂锛屼拱鍙渶瑕佽繘琛岃处鎴风鐞嗭紝鍗栨墠闇�瑕佷粨浣嶇鐞嗭紝鑰屽崠鍦ㄩ�氳繃琛屾儏璁㈤槄瀹炵幇
- 骞朵笖琛屾儏璁㈤槄鍦ㄥ彟涓�涓繘绋嬮噷闈紝鎵�浠ョ洰鍓嶄笉闇�瑕佸悓鏃惰皟鐢�
- # 鍒濆鍖栬祫閲戠鐞嗭紝涓嬪崟涔伴�昏緫鎵嶄細鏈夋暟鎹�
- account_management.position_management(context)
- # 鍒濆鍖栦粨浣嶇鐞嗭紝涓嬪崟鍗栭�昏緫鎵嶄細鏈夋暟鎹�
- account_management.position_management(context)
- '''
-
- # TODO 姝ゅ娉ㄩ噴锛岃鏇挎崲context
- # threading.Thread(target=account_management.finance_management_process, args=(context,), daemon=True).start()
- # threading.Thread(target=account_management.position_management_process, args=(context,), daemon=True).start()
# 寮�鐩樺暒鐨勬定鍋滄蹇电殑鍥炶皟鍑芥暟
def kpl_limit_up_process(datas):
@@ -115,9 +106,6 @@
threading.Thread(target=kpl_api.get_market_sift_plate_its_stock_power_process,
args=(get_market_sift_plate_its_stock_power_process,), daemon=True).start()
- # 琛屾儏璁㈤槄锛屾勃娣�300鎸囨暟銆愬湪on_tick鍑芥暟涓幓鎵撳嵃tick 鏁版嵁銆�
- # subscribe('SHSE.000300', frequency='tick', count=1, unsubscribe_previous=False)
-
# 鍒濆鍖杇et_current_data鏂规硶鍑芥暟锛屼笅鍗曚拱閫昏緫鎵嶄細杩愯涓�傘�傘�傘�愭牳蹇冧富绾跨▼锛岄殢鏃惰�冭檻鍏跺惎鍔ㄩ『搴忋��>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
# threading.Thread(target=lambda: instant_time_market.get_current_data(), daemon=True).start()
@@ -134,26 +122,6 @@
# kpl_api.get_all_stocks_plate_dict(data_cache.min_stocks)
-# 濮旀墭鐘舵�佹洿鏂颁簨浠�
-def on_order_status(context, order):
- # 鍙湪鍚庨潰鎵ц鍏朵粬澶勭悊閫昏緫
- logger.info(f"context====main鈥斺�斺�斺�攞context}")
- logger.info(f"order====main鈥斺�斺�斺�攞order}")
-
-
-# 濮旀墭鎵ц鍥炴姤浜嬩欢
-def on_execution_report(context, execrpt):
- logger.info(f"execrpt>context===={context}")
- logger.info(f"execrpt===={execrpt}")
-
-
-# 浜ゆ槗璐︽埛鐘舵�佹洿鏂颁簨浠� 锛堜氦鏄撹处鎴风姸鎬佸璞★紝浠呭搷搴� 宸茶繛鎺ワ紝宸茬櫥褰曪紝宸叉柇寮� 鍜� 閿欒 浜嬩欢銆傦級
-def on_account_status(context, account):
- logger.info(f"account>context===={context}")
- logger.info(f"account===={account}")
- logger.info(account)
-
-
# 绗笁姝ワ細鎵ц绛栫暐鐨勫垵濮嬭缃�
if __name__ == '__main__':
class MyMarketDataCallback(l2_market_client.L2MarketDataCallback):
@@ -164,7 +132,7 @@
:return:
"""
data_cache.latest_code_market_info_dict = {x[0]: x for x in datas}
- instant_time_market.process_current_infos(datas)
+ instant_time_market.get_current_info()
# 鍚姩寮傛鏃ュ織
--
Gitblit v1.8.0