bug修复

Administrator

2023-07-24 0e68e24f54db11d340785b17570fff2bc5fc7ac6

 third_data/code_plate_key_manager.py

@@ -66,12 +66,14 @@
        self.__get_redis().expire(f"kpl_limit_up_reason_his-{code}", tool.get_expire())
        self.__set_total_keys(code)

    # 设置代码的今日涨停原因
    def __set_total_keys(self, code):
        keys = set()
        keys_his = self.__get_redis().smembers(f"kpl_limit_up_reason_his-{code}")
        keys |= keys_his
        # keys_his = self.__get_redis().smembers(f"kpl_limit_up_reason_his-{code}")
        # keys |= keys_his
        if code in self.today_limit_up_reason_dict:
            keys.add(self.today_limit_up_reason_dict.get(code))
            if self.today_limit_up_reason_dict.get(code) not in constant.KPL_INVALID_BLOCKS:
                keys.add(self.today_limit_up_reason_dict.get(code))
        self.total_code_keys_dict[code] = keys
        for k in keys:
            if k not in self.total_key_codes_dict:
@@ -79,6 +81,8 @@
            self.total_key_codes_dict[k].add(code)

        logger_kpl_limit_up.info("{}板块关键词:{}", code, keys)

    # 根据传入的关键词与涨停代码信息匹配身位

    def get_codes_by_key_without_mine(self, key, code):
        # 只比较今日涨停原因
@@ -331,7 +335,17 @@
    # latest_2_day_limit_up_datas：最近2天的实时涨停（不含今日）
    # limit_up_record_datas：今日历史涨停
    @classmethod
    def get_can_buy_block(cls, code, current_limit_up_datas, latest_2_day_limit_up_datas, limit_up_record_datas):
    def get_can_buy_block(cls, code, current_limit_up_datas, limit_up_record_datas,
                          before_blocks_dict):
        # 加载涨停代码的目标板块
        def load_code_block():
            for d in limit_up_record_datas:
                if d[2] in constant.KPL_INVALID_BLOCKS and d[3] in before_blocks_dict:
                    code_limit_up_reason_dict[d[3]] = list(before_blocks_dict.get(d[3]))[0]
                else:
                    code_limit_up_reason_dict[d[3]] = d[2]
            return code_limit_up_reason_dict

        now_time = int(tool.get_now_time_str().replace(":", ""))
        times = [100000, 103000, 110000, 133000, 150000]
        time_index = 0
@@ -339,127 +353,88 @@
            if now_time < times[i]:
                time_index = i
                break
        # 获取板块
        # 获取目标代码板块
        keys, k1, k11, k2, k3, k4 = cls.__TargetCodePlateKeyManager.get_plate_keys(code)
        log.logger_kpl_debug.info("{}关键词：所有-{},今日-{},今日历史-{},历史-{},二级行业-{},代码板块-{}", code, keys, k1, k11, k2, k3, k4)
        log.logger_kpl_debug.info("{}关键词：今日-{},今日历史-{},历史-{},二级行业-{},代码板块-{}", code, k1, k11, k2, k3, k4)
        keys = set()
        if k1:
            for k in k1:
                if k not in constant.KPL_INVALID_BLOCKS:
                    keys.add(k)
        if not keys:
            for k in k2:
                if k not in constant.KPL_INVALID_BLOCKS:
                    keys.add(k)
        if not keys:
            if k3:
                keys |= k3
        log.logger_kpl_debug.info("{}最终关键词：{}", code, keys)

        # 涨停列表中匹配关键词，返回（板块:代码集合），代码集合中已经排除自身
        match_limit_up_result = cls.__LimitUpCodesPlateKeyManager.match_limit_up_reason_keys(code, keys)
        log.logger_kpl_debug.info("{}关键词身位匹配结果：{}", code, match_limit_up_result)
        if not match_limit_up_result:
            return cls.BLOCK_TYPE_NONE, None, "未在涨停列表中未匹配到涨停原因"
        # 获取板块归类
        for block in match_limit_up_result:
            # 获取强势板块
            strong_result = kpl_block_util.is_strong_block(block, current_limit_up_datas, latest_2_day_limit_up_datas)
            # 获取猛拉板块
            soon_limit_up_result = kpl_block_util.is_soon_limit_up(code, block, limit_up_record_datas)
        if not keys:
            return cls.BLOCK_TYPE_NONE, None, "尚未找到涨停原因"
        code_limit_up_reason_dict = {}
        load_code_block()
        msg_list = []
        for block in keys:
            is_top_8_record, top_8_record = kpl_block_util.is_record_top_block(code, block, limit_up_record_datas, 8)
            is_top_4_current, top_4_current = kpl_block_util.is_current_top_block(code, block, current_limit_up_datas, 4)
            is_top_4 = is_top_8_record and is_top_4_current
            msg_list.append(f"实时top4: {top_4_current}")
            msg_list.append(f"历史top8: {top_8_record}")

            # 获取身位
            rank = kpl_block_util.get_code_rank(code, block, limit_up_record_datas)
            # 主板身位
            sh_sz_rank = kpl_block_util.get_sh_sz_code_rank(code, block, limit_up_record_datas)
            # 是否后排
            is_back_row = kpl_block_util.is_back_row(code, block, current_limit_up_datas)

            # 是否满足市场流入前几
            is_in_top_input = RealTimeKplMarketData.is_in_top(set([block]))[0]

            log.logger_kpl_debug.info("{}-{}  板块判断结果：强势板块-{}  猛拉板块-{} 身位-{} 主板身位-{} 是否后排-{} 是否在流入前排-{}", code, block,
                                      strong_result, soon_limit_up_result, rank, sh_sz_rank, is_back_row,
                                      is_in_top_input)

            if time_index == 0:
                # 09:30:00 - 10:00:00
                if strong_result[0]:
                    # 强势板块
                    # 买主板龙1,2,3,4  买后排
                    if is_back_row and sh_sz_rank <= 2:
                        return cls.BLOCK_TYPE_STRONG, block, f"{block} 强势板块:买主板龙1,2,3  买后排"

                if soon_limit_up_result[0]:
                    # 猛拉板块
                    # 只买龙2 买后排
                    if is_back_row and rank == 1:
                        return cls.BLOCK_TYPE_SOON_LIMIT_UP, block, f"{block} 猛拉板块:只买龙2,买后排"
                # 其他板块
                if is_in_top_input and sh_sz_rank <= 1 and is_back_row:
                    # 看精选/行业流入   买龙主板1,2  买后排
                    return cls.BLOCK_TYPE_COMMON, block, f"{block} 其他板块:看精选/行业流入   买龙主板1,2  买后排"

            elif time_index == 1:
                # 10:00:00 - 10:30:00
                if strong_result[0]:
                    # 强势板块
                    # 买主板龙1,2,3  买后排
                    if is_back_row and sh_sz_rank <= 2:
                        return cls.BLOCK_TYPE_STRONG, block, f"{block} 强势板块:买主板龙1,2,3  买后排"

                if soon_limit_up_result[0]:
                    # 猛拉板块
                    # 只买龙2 买后排
                    if is_back_row and rank == 1:
                        return cls.BLOCK_TYPE_SOON_LIMIT_UP, block, f"{block} 猛拉板块:只买龙2,买后排"
                # 其他板块
                if is_in_top_input and sh_sz_rank <= 1 and is_back_row:
                    # 看精选/行业流入   买龙主板1,2  买后排
                    return cls.BLOCK_TYPE_COMMON, block, f"{block} 其他板块:看精选/行业流入   买龙主板1,2  买后排"
            elif time_index == 2:
                # 10:30:00 - 11:00:00
                if strong_result[0]:
                    # 强势板块
                    # 买主板龙1,2  买后排
                    if is_back_row and sh_sz_rank <= 1:
                        return cls.BLOCK_TYPE_STRONG, block, f"{block} 强势板块:买主板龙1,2  买后排"

                if soon_limit_up_result[0]:
                    # 猛拉板块
                    # 只买龙2 买后排
                    if is_back_row and rank == 1:
                        return cls.BLOCK_TYPE_SOON_LIMIT_UP, block, f"{block} 猛拉板块:只买龙2,买后排"
                # 其他板块
                if is_in_top_input and sh_sz_rank <= 1 and is_back_row:
                    # 看精选/行业流入   买龙主板1,2  买后排
                    return cls.BLOCK_TYPE_COMMON, block, f"{block} 其他板块:看精选/行业流入   买龙主板1,2  买后排"
            elif time_index == 3:
                # 11:00:00 - 13:30:00
                if soon_limit_up_result[0]:
                    # 猛拉板块
                    # 只买龙2 买后排
                    if is_back_row and rank == 1:
                        return cls.BLOCK_TYPE_SOON_LIMIT_UP, block, f"{block} 猛拉板块:只买龙2,买后排"
                # 其他板块
                if is_in_top_input and sh_sz_rank <= 1 and is_back_row:
                    # 看精选/行业流入   买龙主板1,2  买后排
                    return cls.BLOCK_TYPE_COMMON, block, f"{block} 其他板块：看精选/行业流入,买龙主板1,2 ,买后排"
            elif time_index == 4:
                # 13:30:00 - 15:00:00
                if soon_limit_up_result[0]:
                    # 猛拉板块
                    # 只买龙2 买后排
                    if is_back_row and rank == 1:
                        return cls.BLOCK_TYPE_SOON_LIMIT_UP, block, f"{block} 猛拉板块：只买龙2,买后排"
                # 其他板块
                if is_in_top_input:
                    # 精选/行业流入符合
                    if sh_sz_rank <= 1 and is_back_row:
                        # 看精选/行业流入   买龙主板1,2  买后排
                        return cls.BLOCK_TYPE_COMMON, block, f"{block} 其他板块：精选/行业流入符合,买龙主板1,2,买后排"
            # 获取主板实时身位
            current_shsz_rank = kpl_block_util.get_code_current_rank(code, block, current_limit_up_datas,
                                                                     code_limit_up_reason_dict, shsz=True)
            record_shsz_rank = kpl_block_util.get_code_record_rank(code, block, limit_up_record_datas,
                                                                   code_limit_up_reason_dict, shsz=True)
            # 获取主板历史身位
            if is_top_4:
                is_open_limit_up, msg = kpl_block_util.is_shsz_open_limit_up(code, block, limit_up_record_datas,
                                                                             code_limit_up_reason_dict)
                if is_open_limit_up:
                    # 主板开1
                    if current_shsz_rank < 2 and record_shsz_rank < 2:
                        # 属于龙1,龙2
                        return block, f"{block}：top4涨停板块，主板开1,属于龙1/龙2(实时身位-{current_shsz_rank})"
                    else:
                        msg_list.append(
                            f"板块-{block}: top4涨停板块，主板开1（{msg}）,不为主板龙1龙2（实时身位-{current_shsz_rank},历史身位-{record_shsz_rank}）")
                        continue
                else:
                    if sh_sz_rank == 0 and not is_back_row:
                        return cls.BLOCK_TYPE_START_UP, block, f"{block} 其他板块: 买主板龙1,买主板独苗"

        return cls.BLOCK_TYPE_NONE, None, f"板块({match_limit_up_result.keys()})不符合买入条件"
                    if current_shsz_rank == 0 and record_shsz_rank < 2:
                        return block, f"{block}：top4涨停板块，非主板开1，属于龙1"
                    else:
                        msg_list.append(
                            f"板块-{block}: top4涨停板块，非主板开1,不为主板龙1（实时身位-{current_shsz_rank},历史身位-{record_shsz_rank}）")
                        continue
            else:
                # 是否满足行业精选流入要求
                is_in_top_input = RealTimeKplMarketData.is_in_top(set([block]))[0]
                if not is_in_top_input:
                    msg_list.append(
                        f"板块-{block}: 非top4涨停板块，不满足精选/行业流入要求")
                    continue
                else:
                    # 是否为主板龙1（实时龙1，历史龙2以内）
                    if current_shsz_rank == 0 and record_shsz_rank < 2:
                        return block, f"{block}：不是top4涨停板块，满足精选/行业流入要求，满足主板龙1"
                    else:
                        msg_list.append(
                            f"板块-{block}: 不是top4涨停板块，满足精选/行业流入要求,不为主板龙1（实时身位-{current_shsz_rank},历史身位-{record_shsz_rank}）")
                        continue
        return None, "\r\n".join(msg_list)

    # 是否可以下单
    # 返回：是否可以下单,消息,板块类型
    @classmethod
    def can_buy(cls, code, current_limit_up_datas, latest_2_day_limit_up_datas, limit_up_record_datas):
    def can_buy(cls, code, current_limit_up_datas, limit_up_record_datas, before_blocks_dict):
        if constant.TEST:
            return True, "", cls.BLOCK_TYPE_NONE
        block_type, block, block_msg = cls.get_can_buy_block(code, current_limit_up_datas, latest_2_day_limit_up_datas,
                                                             limit_up_record_datas)
        if block_type == cls.BLOCK_TYPE_NONE:
            return False, block_msg, block_type
        block, block_msg = cls.get_can_buy_block(code, current_limit_up_datas,
                                                 limit_up_record_datas, before_blocks_dict)
        if block is None:
            return False, block_msg

        # ---------------------------------判断目标代码的板块-------------------start------------
        # 判断匹配出的涨停原因，判断是否有已经下单的票
@@ -552,7 +527,7 @@
                    msg_list.append(f"【{key}】中已经有{success_codes_count}个成交代码")
                    log.logger_kpl_debug.debug(f"{code}：板块（{key}）已经有成交【{trade_success_blocks_count[key]}】")
                    continue
            return True, block_msg, block_type
            return True, block_msg
            # 板块可以下单数量
            # if trade_block_codes_dict.get(key) is None or len(trade_block_codes_dict.get(key)) < \
            #         can_buy_codes_count_dict[key]:
@@ -564,7 +539,7 @@
            #     order_count = len(trade_block_codes_dict.get(key))
            #     msg_list.append(f"【{key}】中下单代码数量{order_count}/允许下单数量{can_buy_codes_count_dict[key]}")

        return False, ",".join(msg_list), block_type
        return False, ",".join(msg_list)


if __name__ == "__main__":