bug修改

Administrator

2023-08-28 ba52d7ac92a36f413eacaa686f8535e859664ec6

 third_data/data_server.py

@@ -7,7 +7,7 @@

from utils import global_util, tool
from code_attribute import gpcode_manager
from log_module import log, log_analyse
from log_module import log, log_analyse, log_export
from l2 import code_price_manager, l2_data_util
from l2.cancel_buy_strategy import HourCancelBigNumComputer
from output.limit_up_data_filter import IgnoreCodeManager
@@ -40,6 +40,7 @@
    __jingxuan_cache_dict = {}
    __industry_cache_dict = {}


    def __get_limit_up_list(self):
        # 统计目前为止的代码涨停数量（分涨停原因）
        total_datas = KPLLimitUpDataRecordManager.total_datas
@@ -58,7 +59,7 @@
        for k in limit_up_reason_dict:
            limit_up_reason_dict[k].sort(key=lambda x: int(x[5]))
        # 统计想买单数量
        want_codes = gpcode_manager.WantBuyCodesManager.list_code()
        want_codes = gpcode_manager.WantBuyCodesManager().list_code_cache()
        limit_up_reason_want_count_dict = {}
        for d in total_datas:
            if d[2] not in limit_up_reason_want_count_dict:
@@ -84,7 +85,7 @@
        total_datas.reverse()

        # 获取涨停原因变化记录
        reason_changes = log.load_kpl_reason_changes()
        reason_changes = log_export.load_kpl_reason_changes()
        reason_changes.reverse()
        reason_changes_dict = {}
        for r in reason_changes:
@@ -206,8 +207,8 @@
            codes_set = set([d[0] for d in temps])
            limit_up_dict, limit_up_codes, open_limit_up_codes = limit_up_data_filter.get_limit_up_info(codes_set)
            score_dict = limit_up_data_filter.get_codes_scores_dict(codes_set)
            want_codes = gpcode_manager.WantBuyCodesManager.list_code()
            black_codes = BlackListCodeManager.list_codes()
            want_codes = gpcode_manager.WantBuyCodesManager().list_code_cache()
            black_codes = BlackListCodeManager().list_codes()
            total_datas = KPLLimitUpDataRecordManager.total_datas
            code_info_dict = {}
            for val in total_datas:
@@ -370,15 +371,15 @@
                    continue
                # 代码,名称,涨停时间,是否炸板,是否想买,是否已经下过单
                codes_info.append(
                    [d[3], d[4], tool.to_time_str(int(d[5])), d[3] not in now_limit_up_codes, False, False])
                    [d[3], d[4], tool.to_time_str(int(d[5])), 1 if d[3] not in now_limit_up_codes else 0, 0, 0])
            codes_info.sort(key=lambda x: x[2])
            # 查询是否为想买单
            want_codes = gpcode_manager.WantBuyCodesManager.list_code()
            want_codes = gpcode_manager.WantBuyCodesManager().list_code_cache()
            for code_info in codes_info:
                code_info[4] = 1 if code_info[0] in want_codes else 0
                # 获取代码状态
                if trade_manager.get_trade_state(code_info[0]) != trade_manager.TRADE_STATE_NOT_TRADE:
                    code_info[5] = True
                if trade_manager.CodesTradeStateManager().get_trade_state_cache(code_info[0]) != trade_manager.TRADE_STATE_NOT_TRADE:
                    code_info[5] = 1

            response_data = json.dumps({"code": 0, "data": codes_info})
        elif url.path == "/get_h_cancel_data":
@@ -390,11 +391,11 @@
                    l2_data_util.load_l2_data(code)
                    total_datas = l2_data_util.local_today_datas.get(code)

                trade_state = trade_manager.get_trade_state(code)
                trade_state = trade_manager.CodesTradeStateManager().get_trade_state_cache(code)
                if trade_state == trade_manager.TRADE_STATE_BUY_PLACE_ORDER or trade_state == trade_manager.TRADE_STATE_BUY_DELEGATED or trade_state == trade_manager.TRADE_STATE_BUY_SUCCESS:
                    hcancel_datas_dict, cancel_indexes_set = HourCancelBigNumComputer.get_watch_index_dict(code)
                    hcancel_datas_dict, cancel_indexes_set = HourCancelBigNumComputer().get_watch_index_dict(code)
                    # 根据日志读取实时的计算数据
                    h_cancel_latest_compute_info = log.get_h_cancel_compute_info(code)
                    h_cancel_latest_compute_info = log_export.get_h_cancel_compute_info(code)
                    if hcancel_datas_dict:
                        temp_list = [(k, hcancel_datas_dict[k][0]) for k in hcancel_datas_dict]
                        canceled_indexs = set([int(k.split("-")[0]) for k in cancel_indexes_set])
@@ -435,10 +436,11 @@
                datas = self.__kplDataManager.get_from_file(kpl_util.KPLDataType.LIMIT_UP, day)
                # (代码,名称,首次涨停时间,最近涨停时间,几板,涨停原因,板块,实际流通,主力净额,涨停原因代码,涨停原因代码数量)
                result_list = []
                for d in datas:
                    if d[5] == reason and d[0] != code:
                        # (代码,名称)
                        result_list.append((d[0], d[1]))
                if datas:
                    for d in datas:
                        if d[5] == reason and d[0] != code:
                            # (代码,名称)
                            result_list.append((d[0], d[1]))
                response_data = json.dumps({"code": 0, "data": {"reason": reason, "data": result_list}})
            else:
                response_data = json.dumps({"code": 1, "msg": "昨日未涨停"})
@@ -497,7 +499,7 @@
                    code = d[0]
                    if code.find("00") == 0 or code.find("60") == 0:
                        limit_up_time = time.strftime("%H:%M:%S", time.localtime(d[2]))
                        code_price_manager.Buy1PriceManager.set_limit_up_time(code, limit_up_time)
                        code_price_manager.Buy1PriceManager().set_limit_up_time(code, limit_up_time)
                self.__kplDataManager.save_data(type_, result_list)
                kpl_data_manager.KPLLimitUpDataRecordManager.save_record(tool.get_now_date_str(), result_list)
        elif type_ == KPLDataType.OPEN_LIMIT_UP.value:
@@ -564,7 +566,9 @@

def run(addr, port):
    # 运行看盘消息采集
    kp_client_msg_manager.run_capture()
    # kp_client_msg_manager.run_capture()
    kpl_data_manager.run_pull_task()

    handler = DataServer
    # httpd = socketserver.TCPServer((addr, port), handler)
    httpd = ThreadedHTTPServer((addr, port), handler)