From 5574d5002c50cbe9199d9192a2db37af7811179b Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期五, 26 四月 2024 15:53:05 +0800
Subject: [PATCH] 开盘啦任务修复/bug修复
---
third_data/kpl_data_manager.py | 107 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 65 insertions(+), 42 deletions(-)
diff --git a/third_data/kpl_data_manager.py b/third_data/kpl_data_manager.py
index 026b356..b2fef47 100644
--- a/third_data/kpl_data_manager.py
+++ b/third_data/kpl_data_manager.py
@@ -95,7 +95,8 @@
if records:
cls.latest_origin_datas = records
- cls.__LimitUpCodesPlateKeyManager.set_today_limit_up([(r[0], r[5], r[6].split('銆�') if r[6] else []) 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])
code_reasons_dict = {}
reason_codes_dict = {}
@@ -159,7 +160,8 @@
@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], r[6].split("銆�") if r[6] else []) 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])
@@ -406,23 +408,40 @@
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:
+ """
+ # 淇娑ㄥ仠
+ 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()
+
+ @classmethod
+ def run_limit_up_task(cls):
while True:
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)
+ cls.__upload_data("limit_up", result)
except Exception as e:
try:
logging.exception(e)
@@ -432,46 +451,50 @@
except:
pass
finally:
+ cls.__latest_update_time_dict["limit_up"] = time.time()
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)
+ @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)
- __upload_data("industry_rank", result)
- except:
- 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)
- __upload_data("jingxuan_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
+ 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()
+ 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=get_market_jingxuan, daemon=True).start()
if __name__ == "__main__":
--
Gitblit v1.8.0