From 2f7fea8cbc410351ff1b2fce571e1fe92e682a71 Mon Sep 17 00:00:00 2001 From: Administrator <admin@example.com> Date: 星期五, 01 九月 2023 14:24:00 +0800 Subject: [PATCH] bug修复 --- code_attribute/first_target_code_data_processor.py | 94 ++++++++++++++++++++++++----------------------- 1 files changed, 48 insertions(+), 46 deletions(-) diff --git a/code_attribute/first_target_code_data_processor.py b/code_attribute/first_target_code_data_processor.py index ee3ba55..16eaa62 100644 --- a/code_attribute/first_target_code_data_processor.py +++ b/code_attribute/first_target_code_data_processor.py @@ -10,7 +10,7 @@ from code_attribute import gpcode_manager, gpcode_first_screen_manager, global_data_loader, code_nature_analyse, \ code_volumn_manager from code_attribute.code_data_util import ZYLTGBUtil -from log_module.log import logger_first_code_record +from log_module.log import logger_first_code_record, logger_l2_codes_subscript from third_data import kpl_api, block_info from third_data.code_plate_key_manager import CodesHisReasonAndBlocksManager from third_data.history_k_data_util import HistoryKDatasUtils @@ -23,6 +23,7 @@ def process_first_codes_datas(dataList): + logger_l2_codes_subscript.info("鍔犺浇l2浠g爜鐩稿叧鏁版嵁") print("棣栨澘浠g爜鏁伴噺锛�", len(dataList)) limit_up_price_dict = {} temp_codes = [] @@ -34,7 +35,7 @@ codes.append(code) # ---鏌ヨ鎯充拱鍗曪紝濡傛灉娌℃湁鍦ㄥ垪琛ㄤ腑灏遍渶瑕佸己琛屽姞鍏ュ垪琛� - want_codes = gpcode_manager.WantBuyCodesManager.list_code() + want_codes = gpcode_manager.WantBuyCodesManager().list_code_cache() if want_codes: # 娌℃湁鍦ㄧ幇浠烽噰闆嗕腑鐨勬兂涔颁唬鐮� diff_codes = set(want_codes) - set(codes) @@ -65,18 +66,18 @@ # ---淇濆瓨鏈瓫閫夌殑棣栨澘浠g爜 new_add_codes = gpcode_first_screen_manager.set_target_no_screen_codes(codes) - # 淇濆瓨鑷敱娴侀�氳偂鏈� - if dataList: - zyltgb_list = [] - for data in dataList: - code = data["code"] - if code in global_util.zyltgb_map: - continue - zyltgb_list.append( - {"code": code, "zyltgb": data["zyltgb"], "zyltgb_unit": data["zyltgbUnit"]}) - if zyltgb_list: - ZYLTGBUtil.save_list(zyltgb_list) - global_data_loader.load_zyltgb() + # 淇濆瓨鑷敱娴侀�氳偂鏈紝鏆傛椂涓嶄繚瀛� + # if dataList: + # zyltgb_list = [] + # for data in dataList: + # code = data["code"] + # if code in global_util.zyltgb_map: + # continue + # zyltgb_list.append( + # {"code": code, "zyltgb": data["zyltgb"], "zyltgb_unit": data["zyltgbUnit"]}) + # if zyltgb_list: + # ZYLTGBUtil.save_list(zyltgb_list) + # global_data_loader.load_zyltgb() # 鑾峰彇鏄ㄦ棩鏀剁洏浠� for code in codes: @@ -84,30 +85,30 @@ if gpcode_manager.get_limit_up_price(code) is None: inited_data.re_set_price_pres([code], True) - # 鏉垮潡鍏抽敭瀛楀噯澶� - for code in codes: - if __CodesPlateKeysManager.get_history_limit_up_reason(code) is None: - # 浠庢暟鎹簱鍔犺浇鍘嗗彶娑ㄥ仠鍘熷洜 - __CodesPlateKeysManager.set_history_limit_up_reason(code, - KPLLimitUpDataRecordManager.get_latest_blocks_set( - code)) - if __CodesPlateKeysManager.get_blocks(code) is None: - try: - results = kpl_api.getStockIDPlate(code) - bs = [r[1] for r in results] - __CodesPlateKeysManager.set_blocks(code, bs) - except Exception as e: - logging.exception(e) - pass + # 鏉垮潡鍏抽敭瀛楀噯澶� 鏆傛椂鍒犻櫎 + # for code in codes: + # if __CodesPlateKeysManager.get_history_limit_up_reason(code) is None: + # # 浠庢暟鎹簱鍔犺浇鍘嗗彶娑ㄥ仠鍘熷洜 + # __CodesPlateKeysManager.set_history_limit_up_reason(code, + # KPLLimitUpDataRecordManager.get_latest_blocks_set( + # code)) + # if __CodesPlateKeysManager.get_blocks(code) is None: + # try: + # results = kpl_api.getStockIDPlate(code) + # bs = [r[1] for r in results] + # __CodesPlateKeysManager.set_blocks(code, bs) + # except Exception as e: + # logging.exception(e) + # pass # 鑾峰彇60澶╂渶澶ц褰� for code in codes: need_get_volumn = False if code not in global_util.max60_volumn or global_util.max60_volumn.get(code) is None: need_get_volumn = True - if not need_get_volumn and code_nature_analyse.CodeNatureRecordManager.get_nature_cache( - code) is None: - need_get_volumn = True + # if not need_get_volumn and code_nature_analyse.CodeNatureRecordManager.get_nature_cache( + # code) is None: + # need_get_volumn = True if need_get_volumn: limit_up_price = gpcode_manager.get_limit_up_price(code) if limit_up_price is None: @@ -129,19 +130,20 @@ # bad_codes.add(code) # # 鍔犲叆绂佹浜ゆ槗浠g爜 # l2_trade_util.forbidden_trade(code) - code_nature_analyse.set_record_datas(code, - gpcode_manager.get_limit_up_price(code), - volumes_data) + # 鏆傛椂涓嶄繚瀛楰绾垮舰鎬� + # code_nature_analyse.set_record_datas(code, + # gpcode_manager.get_limit_up_price(code), + # volumes_data) except Exception as e: logger_first_code_record.error(f"{code}:{str(e)}") - gpcode_manager.FirstCodeManager.add_record(codes) - # 鍒濆鍖栨澘鍧椾俊鎭� - for code in codes: - block_info.init_code(code) + gpcode_manager.FirstCodeManager().add_record(codes) + # 鍒濆鍖栨澘鍧椾俊鎭紝鏆傛椂鍒犻櫎 + # for code in codes: + # block_info.init_code(code) if new_add_codes: - gpcode_manager.set_first_gp_codes_with_data(HistoryKDatasUtils.get_gp_latest_info(codes, - fields="symbol,sec_name,sec_type,sec_level")) + gpcode_manager.FirstGPCodesManager().set_first_gp_codes_with_data(HistoryKDatasUtils.get_gp_latest_info(codes, + fields="symbol,sec_name,sec_type,sec_level")) # 鍔犲叆棣栨澘鍘嗗彶璁板綍 logger_first_code_record.info("鏂板棣栨澘锛歿}", new_add_codes) @@ -190,8 +192,8 @@ limit_up_time = tool.get_now_time_str() if is_limit_up: # 鍔犲叆棣栨澘娑ㄥ仠 - gpcode_manager.FirstCodeManager.add_limited_up_record([code]) - pricePre = gpcode_manager.get_price_pre_cache(code) + gpcode_manager.FirstCodeManager().add_limited_up_record([code]) + pricePre = gpcode_manager.CodePrePriceManager.get_price_pre_cache(code) if pricePre is None: inited_data.re_set_price_pres([code]) @@ -201,11 +203,11 @@ "limit_up": is_limit_up}) if code in new_add_codes: if is_limit_up: - place_order_count = trade_data_manager.placeordercountmanager.get_place_order_count( + place_order_count = trade_data_manager.PlaceOrderCountManager().get_place_order_count( code) if place_order_count == 0: - trade_data_manager.placeordercountmanager.place_order(code) + trade_data_manager.PlaceOrderCountManager().place_order(code) gpcode_first_screen_manager.process_ticks(prices) - + logger_l2_codes_subscript.info("l2浠g爜鐩稿叧鏁版嵁鍔犺浇瀹屾垚") return tick_datas -- Gitblit v1.8.0