From 02b96b3d970e7424a3cef4494d4ee963b1410c79 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期二, 12 十一月 2024 09:06:27 +0800
Subject: [PATCH] 触发扫入的成交比例阈值修改

---
 third_data/kpl_data_manager.py |  244 ++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 194 insertions(+), 50 deletions(-)

diff --git a/third_data/kpl_data_manager.py b/third_data/kpl_data_manager.py
index 01d2c1f..22dca1d 100644
--- a/third_data/kpl_data_manager.py
+++ b/third_data/kpl_data_manager.py
@@ -9,13 +9,15 @@
 
 import constant
 from db.redis_manager_delegate import RedisUtils
-from log_module import async_log_util
+from log_module import async_log_util, log
+from third_data.kpl_data_constant import LimitUpDataConstant, TodayLimitUpReasonChangeManager
 from utils import tool
 
 # 寮�鐩樺暒鍘嗗彶娑ㄥ仠鏁版嵁绠$悊
 from db import mysql_data_delegate as mysql_data, redis_manager_delegate as redis_manager
-from log_module.log import logger_kpl_limit_up_reason_change, logger_debug, logger_kpl_limit_up
-from third_data import kpl_util, kpl_api
+from log_module.log import logger_kpl_limit_up_reason_change, logger_debug, logger_kpl_limit_up, \
+    logger_kpl_open_limit_up
+from third_data import kpl_util, kpl_api, kpl_data_constant
 from third_data.code_plate_key_manager import LimitUpCodesPlateKeyManager, CodesHisReasonAndBlocksManager
 
 # 浠g爜瀵瑰簲鐨勬定鍋滃師鍥犱繚瀛�
@@ -48,8 +50,12 @@
     __LimitUpCodesPlateKeyManager = LimitUpCodesPlateKeyManager()
     __CodesPlateKeysManager = CodesHisReasonAndBlocksManager()
     __current_code_reasons_dict = {}
+    # 褰撳墠娑ㄥ仠鍘熷洜+鎺ㄨ崘鍘熷洜鐨勪唬鐮侀泦鍚�
     __current_reason_codes_dict = {}
+    # 褰撳墠娑ㄥ仠鍘熷洜鐨勪唬鐮侀泦鍚�
+    __current_limit_up_reason_codes_dict = {}
     __records_cache = {}
+    record_code_dict = {}
 
     @classmethod
     def __load_hist_and_blocks(cls, code):
@@ -67,9 +73,24 @@
 
     @classmethod
     def save_record(cls, day, records):
+        # 缁熻鐐告澘
+        try:
+            last_codes = set()
+            if cls.latest_origin_datas:
+                last_codes = set([x[0] for x in cls.latest_origin_datas])
+            now_codes = set()
+            if records:
+                now_codes = set([x[0] for x in records])
+            open_limit_up_codes = last_codes - now_codes
+            if open_limit_up_codes:
+                logger_kpl_open_limit_up.info(f"鐐告澘浠g爜锛歿open_limit_up_codes}")
+        except Exception as e:
+            pass
+
         # 缁熻浠g爜鎵�灞炴澘鍧�
         code_block_dict = {}
         for data in records:
+            cls.record_code_dict[data[0]] = data
             blocks = set(data[5].split("銆�"))
             code = data[0]
             for b in blocks:
@@ -79,11 +100,18 @@
                 # 璁剧疆娑ㄥ仠鏁版嵁
         if records:
             cls.latest_origin_datas = records
-            cls.__LimitUpCodesPlateKeyManager.set_today_limit_up([(r[0], r[5]) for r in records])
+            cls.__LimitUpCodesPlateKeyManager.set_today_limit_up(
+                [(r[0], r[5], r[6].split('銆�') if r[6] else []) for r in records])
+            LimitUpDataConstant.set_current_limit_up_datas(records)
 
         code_reasons_dict = {}
         reason_codes_dict = {}
+        limit_up_reason_codes_dict = {}
         for d in records:
+            if d[5] not in limit_up_reason_codes_dict:
+                limit_up_reason_codes_dict[d[5]] = set()
+            limit_up_reason_codes_dict[d[5]].add(d[0])
+
             # 娑ㄥ仠鍘熷洜 + 鎺ㄨ崘鍘熷洜
             bs = {d[5]}
             if d[6]:
@@ -95,6 +123,7 @@
                 reason_codes_dict[b].add(d[0])
         cls.__current_code_reasons_dict = code_reasons_dict
         cls.__current_reason_codes_dict = reason_codes_dict
+        cls.__current_limit_up_reason_codes_dict = limit_up_reason_codes_dict
 
         # 娑ㄥ仠鏁版嵁璁板綍
         mysqldb = mysql_data.Mysqldb()
@@ -132,18 +161,19 @@
                         # 鏉垮潡鏇存敼杩�
                         mysqldb.execute(
                             f"update kpl_limit_up_record set _hot_block_change = f'{dd[2]}' where _day='{dd[1]}' and _code='{code}'")
-
-                        cls.__LimitUpCodesPlateKeyManager.set_today_limit_up_reason_change(code, dd[2],
+                        TodayLimitUpReasonChangeManager().set_today_limit_up_reason_change(code, dd[2],
                                                                                            code_block_dict[code])
 
                         if dd[0] in cls.latest_datas:
                             cls.latest_datas.pop(dd[0])
         cls.total_datas = KPLLimitUpDataRecordManager.list_all(tool.get_now_date_str())
+        LimitUpDataConstant.set_history_limit_up_datas(cls.total_datas)
 
     @classmethod
     def load_total_datas(cls):
         cls.total_datas = KPLLimitUpDataRecordManager.list_all(tool.get_now_date_str())
-        cls.__LimitUpCodesPlateKeyManager.set_today_total_limit_up([(r[3], r[2]) for r in cls.total_datas])
+        cls.__LimitUpCodesPlateKeyManager.set_today_total_limit_up(
+            [(r[3], r[2], r[6].split("銆�") if r[6] else []) for r in cls.total_datas])
         for d in cls.total_datas:
             cls.__load_hist_and_blocks(d[3])
 
@@ -212,6 +242,22 @@
         return results
 
     @classmethod
+    def get_latest_block_infos(cls, min_day=tool.date_sub(tool.get_now_date_str(), 180), code=None):
+        """
+
+        @param min_day: 榛樿鑾峰彇180澶╀箣鍓嶇殑
+        @param code: 浠g爜
+        @return: 鏈�杩戠殑娑ㄥ仠鏉垮潡淇℃伅
+        """
+        sql = f"SELECT r.`_code`, r.`_day`, r.`_hot_block_name`, r.`_blocks` FROM `kpl_limit_up_record` r WHERE r.`_day`>'{min_day}'"
+        if code:
+            sql += f" AND _code='{code}'"
+        sql += " order by _create_time"
+        mysqldb = mysql_data.Mysqldb()
+        results = mysqldb.select_all(sql)
+        return results
+
+    @classmethod
     def get_latest_blocks_set(cls, code):
         results = cls.get_latest_infos(code, 2, False)
         bs = set([b[0] for b in results])
@@ -230,10 +276,26 @@
         return copy.deepcopy(cls.__current_reason_codes_dict)
 
     @classmethod
+    def get_current_limit_up_reason_codes_dict(cls):
+        return copy.deepcopy(cls.__current_limit_up_reason_codes_dict)
+
+    @classmethod
     def get_current_reasons(cls):
         if cls.__current_reason_codes_dict:
             return cls.__current_reason_codes_dict.keys()
         return set()
+
+    @classmethod
+    def get_new_blocks(cls, day):
+        """
+        鑾峰彇鏌愪竴澶╂柊鍑虹幇鐨勬澘鍧�(鏂版澘鍧�)
+        @param day:
+        @return:
+        """
+        sql = f"SELECT k.`_hot_block_name`, k.`_day` FROM `kpl_limit_up_record` k GROUP BY k.`_hot_block_name` HAVING k.`_day`='{day}' ORDER BY  k.`_day` DESC"
+        mysqldb = mysql_data.Mysqldb()
+        results = mysqldb.select_all(sql)
+        return [x[0] for x in results]
 
 
 class KPLDataManager:
@@ -390,68 +452,150 @@
     return __latest_current_limit_up_records.get(day)
 
 
-# 杩愯鎷夊彇浠诲姟
-def run_pull_task():
-    def __upload_data(type, datas):
+class PullTask:
+    # 鏈�杩戞洿鏂版椂闂�
+    __latest_update_time_dict = {}
+
+    @classmethod
+    def __upload_data(cls, type, datas):
         root_data = {
             "type": type,
             "data": datas
         }
         requests.post("http://127.0.0.1:9004/upload_kpl_data", json.dumps(root_data))
 
-    def get_limit_up():
+    @classmethod
+    def repaire_pull_task(cls):
+        """
+        淇鎷夊彇浠诲姟
+        @return:
+        """
+        # 淇娑ㄥ仠
+        logger_debug.info("浠诲姟淇-寮�鐩樺暒锛氬惎鍔ㄤ慨澶�")
+        key = "limit_up"
+        if key not in cls.__latest_update_time_dict or time.time() - cls.__latest_update_time_dict[key] > 20:
+            logger_debug.info("浠诲姟淇-寮�鐩樺暒锛氭定鍋滃垪琛�")
+            # 澶т簬20s灏遍渶瑕佹洿鏂�
+            threading.Thread(target=cls.run_limit_up_task, daemon=True).start()
+        key = "jingxuan_rank"
+        if key not in cls.__latest_update_time_dict or time.time() - cls.__latest_update_time_dict[key] > 20:
+            logger_debug.info("浠诲姟淇-寮�鐩樺暒锛氱簿閫夋祦鍏ュ垪琛�")
+            # 澶т簬20s灏遍渶瑕佹洿鏂�
+            threading.Thread(target=cls.run_market_jingxuan_in, daemon=True).start()
+
+        key = "jingxuan_rank_out"
+        if key not in cls.__latest_update_time_dict or time.time() - cls.__latest_update_time_dict[key] > 20:
+            logger_debug.info("浠诲姟淇-寮�鐩樺暒锛氱簿閫夋祦鍑哄垪琛�")
+            # 澶т簬20s灏遍渶瑕佹洿鏂�
+            threading.Thread(target=cls.run_market_jingxuan_out, daemon=True).start()
+
+    @classmethod
+    def run_limit_up_task(cls):
+        # 鍏抽棴log
+        log.close_print()
         while True:
-            if (tool.is_trade_time() and int(tool.get_now_time_str().replace(':', '')) > int("092530")):
-                try:
+            try:
+                if (tool.is_trade_time() and int(tool.get_now_time_str().replace(':', '')) > int("092530")):
                     results = kpl_api.getLimitUpInfoNew()
                     result = json.loads(results)
                     start_time = time.time()
-                    __upload_data("limit_up", result)
-                except Exception as e:
+                    cls.__upload_data("limit_up", result)
+            except Exception as e:
+                try:
                     logging.exception(e)
-            time.sleep(3)
-
-    def get_bidding_money():
-        # 绔炰环鏁版嵁涓婁紶
-        while True:
-            if int("092600") < int(tool.get_now_time_str().replace(":", "")) < int("092700"):
-                try:
-                    results = kpl_api.daBanList(kpl_api.DABAN_TYPE_BIDDING)
-                    result = json.loads(results)
-                    __upload_data("biddings", result)
-                except Exception as e:
-                    pass
-            time.sleep(3)
-
-    def get_market_industry():
-        while True:
-            if tool.is_trade_time():
-                try:
-                    results = kpl_api.getMarketIndustryRealRankingInfo()
-                    result = json.loads(results)
-                    __upload_data("industry_rank", result)
+                    logger_debug.exception(e)
                 except:
                     pass
-            time.sleep(3)
+            except:
+                pass
+            finally:
+                cls.__latest_update_time_dict["limit_up"] = time.time()
+                time.sleep(3)
 
-    def get_market_jingxuan():
+    @classmethod
+    def run_market_jingxuan_in(cls):
+        """
+        绮鹃�夋祦鍏�
+        @return:
+        """
         while True:
-            if tool.is_trade_time():
-                try:
+            try:
+                if tool.is_trade_time():
                     results = kpl_api.getMarketJingXuanRealRankingInfo()
                     result = json.loads(results)
-                    __upload_data("jingxuan_rank", result)
-                except:
-                    pass
-            time.sleep(3)
+                    cls.__upload_data("jingxuan_rank", result)
+            except:
+                pass
+            finally:
+                cls.__latest_update_time_dict["jingxuan_rank"] = time.time()
+                time.sleep(3)
 
-    threading.Thread(target=get_limit_up, daemon=True).start()
-    # threading.Thread(target=get_bidding_money, daemon=True).start()
-    # threading.Thread(target=get_market_industry, daemon=True).start()
-    # threading.Thread(target=get_market_jingxuan, daemon=True).start()
+    @classmethod
+    def run_market_jingxuan_out(cls):
+        """
+        绮鹃�夋祦鍑�
+        @return:
+        """
+        while True:
+            try:
+                if tool.is_trade_time():
+                    results = kpl_api.getMarketJingXuanRealRankingInfo(False)
+                    result = json.loads(results)
+                    cls.__upload_data("jingxuan_rank_out", result)
+            except:
+                pass
+            finally:
+                cls.__latest_update_time_dict["jingxuan_rank_out"] = time.time()
+                time.sleep(3)
+
+    @classmethod
+    # 杩愯鎷夊彇浠诲姟
+    def run_pull_task(cls):
+        def get_bidding_money():
+            # 绔炰环鏁版嵁涓婁紶
+            while True:
+                if int("092600") < int(tool.get_now_time_str().replace(":", "")) < int("092700"):
+                    try:
+                        results = kpl_api.daBanList(kpl_api.DABAN_TYPE_BIDDING)
+                        result = json.loads(results)
+                        cls.__upload_data("biddings", result)
+                    except Exception as e:
+                        pass
+                time.sleep(3)
+
+        def get_market_industry():
+            while True:
+                if tool.is_trade_time():
+                    try:
+                        results = kpl_api.getMarketIndustryRealRankingInfo()
+                        result = json.loads(results)
+                        cls.__upload_data("industry_rank", result)
+                    except:
+                        pass
+                time.sleep(3)
+
+        def get_market_jingxuan():
+            while True:
+                if tool.is_trade_time():
+                    try:
+                        results = kpl_api.getMarketJingXuanRealRankingInfo()
+                        result = json.loads(results)
+                        cls.__upload_data("jingxuan_rank", result)
+                    except:
+                        pass
+                    finally:
+                        cls.__latest_update_time_dict["jingxuan_rank"] = time.time()
+                        time.sleep(3)
+                else:
+                    time.sleep(3)
+
+        threading.Thread(target=cls.run_limit_up_task, daemon=True).start()
+        # threading.Thread(target=get_bidding_money, daemon=True).start()
+        # threading.Thread(target=get_market_industry, daemon=True).start()
+        threading.Thread(target=cls.run_market_jingxuan_in, daemon=True).start()
+        threading.Thread(target=cls.run_market_jingxuan_out, daemon=True).start()
 
 
 if __name__ == "__main__":
-    print(get_latest_current_limit_up_records())
-    print(get_latest_current_limit_up_records())
+    PullTask.run_pull_task()
     input()

--
Gitblit v1.8.0