From 64acc2bcd5e531f02be2da919e97b7af6bc86e4a Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期二, 27 二月 2024 16:52:21 +0800
Subject: [PATCH] zeromq集成测试

---
 third_data/kpl_data_manager.py |   33 +++++++++++++++++++--------------
 1 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/third_data/kpl_data_manager.py b/third_data/kpl_data_manager.py
index fe2bb34..032e98e 100644
--- a/third_data/kpl_data_manager.py
+++ b/third_data/kpl_data_manager.py
@@ -47,7 +47,7 @@
     __kplPlatManager = KPLPlatManager()
     __LimitUpCodesPlateKeyManager = LimitUpCodesPlateKeyManager()
     __CodesPlateKeysManager = CodesHisReasonAndBlocksManager()
-    __current_code_reason_dict = {}
+    __current_code_reasons_dict = {}
     __current_reason_codes_dict = {}
     __records_cache = {}
 
@@ -81,15 +81,20 @@
             cls.latest_origin_datas = records
             cls.__LimitUpCodesPlateKeyManager.set_today_limit_up([(r[0], r[5]) for r in records])
 
-        code_reason_dict = {}
-        reason_code_dict = {}
+        code_reasons_dict = {}
+        reason_codes_dict = {}
         for d in records:
-            code_reason_dict[d[0]] = d[5]
-            if d[5] not in reason_code_dict:
-                reason_code_dict[d[5]] = set()
-            reason_code_dict[d[5]].add(d[0])
-        cls.__current_code_reason_dict = code_reason_dict
-        cls.__current_reason_codes_dict = reason_code_dict
+            # 娑ㄥ仠鍘熷洜 + 鎺ㄨ崘鍘熷洜
+            bs = {d[5]}
+            if d[6]:
+                bs |= set(d[6].split("銆�"))
+            code_reasons_dict[d[0]] = bs
+            for b in bs:
+                if b not in reason_codes_dict:
+                    reason_codes_dict[b] = set()
+                reason_codes_dict[b].add(d[0])
+        cls.__current_code_reasons_dict = code_reasons_dict
+        cls.__current_reason_codes_dict = reason_codes_dict
 
         # 娑ㄥ仠鏁版嵁璁板綍
         mysqldb = mysql_data.Mysqldb()
@@ -213,8 +218,8 @@
         return bs
 
     @classmethod
-    def get_current_block(cls, code):
-        return cls.__current_code_reason_dict.get(code)
+    def get_current_blocks(cls, code):
+        return cls.__current_code_reasons_dict.get(code)
 
     @classmethod
     def get_current_codes_by_block(cls, block):
@@ -396,9 +401,9 @@
 
     def get_limit_up():
         while True:
-            if tool.is_trade_time():
+            if tool.is_trade_time() and int(tool.get_now_time_str().replace(':', '')) > int("092530"):
                 try:
-                    results = kpl_api.getLimitUpInfo()
+                    results = kpl_api.getLimitUpInfoNew()
                     result = json.loads(results)
                     start_time = time.time()
                     __upload_data("limit_up", result)
@@ -441,7 +446,7 @@
             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_bidding_money, daemon=True).start()
     # threading.Thread(target=get_market_industry, daemon=True).start()
     # threading.Thread(target=get_market_jingxuan, daemon=True).start()
 

--
Gitblit v1.8.0