From d6b6be5eb2ae00a8ccf46bd7d53cd7d0c1e59c72 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期五, 24 十一月 2023 19:19:37 +0800
Subject: [PATCH] 初始化独立某些方法

---
 third_data/code_plate_key_manager.py |   60 ++++++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 44 insertions(+), 16 deletions(-)

diff --git a/third_data/code_plate_key_manager.py b/third_data/code_plate_key_manager.py
index a3e8e85..5eea3db 100644
--- a/third_data/code_plate_key_manager.py
+++ b/third_data/code_plate_key_manager.py
@@ -6,13 +6,14 @@
 import json
 
 import constant
+from code_attribute.code_nature_analyse import HighIncreaseCodeManager
 from db.redis_manager_delegate import RedisUtils
-from third_data import kpl_block_util
+from third_data import kpl_block_util, kpl_api
 from utils import global_util, tool
-from log_module import log
+from log_module import log, async_log_util
 from db import redis_manager_delegate as redis_manager
 
-from log_module.log import logger_kpl_limit_up, logger_kpl_block_can_buy, logger_kpl_debug
+from log_module.log import logger_kpl_limit_up, logger_kpl_block_can_buy
 from third_data.kpl_util import KPLPlatManager
 from trade import trade_manager, l2_trade_util
 
@@ -77,6 +78,25 @@
             return self.__code_by_blocks.get(code)
         else:
             return self.__code_blocks.get(code)
+
+    # 浠庣綉缁滀笂鍔犺浇绮鹃�夋澘鍧�
+    def load_jx_blocks(self, code, buy_1_price, limit_up_price):
+        if limit_up_price and buy_1_price:
+            # 澶勭悊涔�1,鍗�1淇℃伅
+            pre_close_price = round(float(limit_up_price) / 1.1, 2)
+            # 濡傛灉娑ㄥ箙澶т簬7%灏辫鍙栨澘鍧�
+            price_rate = (buy_1_price - pre_close_price) / pre_close_price
+            if price_rate > 0.07:
+                if not self.get_jx_blocks_cache(code):
+                    blocks = kpl_api.getCodeJingXuanBlocks(code)
+                    self.save_jx_blocks(code, blocks)
+                    async_log_util.info(logger_kpl_block_can_buy, f"{code}:鑾峰彇鍒扮簿閫夋澘鍧�-{blocks}")
+            elif price_rate > 0.03:
+                # 娣诲姞澶囩敤鏉垮潡
+                if not self.get_jx_blocks_cache(code, by=True):
+                    blocks = kpl_api.getCodeJingXuanBlocks(code)
+                    self.save_jx_blocks(code, blocks, by=True)
+                    async_log_util.info(logger_kpl_block_can_buy, f"{code}:鑾峰彇鍒扮簿閫夋澘鍧�(澶囩敤)-{blocks}")
 
 
 # 寮�鐩樺暒绂佹浜ゆ槗鏉垮潡绠$悊
@@ -291,11 +311,9 @@
     @classmethod
     def is_in_top(cls, keys):
         reasons = cls.get_can_buy_key_set()
-        log.logger_kpl_debug.debug("甯傚満娴佸叆鍓�5:{}", reasons)
         forbidden_plates = cls.__KPLPlateForbiddenManager.list_all_cache()
         reasons = reasons - forbidden_plates
         temp_set = keys & reasons
-        log.logger_kpl_debug.debug("甯傚満娴佸叆鍓�5鍖归厤缁撴灉:{}", temp_set)
         if temp_set:
             return True, temp_set
         else:
@@ -317,7 +335,6 @@
         self.__history_limit_up_reason_dict[code] = set(reasons)
         RedisUtils.setex(self.__get_redis(), f"kpl_his_limit_up_reason-{code}", tool.get_expire(),
                          json.dumps(list(reasons)))
-        logger_kpl_debug.debug(f"璁剧疆鍘嗗彶娑ㄥ仠鍘熷洜锛歿code}-{reasons}")
 
     # 濡傛灉杩斿洖鍊间笉涓篘one琛ㄧず宸茬粡鍔犺浇杩囧巻鍙插師鍥犱簡
     def get_history_limit_up_reason(self, code):
@@ -450,26 +467,36 @@
         # msg_list.append(f"\n瀹炴椂top10(娑ㄥ仠鏁伴噺锛歿len(current_limit_up_datas)})")
         # msg_list.append(f"鍘嗗彶top20(娑ㄥ仠鏁伴噺锛歿len(top_8_record)})")
 
+        # 闇�瑕佹帓闄ょ殑鑰佸ぇ鐨勪唬鐮�
+        exclude_first_codes = HighIncreaseCodeManager().list_all()
+
+        # 鑾峰彇涓绘澘寮�1鐨勪唬鐮�
+        open_limit_up_codes = kpl_block_util.get_shsz_open_limit_up_codes(code, block, limit_up_record_datas,
+                                                                          code_limit_up_reason_dict)
+        # 鍓旈櫎楂樹綅鏉�
+        if open_limit_up_codes and yesterday_current_limit_up_codes:
+            open_limit_up_codes -= yesterday_current_limit_up_codes
+
+
         # 鑾峰彇涓绘澘瀹炴椂韬綅,鍓旈櫎楂樹綅鏉�
         current_shsz_rank, front_current_shsz_rank_codes = kpl_block_util.get_code_current_rank(code, block,
                                                                                                 current_limit_up_datas,
                                                                                                 code_limit_up_reason_dict,
                                                                                                 yesterday_current_limit_up_codes,
+                                                                                                exclude_first_codes,
+                                                                                                len(open_limit_up_codes),
                                                                                                 shsz=True)
         record_shsz_rank, record_shsz_rank_codes = kpl_block_util.get_code_record_rank(code, block,
                                                                                        limit_up_record_datas,
                                                                                        code_limit_up_reason_dict,
                                                                                        yesterday_current_limit_up_codes,
                                                                                        shsz=True)
-        # 鑾峰彇涓绘澘鍘嗗彶韬綅
 
-        open_limit_up_codes = kpl_block_util.get_shsz_open_limit_up_codes(code, block, limit_up_record_datas,
-                                                                          code_limit_up_reason_dict)
         if open_limit_up_codes:
             # 涓绘澘寮�1
             if current_shsz_rank < len(open_limit_up_codes) + 1 and record_shsz_rank < len(open_limit_up_codes) + 2:
                 # 灞炰簬榫�1,榫�2
-                return True, f"{tool.get_now_time_str()} {block}锛歵op10娑ㄥ仠鏉垮潡锛屼富鏉垮紑1({open_limit_up_codes}),灞炰簬涓绘澘鍓嶉緳{len(open_limit_up_codes) + 1}(瀹炴椂韬綅-{current_shsz_rank}/{len(current_limit_up_datas)})"
+                return True, f"{tool.get_now_time_str()} {block}锛歵op10娑ㄥ仠鏉垮潡锛屼富鏉垮紑1({open_limit_up_codes}),灞炰簬涓绘澘鍓嶉緳{len(open_limit_up_codes) + 1}(瀹炴椂韬綅-{current_shsz_rank}:{front_current_shsz_rank_codes}/{len(current_limit_up_datas)})"
             else:
                 if record_shsz_rank >= len(open_limit_up_codes) + 1:
                     cls.__remove_from_l2(code, f"{code}鏍规嵁韬綅绂佹涔板叆锛氥�恵block}銆戝巻鍙茶韩浣峽record_shsz_rank}")
@@ -494,11 +521,12 @@
                           before_blocks_dict):
         # 鍔犺浇娑ㄥ仠浠g爜鐨勭洰鏍囨澘鍧�
         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]
+            if limit_up_record_datas:
+                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
 
         if current_limit_up_datas is None:
@@ -519,7 +547,7 @@
                 keys |= k4
                 keys = keys - constant.KPL_INVALID_BLOCKS
 
-        log.logger_kpl_debug.info("{}鏈�缁堝叧閿瘝锛歿}", code, keys)
+        # log.logger_kpl_debug.info("{}鏈�缁堝叧閿瘝锛歿}", code, keys)
 
         # 娑ㄥ仠鍒楄〃涓尮閰嶅叧閿瘝锛岃繑鍥烇紙鏉垮潡:浠g爜闆嗗悎锛夛紝浠g爜闆嗗悎涓凡缁忔帓闄よ嚜韬�
         if not keys:

--
Gitblit v1.8.0