1.精选流入09:25起开始进入数据 2.修复日志数据的None BUG 3.分离出手动拉黑后的决策日志和手动拉黑前的决策日志

admin

2 天以前 6fbaa1012ca1b10689f7baad3a5e808ffc3c06b2

 data_server.py

@@ -17,6 +17,7 @@
from log_module import log_export, async_log_util
from log_module.log import hx_logger_l2_transaction, logger_debug, logger_request_api, logger_system
from strategy import data_cache
from strategy.forbidden_plates_manager import ForbiddenPlatesManager
from strategy.kpl_data_manager import KPLMarketsSiftPlateLogManager, KPLMarketStockHeatLogManager
from strategy.trade_setting import TradeSetting
from trade import huaxin_trade_api, huaxin_trade_data_update
@@ -109,19 +110,6 @@
            fdata = {"running": TradeSetting().get_running(), "auto_sell": TradeSetting().get_auto_sell(),
                     "auto_buy": TradeSetting().get_auto_buy()}
            response_data = json.dumps({"code": 0, "data": fdata})

        elif url.path == "/set_trade_settings":
            logger_debug.info(f"set_trade_settings: {params_dict}")
            running = params_dict.get("running")
            auto_sell = params_dict.get("auto_sell")
            auto_buy = params_dict.get("auto_buy")
            if running is not None:
                TradeSetting().set_running(int(running))
            if auto_sell is not None:
                TradeSetting().set_auto_sell(int(auto_sell))
            if auto_buy is not None:
                TradeSetting().set_auto_buy(int(auto_buy))
            response_data = json.dumps({"code": 0, "data": {}})

        elif url.path == "/get_env":
            request_id = params_dict.get("request_id")
@@ -247,6 +235,26 @@
                # (距离09:15:00的秒数, 时间, 强度)
                fdatas.append((tool.trade_time_sub(data[0], "09:15:00"), data[0], data[1]))
            response_data = json.dumps({"code": 0, "data": fdatas})
        elif url.path == "/get_place_order_records":
            datas = data_cache.purchased_stocks_details_list
            response_data = json.dumps({"code": 0, "data": datas})
        elif url.path == "/get_forbidden_plates":
            datas = ForbiddenPlatesManager().list_plates()
            # human 认为设置  fixed: 固定的
            response_data = json.dumps(
                {"code": 0, "data": {"human": list(datas), "fixed": list(constant.check_plate_list)}})
        elif url.path == "/add_forbidden_plate":
            plate = params_dict.get("plate")
            ForbiddenPlatesManager().add_plate(plate)
            response_data = json.dumps({"code": 0, "data": {}})
        elif url.path == "/remove_forbidden_plate":
            plate = params_dict.get("plate")
            ForbiddenPlatesManager().remove_plate(plate)
            response_data = json.dumps({"code": 0, "data": {}})
        elif url.path == "/get_market_sift_plate_stock_dict":
            # 获取开盘啦板块精选流入
            data = data_cache.market_sift_plates
            response_data = json.dumps({"code": 0, "data": data})

        self.send_response(200)
        # 发给请求客户端的响应数据
@@ -287,6 +295,23 @@
                    else:
                        huaxin_trade_api.add_trade_callback_data(body)
                result_str = json.dumps({"code": 0})
            elif url.path == "/set_trade_settings":
                params = self.__parse_request()
                if not self.__is_sign_right(params):
                    result_str = json.dumps({"code": 1001, "msg": "签名错误"})
                    return
                logger_debug.info(f"set_trade_settings: {params}")
                running = params.get("running")
                auto_sell = params.get("auto_sell")
                auto_buy = params.get("auto_buy")
                if running is not None:
                    TradeSetting().set_running(int(running))
                if auto_sell is not None:
                    TradeSetting().set_auto_sell(int(auto_sell))
                if auto_buy is not None:
                    TradeSetting().set_auto_buy(int(auto_buy))
                result_str = json.dumps({"code": 0, "data": {}})

            elif url.path == "/buy":
                # 签名验证
                params = self.__parse_request()