mns-scheduler 1.1.1.1__tar.gz → 1.1.1.4__tar.gz

{mns-scheduler-1.1.1.1 → mns-scheduler-1.1.1.4}/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: mns-scheduler
-Version: 1.1.1.1
+Version: 1.1.1.4

{mns-scheduler-1.1.1.1 → mns-scheduler-1.1.1.4}/mns_scheduler/concept/common/detaill/ths_concept_detail_api.py

@@ -189,8 +189,9 @@ def merge_data_common_fun(result_df, real_time_quotes_all_stocks):
 
 
 if __name__ == '__main__':
-    get_ths_concept_detail('886073', '铜缆高速连接')
+
     real_time_quotes_all_stocks_df = east_money_stock_api.get_real_time_quotes_all_stocks()
-    get_ths_concept_detail_from_web('886072', real_time_quotes_all_stocks_df)
     get_ths_concept_detail_by_explain('886078', real_time_quotes_all_stocks_df)
+    get_ths_concept_detail_from_web('886078', real_time_quotes_all_stocks_df)
+    get_ths_concept_detail('886073', '铜缆高速连接')
     get_ths_concept_detail_by_wen_cai('PCB概念', real_time_quotes_all_stocks_df)

{mns-scheduler-1.1.1.1 → mns-scheduler-1.1.1.4}/mns_scheduler/concept/ths/common/ths_concept_sync_common_api.py

@@ -14,6 +14,10 @@ import mns_common.api.msg.push_msg_api as push_msg_api
 import mns_scheduler.company_info.base.sync_company_base_info_api as company_info_sync_api
 import mns_scheduler.company_info.clean.company_info_clean_api as company_info_clean_api
 import mns_scheduler.concept.common.detaill.ths_concept_detail_api as ths_concept_detail_api
+import mns_common.component.concept.ths_concept_common_service_api as ths_concept_common_service_api
+import mns_common.component.company.company_common_service_new_api as company_common_service_new_api
+import mns_common.utils.data_frame_util as data_frame_util
+import mns_common.constant.db_name_constant as db_name_constant
 
 max_concept_code = 886110
 
@@ -70,12 +74,13 @@ def save_ths_concept_detail(new_concept_symbol_df,
 
     new_concept_symbol_df['concept_name'] = new_concept_symbol_df['concept_name'].replace(" ", "")
 
-    query_ths_concept = {'symbol': concept_code}
-    ths_concept_list = mongodb_util.find_query_data('ths_concept_list', query_ths_concept)
-    if ths_concept_list.shape[0] == 0:
+    all_ths_concept_df = ths_concept_common_service_api.get_all_ths_concept()
+    ths_concept_one_df = all_ths_concept_df.loc[all_ths_concept_df['symbol'] == int(concept_code)]
+
+    if data_frame_util.is_empty(ths_concept_one_df):
         concept_create_day = str_day
     else:
-        concept_create_day = list(ths_concept_list['str_day'])[0]
+        concept_create_day = list(ths_concept_one_df['str_day'])[0]
 
     new_concept_symbol_df['str_day'] = str_day
     new_concept_symbol_df['str_now_time'] = str_now_time
@@ -84,24 +89,42 @@ def save_ths_concept_detail(new_concept_symbol_df,
     new_concept_symbol_list = list(new_concept_symbol_df['symbol'])
 
     query_company_info = {'symbol': {'$in': new_concept_symbol_list}}
+    query_company_info_key = str(query_company_info)
     query_field = {"first_industry": 1, "first_industry": 1, "industry": 1,
                    "company_type": 1, "flow_mv_sp": 1,
                    "total_mv_sp": 1}
-    company_info = mongodb_util.find_query_data_choose_field('company_info',
-                                                             query_company_info, query_field)
+    query_field_key = str(query_field)
+    company_info = company_common_service_new_api.get_company_info_by_field(query_company_info_key, query_field_key)
+
+    if 'industry' in new_concept_symbol_df.columns:
+        del new_concept_symbol_df['industry']
+    if 'company_type' in new_concept_symbol_df.columns:
+        del new_concept_symbol_df['company_type']
+    if 'flow_mv_sp' in new_concept_symbol_df.columns:
+        del new_concept_symbol_df['flow_mv_sp']
+    if 'total_mv_sp' in new_concept_symbol_df.columns:
+        del new_concept_symbol_df['total_mv_sp']
 
     company_info = company_info.set_index(['_id'], drop=True)
     new_concept_symbol_df = new_concept_symbol_df.set_index(['symbol'], drop=False)
 
     new_concept_symbol_df = pd.merge(new_concept_symbol_df, company_info, how='outer',
                                      left_index=True, right_index=True)
+
+    if 'index' not in company_info.columns:
+        new_concept_symbol_df['index'] = 0
+
+    if 'change' not in company_info.columns:
+        new_concept_symbol_df['change'] = 0
+
     new_concept_symbol_df['concept_name'] = new_concept_symbol_df['concept_name'].replace(" ", "")
-    query = {'concept_code': concept_code}
 
     if bool(1 - ('way' in new_concept_symbol_df.columns)):
         new_concept_symbol_df['way'] = 'symbol_sync'
     if "long" not in new_concept_symbol_df.columns:
         new_concept_symbol_df['long'] = ''
+    if "short" not in new_concept_symbol_df.columns:
+        new_concept_symbol_df['short'] = new_concept_symbol_df['long']
     new_concept_symbol_df = new_concept_symbol_df[[
         "_id",
         "index",
@@ -122,24 +145,25 @@ def save_ths_concept_detail(new_concept_symbol_df,
         "company_type",
         "concept_create_day",
         "way",
-        "long"
+        "long",
+        'short'
     ]]
-
-    exist_concept_detail = mongodb_util.find_query_data('ths_stock_concept_detail', query)
+    query_detail = {"concept_code": int(concept_code)}
+    exist_concept_detail = mongodb_util.find_query_data(db_name_constant.THS_STOCK_CONCEPT_DETAIL, query_detail)
     if exist_concept_detail is None or exist_concept_detail.shape[0] == 0:
-        mongodb_util.save_mongo(new_concept_symbol_df, 'ths_stock_concept_detail')
+        mongodb_util.save_mongo(new_concept_symbol_df, db_name_constant.THS_STOCK_CONCEPT_DETAIL)
         # 保存到当日新增概念列表
         new_concept_symbol_df['concept_type'] = 'ths'
-        mongodb_util.save_mongo(new_concept_symbol_df, 'today_new_concept_list')
+        mongodb_util.save_mongo(new_concept_symbol_df, db_name_constant.TODAY_NEW_CONCEPT_LIST)
     else:
         exist_concept_detail_symbol_list = list(exist_concept_detail['symbol'])
         new_concept_symbol_df = new_concept_symbol_df.loc[~(
             new_concept_symbol_df['symbol'].isin(exist_concept_detail_symbol_list))]
         if new_concept_symbol_df.shape[0] > 0:
-            mongodb_util.save_mongo(new_concept_symbol_df, 'ths_stock_concept_detail')
+            mongodb_util.save_mongo(new_concept_symbol_df, db_name_constant.THS_STOCK_CONCEPT_DETAIL)
             # 保存到当日新增概念列表
             new_concept_symbol_df['concept_type'] = 'ths'
-            mongodb_util.save_mongo(new_concept_symbol_df, 'today_new_concept_list')
+            mongodb_util.save_mongo(new_concept_symbol_df, db_name_constant.TODAY_NEW_CONCEPT_LIST)
     update_company_info(new_concept_symbol_df)
     # 公司缓存信息清除
     company_common_service_api.company_info_industry_cache_clear()

{mns-scheduler-1.1.1.1 → mns-scheduler-1.1.1.4}/mns_scheduler/concept/ths/update_concept_info/sync_one_concept_all_symbols_api.py

@@ -41,7 +41,7 @@ if __name__ == '__main__':
     now_date = datetime.datetime.now()
     begin_date = now_date.strftime('%Y-%m-%d %H:%M:%S')
     print('同步开始:' + begin_date)
-    update_concept_all_symbol_detail()
+    update_concept_all_detail_info()
     now_date = datetime.datetime.now()
     end_date = now_date.strftime('%Y-%m-%d %H:%M:%S')
     print('同步结束:' + end_date)

{mns-scheduler-1.1.1.1 → mns-scheduler-1.1.1.4}/mns_scheduler/concept/ths/update_concept_info/sync_one_symbol_all_concepts_api.py

@@ -178,4 +178,4 @@ def sync_symbol_all_concept(symbol):
 
 
 if __name__ == '__main__':
-    sync_symbol_all_concept(None)
+    sync_symbol_all_concept('301218')

mns-scheduler-1.1.1.4/mns_scheduler/db/__init__.py

@@ -0,0 +1,10 @@
+import sys
+import os
+
+file_path = os.path.abspath(__file__)
+end = file_path.index('mns') + 17
+project_path = file_path[0:end]
+sys.path.append(project_path)
+import os
+
+os.system("exit")

{mns-scheduler-1.1.1.1 → mns-scheduler-1.1.1.4}/mns_scheduler/db/col_move_service.py

@@ -112,5 +112,4 @@ if __name__ == '__main__':
     # sync_col_move('2024-05-28')
     # sync_col_move('2024-05-30')
     # sync_col_move('2024-05-31')
-    sync_col_move('2024-06-11')
-    sync_col_move('2024-06-12')
+    sync_col_move('2024-06-21')

{mns-scheduler-1.1.1.1 → mns-scheduler-1.1.1.4}/mns_scheduler/db/db_status.py

@@ -21,4 +21,4 @@ def db_status_check():
         ip = ip_util.get_host_ip()
         push_msg_api.push_msg_to_wechat("数据库挂了", "地址:" + ip + "-" + "数据库挂了")
         logger.error("出现异常:{}", e)
-        return
+

mns-scheduler-1.1.1.4/mns_scheduler/db/real_time_task_check.py

@@ -0,0 +1,79 @@
+import os
+import sys
+
+file_path = os.path.abspath(__file__)
+end = file_path.index('mns') + 16
+project_path = file_path[0:end]
+sys.path.append(project_path)
+import mns_common.constant.db_name_constant as db_name_constant
+import mns_common.component.common_service_fun_api as common_service_fun_api
+import mns_common.component.cache.cache_service as cache_service
+import mns_common.utils.cmd_util as cmd_util
+import mns_common.utils.data_frame_util as data_frame_util
+from loguru import logger
+from datetime import datetime
+import mns_common.utils.date_handle_util as date_handle_util
+
+MAX_NUMBER_KEY = 'max_number_key'
+# 实时行情同步任务 python名称
+REAL_TIME_SCHEDULER_NAME = "sync_realtime_quotes_task"
+# 实时行情补偿任务 python名称
+REAL_TIME_TASK_NAME = "realtime_quotes_now_sync"
+
+REAL_TIME_SCHEDULER_NAME_PATH = 'H:\\real_time_task.bat'
+
+
+def get_real_time_max_number():
+    number = common_service_fun_api.realtime_quotes_now_max_number(db_name_constant.REAL_TIME_QUOTES_NOW,
+                                                                   'number')
+
+    return number
+
+
+# 检查数据同步最大值
+def check_max_number():
+    now_max_number = get_real_time_max_number()
+    last_minute_number = cache_service.get_cache(MAX_NUMBER_KEY)
+    if last_minute_number is None:
+        cache_service.set_cache(MAX_NUMBER_KEY, now_max_number)
+        return True
+    elif now_max_number == last_minute_number:
+        return False
+    else:
+        cache_service.set_cache(MAX_NUMBER_KEY, now_max_number)
+        return True
+
+
+#  实时行情数据同步状态check
+def run_check_real_time_data_sync_status():
+    now_date = datetime.now()
+    if date_handle_util.is_close_time(now_date):
+        return False
+    flag = check_max_number()
+    if bool(1 - flag):
+        all_cmd_processes = cmd_util.get_cmd_processes()
+        if data_frame_util.is_empty(all_cmd_processes):
+            return None
+        all_cmd_processes_real_time_task = get_real_time_quotes_task(all_cmd_processes)
+        if data_frame_util.is_empty(all_cmd_processes_real_time_task):
+            return None
+        for match_task_one in all_cmd_processes_real_time_task.itertuples():
+            try:
+                processes_pid = match_task_one.process_pid
+                # 关闭当前进程
+                cmd_util.kill_process_by_pid(processes_pid)
+            except BaseException as e:
+                logger.error("关闭实时行情任务异常:{}", e)
+        # 重开任务进程
+        cmd_util.open_bat_file(REAL_TIME_SCHEDULER_NAME_PATH)
+
+
+def get_real_time_quotes_task(all_cmd_processes):
+    return all_cmd_processes[
+        (all_cmd_processes['total_info'].str.contains(REAL_TIME_SCHEDULER_NAME, case=False, na=False))
+        | (all_cmd_processes['total_info'].str.contains(REAL_TIME_TASK_NAME, case=False, na=False))]
+
+
+if __name__ == '__main__':
+    while True:
+        run_check_real_time_data_sync_status()

{mns-scheduler-1.1.1.1 → mns-scheduler-1.1.1.4}/mns_scheduler/k_line/sync/daily_week_month_line_sync.py

@@ -106,6 +106,7 @@ def create_db_index(db_name):
 
 if __name__ == '__main__':
     sync_all_daily_data('daily', 'qfq', 'stock_qfq_daily', None, None)
+    sync_all_daily_data('daily', 'qfq', 'stock_qfq_weekly', None, None)
     # sync_all_daily_data('weekly', 'qfq', 'stock_qfq_weekly', None, None)
     # sync_all_daily_data('monthly', 'qfq', 'stock_qfq_monthly', None, None)
 

{mns-scheduler-1.1.1.1 → mns-scheduler-1.1.1.4}/mns_scheduler/open/sync_one_day_open_data_to_db_service.py

@@ -11,7 +11,7 @@ from loguru import logger
 from datetime import time
 from mns_common.db.MongodbUtil import MongodbUtil
 import mns_common.component.common_service_fun_api as common_service_fun_api
-import mns_common.component.company.company_common_service_api as company_common_service_api
+import mns_common.component.company.company_common_service_new_api as company_common_service_new_api
 import mns_common.component.data.data_init_api as data_init_api
 import pandas as pd
 import mns_common.utils.db_util as db_util
@@ -51,12 +51,13 @@ def sync_one_day_open_data(str_day):
 
 
 def handle_init_real_time_quotes_data(real_time_quotes_now, str_now_date, number):
+    #  fix industry
+    real_time_quotes_now = company_common_service_new_api.amend_ths_industry(real_time_quotes_now.copy())
     #  exclude b symbol
     real_time_quotes_now = common_service_fun_api.exclude_b_symbol(real_time_quotes_now.copy())
     #  classification symbol
     real_time_quotes_now = common_service_fun_api.classify_symbol(real_time_quotes_now.copy())
-    #  fix industry
-    real_time_quotes_now = fix_industry_data(real_time_quotes_now.copy())
+
     #  calculate parameter
     real_time_quotes_now = data_init_api.calculate_parameter_factor(real_time_quotes_now.copy())
 
@@ -66,21 +67,5 @@ def handle_init_real_time_quotes_data(real_time_quotes_now, str_now_date, number
     return real_time_quotes_now
 
 
-# fix 错杀数据 有成交量的数据
-def fix_industry_data(real_time_quotes_now):
-    #  fix industry
-    real_time_quotes_now_r = company_common_service_api.amendment_industry(real_time_quotes_now.copy())
-
-    symbol_list = list(real_time_quotes_now_r['symbol'])
-
-    na_real_now = real_time_quotes_now.loc[
-        ~(real_time_quotes_now['symbol'].isin(symbol_list))]
-
-    na_real_now = na_real_now.loc[na_real_now['amount'] != 0]
-
-    real_time_quotes_now_result = pd.concat([real_time_quotes_now_r, na_real_now], axis=0)
-    return real_time_quotes_now_result
-
-
 if __name__ == '__main__':
-    sync_one_day_open_data('2024-06-04')
+    sync_one_day_open_data('2024-06-21')

{mns-scheduler-1.1.1.1 → mns-scheduler-1.1.1.4}/mns_scheduler/real_time/realtime_quotes_now_create_db_index.py

@@ -7,8 +7,10 @@ project_path = file_path[0:end]
 sys.path.append(project_path)
 from loguru import logger
 from mns_common.db.MongodbUtil import MongodbUtil
+
 mongodb_util = MongodbUtil('27017')
 
+
 def create_db_index(str_day):
     query_trade_day = {'_id': str_day}
     is_trade_day = mongodb_util.exist_data_query('trade_date_list', query_trade_day)
@@ -19,8 +21,8 @@ def create_db_index(str_day):
             mongodb_util.create_index('realtime_quotes_now_' + str_day, [("symbol", 1), ("number", 1)])
             mongodb_util.create_index('realtime_quotes_now_' + str_day, [("str_now_date", 1)])
             logger.info("创建索引成功:{}", str_day)
-        except BaseException:
-            logger.warning("创建索引异常:{}", )
+        except BaseException as e:
+            logger.warning("创建索引异常:{}", e)
 
 
 if __name__ == '__main__':

{mns-scheduler-1.1.1.1 → mns-scheduler-1.1.1.4}/mns_scheduler/trade/auto_ipo_buy_api.py

@@ -6,12 +6,12 @@ end = file_path.index('mns') + 17
 project_path = file_path[0:end]
 sys.path.append(project_path)
 
-import mns_common.component.trade.trade_service_api as trade_service_api
+import mns_common.component.deal.deal_service_api as deal_service_api
 
 
 ## 自动一键打新
 def auto_ipo_buy():
-    trade_service_api.auto_ipo_buy()
+    deal_service_api.auto_ipo_buy('easy_trader')
 
 
 if __name__ == '__main__':

{mns-scheduler-1.1.1.1 → mns-scheduler-1.1.1.4}/mns_scheduler/trade/auto_sell_service_api.py

@@ -11,11 +11,13 @@ import mns_common.constant.db_name_constant as db_name_constant
 import datetime
 import mns_common.component.cache.cache_service as cache_service
 from mns_common.db.MongodbUtil import MongodbUtil
-import mns_common.component.trade.trade_service_api as trade_service_api
+import mns_common.component.deal.deal_service_api as deal_service_api
 from loguru import logger
 from mns_common.utils.async_fun import async_fun
+import mns_common.component.price.trade_price_service_api as trade_price_service_api
 
 mongodb_util = MongodbUtil('27017')
+from mns_common.constant.price_enum import PriceEnum
 
 AUTO_SELL_KEY = "AUTO_SELL_KEY"
 
@@ -51,11 +53,11 @@ def sell_stock_detail(realtime_quotes_now_position, position_stock_df, str_day,
         try:
 
             symbol = stock_one.symbol
-            sell_price = trade_service_api.get_last_sell_price(symbol)
+            sell_price = trade_price_service_api.get_trade_price(symbol, PriceEnum.SEll_PRICE_LIMIT.price_code)
             position_stock_df_one = position_stock_df.loc[position_stock_df['symbol'] == symbol]
             available_position = list(position_stock_df_one['available_position'])[0]
             if sell_signal(stock_one, now_date, position_stock_df_one):
-                sell_result = trade_service_api.order_sell(symbol, sell_price, available_position)
+                sell_result = deal_service_api.trade_sell(symbol, sell_price, available_position)
                 if "message" in sell_result:
                     result_msg = sell_result['message']
                     if result_msg == 'success':
@@ -110,7 +112,7 @@ def update_position_status(symbol, sell_entrust_no, str_day):
 import mns_common.api.em.east_money_stock_api as east_money_stock_api
 
 if __name__ == '__main__':
-    sell_price_01 = trade_service_api.get_last_sell_price('002336')
+    sell_price_01 = trade_price_service_api.get_trade_price('002336',PriceEnum.SEll_PRICE_LIMIT.price_code)
     while True:
         real_time_quotes_now = east_money_stock_api.get_real_time_quotes_all_stocks()
         auto_sell_stock(real_time_quotes_now)

{mns-scheduler-1.1.1.1 → mns-scheduler-1.1.1.4}/mns_scheduler/trade/sync_position_api.py

@@ -5,7 +5,7 @@ file_path = os.path.abspath(__file__)
 end = file_path.index('mns') + 16
 project_path = file_path[0:end]
 sys.path.append(project_path)
-import mns_common.component.trade.trade_service_api as trade_service_api
+import mns_common.component.deal.deal_service_api as deal_service_api
 import pandas as pd
 import mns_common.utils.data_frame_util as data_frame_util
 import mns_common.constant.db_name_constant as db_name_constant
@@ -23,7 +23,7 @@ def sync_position():
     query_exist = {'str_day': str_day}
     if mongodb_util.exist_data_query(db_name_constant.POSITION_STOCK, query_exist):
         return None
-    position_list = trade_service_api.get_position()
+    position_list = deal_service_api.get_position('easy_trader')
     position_df = pd.DataFrame(position_list)
     position_df = position_df.rename(columns={"明细": "detail",
                                               "序号": "index",

{mns-scheduler-1.1.1.1 → mns-scheduler-1.1.1.4}/mns_scheduler/zt/high_chg/sync_high_chg_pool_service.py

@@ -294,4 +294,3 @@ def get_symbol_last_concept(symbol, str_day):
     return mongodb_util.descend_query(query, db_name_constant.THS_STOCK_CONCEPT_DETAIL, 'str_day', 1)
 
 
-

{mns-scheduler-1.1.1.1 → mns-scheduler-1.1.1.4}/mns_scheduler/zt/high_chg/sync_high_chg_real_time_quotes_service.py

@@ -9,7 +9,7 @@ sys.path.append(project_path)
 from loguru import logger
 import mns_common.component.common_service_fun_api as common_service_fun_api
 import mns_common.utils.date_handle_util as date_handle_util
-import mns_common.component.company.company_common_service_api as company_common_service_api
+import mns_common.component.company.company_common_service_new_api as company_common_service_new_api
 import mns_common.component.data.data_init_api as data_init_api
 from mns_common.db.MongodbUtil import MongodbUtil
 import mns_common.utils.db_util as db_util
@@ -73,7 +73,7 @@ choose_field = ["_id",
 def sync_high_chg_real_time_quotes(str_day):
     mongo = db_util.get_db(str_day)
 
-    realtime_quotes_db_name = 'realtime_quotes_now_' + str_day
+    realtime_quotes_db_name = db_name_constant.REAL_TIME_QUOTES_NOW + "_"  + str_day
     high_chg_list = get_high_chg_symbol(str_day)
     if high_chg_list is None or len(high_chg_list) == 0:
         return
@@ -84,9 +84,8 @@ def sync_high_chg_real_time_quotes(str_day):
             real_time_quotes_now_high_chg_all = mongo.find_query_data(realtime_quotes_db_name, query_all)
             if real_time_quotes_now_high_chg_all.shape[0] == 0:
                 return
-            real_time_quotes_now_high_chg_all = company_common_service_api.amendment_industry_exist_na(
-                real_time_quotes_now_high_chg_all,
-                high_chg_list)
+            real_time_quotes_now_high_chg_all = company_common_service_new_api.amend_ths_industry(
+                real_time_quotes_now_high_chg_all)
             real_time_quotes_now_high_chg_all.dropna(subset=['symbol'], axis=0,
                                                      inplace=True)
             real_time_quotes_now_high_chg_all = data_init_api.calculate_parameter_factor(
@@ -139,3 +138,7 @@ def save_realtime_quotes_now_zt_data(realtime_quotes_now_zt, str_day, symbol):
     result = mongodb_util.remove_data(remove_query, db_name_constant.ZT_STOCK_REAL_TIME_QUOTES).acknowledged
     if result:
         mongodb_util.insert_mongo(realtime_quotes_now_zt, db_name_constant.ZT_STOCK_REAL_TIME_QUOTES)
+
+
+if __name__ == '__main__':
+    sync_high_chg_real_time_quotes('2024-06-21')

{mns-scheduler-1.1.1.1 → mns-scheduler-1.1.1.4}/mns_scheduler/zt/open_data/kcx_high_chg_open_data_sync.py

@@ -10,7 +10,7 @@ import mns_common.utils.date_handle_util as date_handle_util
 from loguru import logger
 
 import mns_common.component.trade_date.trade_date_common_service_api as trade_date_common_service_api
-import mns_common.component.company.company_common_service_api as company_common_service_api
+import mns_common.component.company.company_common_service_new_api as company_common_service_new_api
 import mns_common.component.common_service_fun_api as common_service_fun_api
 import mns_common.component.data.data_init_api as data_init_api
 import pandas as pd
@@ -62,21 +62,6 @@ realtime_quotes_now_zt_new_kc_open_field = ['_id',
                                             'real_disk_diff_amount_exchange', 'no_open_data']
 
 
-# fix 错杀数据 有成交量的数据
-def fix_industry_data(real_time_quotes_now):
-    #  fix industry
-    real_time_quotes_now_r = company_common_service_api.amendment_industry(real_time_quotes_now.copy())
-
-    symbol_list = list(real_time_quotes_now_r['symbol'])
-
-    na_real_now = real_time_quotes_now.loc[
-        ~(real_time_quotes_now['symbol'].isin(symbol_list))]
-
-    na_real_now = na_real_now.loc[na_real_now['amount'] != 0]
-
-    real_time_quotes_now_result = pd.concat([real_time_quotes_now_r, na_real_now], axis=0)
-    return real_time_quotes_now_result
-
 
 def sync_all_kc_zt_data(str_day, symbols):
     if symbols is None:
@@ -92,11 +77,9 @@ def sync_all_kc_zt_data(str_day, symbols):
         logger.error("无k线数据:{}", symbols)
         return
 
-    company_info = company_common_service_api.get_company_info_industry_list_date()
-    company_info['symbol'] = company_info['_id']
-    company_info = company_info.loc[company_info['_id'].isin(list(kc_stock_qfq_daily['symbol']))]
+    kc_stock_qfq_daily = company_common_service_new_api.amend_ths_industry(kc_stock_qfq_daily)
 
-    for stock_one in company_info.itertuples():
+    for stock_one in kc_stock_qfq_daily.itertuples():
         try:
 
             kc_stock_qfq_daily.loc[
@@ -150,7 +133,9 @@ def sync_all_kc_zt_data(str_day, symbols):
             query_real_time = {'symbol': kc_one.symbol}
             db = db_util.get_db(str_day)
             realtime_quotes_now_kc = db.find_query_data(db_name, query_real_time)
-            realtime_quotes_now_kc = common_service_fun_api.exclude_new_stock(realtime_quotes_now_kc)
+            stock_name = kc_one.name
+            if stock_name.startswith('N'):
+                continue
             if realtime_quotes_now_kc.shape[0] == 0:
                 logger.error("当期日期代码无开盘数据:{},{}", str_day, kc_one.symbol)
                 continue
@@ -182,7 +167,8 @@ def one_symbol_day_open_data(realtime_quotes_now_kc, kc_one, str_day):
     realtime_quotes_now_zt_new_kc_open_copy.loc[:, 'yesterday_high_chg'] = kc_one.yesterday_high_chg
     realtime_quotes_now_zt_new_kc_open_copy.loc[:, 'today_chg'] = kc_one.chg
     realtime_quotes_now_zt_new_kc_open_copy.loc[:, 'str_day'] = str_day
-
+    realtime_quotes_now_zt_new_kc_open_copy = company_common_service_new_api.amend_ths_industry(
+        realtime_quotes_now_zt_new_kc_open_copy)
     realtime_quotes_now_zt_new_kc_open_copy = handle_init_real_time_quotes_data(
         realtime_quotes_now_zt_new_kc_open_copy.copy(),
         str_now_date,
@@ -219,8 +205,6 @@ def handle_init_real_time_quotes_data(real_time_quotes_now, str_now_date, number
     real_time_quotes_now = common_service_fun_api.exclude_b_symbol(real_time_quotes_now.copy())
     #  classification symbol
     real_time_quotes_now = common_service_fun_api.classify_symbol(real_time_quotes_now.copy())
-    #  fix industry
-    real_time_quotes_now = fix_industry_data(real_time_quotes_now.copy())
     #  calculate parameter
     real_time_quotes_now = data_init_api.calculate_parameter_factor(real_time_quotes_now.copy())
 

{mns-scheduler-1.1.1.1 → mns-scheduler-1.1.1.4}/mns_scheduler/zt/script/kcx_high_chg_open_his_data_handle.py

@@ -84,7 +84,7 @@ def fix_miss_data(str_end):
 
 
 if __name__ == '__main__':
-    kcx_high_chg_open_data_sync.sync_all_kc_zt_data('2024-06-19', None)
+    kcx_high_chg_open_data_sync.sync_all_kc_zt_data('2024-06-21', None)
     # sync_all_kc_zt_data('2023-08-16')
     # sync_all_kc_zt_data('2023-07-07')
     # realtime_quotes_now_zt_new_kc_open_sync()

{mns-scheduler-1.1.1.1 → mns-scheduler-1.1.1.4}/mns_scheduler/zt/zt_pool/em_zt_pool_sync_api.py

@@ -132,7 +132,7 @@ def save_zt_info(str_day):
 
 
 if __name__ == '__main__':
-    save_zt_info('2024-06-07')
+    save_zt_info('2024-06-21')
 # from datetime import datetime
 #
 # if __name__ == '__main__':

{mns-scheduler-1.1.1.1 → mns-scheduler-1.1.1.4}/mns_scheduler/zt/zt_pool/ths_zt_pool_sync_api.py

@@ -172,7 +172,7 @@ def get_bfq_daily_line(ths_zt_pool_df, str_day):
     return bfq_k_line_df
 
 
-def save_ths_zt_pool(ths_zt_pool_df):
+def save_ths_zt_pool(ths_zt_pool_df, str_day):
     ths_zt_pool_df = ths_zt_pool_df[[
         "symbol",
         "name",
@@ -213,19 +213,33 @@ def save_ths_zt_pool(ths_zt_pool_df):
     ]]
     ths_zt_pool_df['_id'] = ths_zt_pool_df['symbol'] + '_' + ths_zt_pool_df['str_day']
     ths_zt_pool_df = ths_zt_pool_df.sort_values(by=['connected_boards_numbers'], ascending=False)
+
+    # 将日期数值转换为日期时间格式
+    ths_zt_pool_df['list_date_01'] = pd.to_datetime(ths_zt_pool_df['list_date'], format='%Y%m%d')
+    str_day_date = date_handle_util.str_to_date(str_day, '%Y-%m-%d')
+    # 计算日期差值 距离现在上市时间
+    ths_zt_pool_df['diff_days'] = ths_zt_pool_df.apply(
+        lambda row: (str_day_date - row['list_date_01']).days, axis=1)
+    del ths_zt_pool_df['list_date_01']
+
     mongodb_util.save_mongo(ths_zt_pool_df, db_name_constant.THS_ZT_POOL)
 
 
 if __name__ == '__main__':
-    while True:
-        query = {'_id': {"$lte": '2019-10-29'}}
-        trade_date_list = mongodb_util.find_query_data('trade_date_list', query)
-        trade_date_list = trade_date_list.sort_values(by=['trade_date'], ascending=False)
-        for trade_one in trade_date_list.itertuples():
-            try:
-                trade_date = trade_one.trade_date
-                zt_df = ths_zt_pool(trade_date, None)
-                save_ths_zt_pool(zt_df)
-                logger.info("同步到日期:{}", trade_date)
-            except BaseException as e:
-                logger.warning("同步涨停到日期:{},{}", trade_one.trade_date, e)
+    trade_date = '2024-06-21'
+    zt_df = ths_zt_pool(trade_date, None)
+    save_ths_zt_pool(zt_df, trade_date)
+    # while True:
+    #     query = {"$and": [{'_id': {"$gte": '2013-07-04'}}, {'_id': {"$lte": '2019-07-04'}}]}
+    #
+    #     trade_date_list = mongodb_util.find_query_data('trade_date_list', query)
+    #     trade_date_list = trade_date_list.sort_values(by=['trade_date'], ascending=False)
+    #     for trade_one in trade_date_list.itertuples():
+    #         try:
+    #             trade_date = trade_one.trade_date
+    #             zt_df = ths_zt_pool(trade_date, None)
+    #             # zt_df = mongodb_util.find_query_data(db_name_constant.THS_ZT_POOL, query={"str_day": trade_date})
+    #             save_ths_zt_pool(zt_df, trade_date)
+    #             logger.info("同步到日期:{}", trade_date)
+    #         except BaseException as e:
+    #             logger.warning("同步涨停到日期:{},{}", trade_one.trade_date, e)

{mns-scheduler-1.1.1.1 → mns-scheduler-1.1.1.4}/mns_scheduler/zz_task/data_sync_task.py

@@ -48,6 +48,7 @@ import mns_scheduler.risk.transactions.transactions_check_api as transactions_ch
 import mns_scheduler.concept.ths.sync_new_index.sync_ths_concept_new_index_api as sync_ths_concept_new_index_api
 import mns_scheduler.company_info.clean.company_info_clean_api as company_info_clean_api
 import mns_scheduler.zt.zt_pool.ths_zt_pool_sync_api as ths_zt_pool_sync_api
+import mns_scheduler.db.real_time_task_check as real_time_task_check_api
 
 
 # 同步交易日期任务完成
@@ -152,7 +153,8 @@ def sync_stock_zt_pool():
         em_stock_zt_pool = em_zt_pool_sync_api.save_zt_info(str_day)
         zt_five_boards_sync_api.update_five_connected_boards_task(em_stock_zt_pool)
         logger.info('同步ths股票涨停池')
-        ths_zt_pool_sync_api.ths_zt_pool(str_day, None)
+        ths_zt_pool_df = ths_zt_pool_sync_api.ths_zt_pool(str_day, None)
+        ths_zt_pool_sync_api.save_ths_zt_pool(ths_zt_pool_df, str_day)
         logger.info('同步当天涨停池股票完成')
 
 
@@ -341,6 +343,11 @@ def sync_all_interactive_questions():
         stock_irm_cninfo_service.sync_all_interactive_questions(None)
 
 
+# 数据同步状态check
+def real_time_task_check_status():
+    real_time_task_check_api.run_check_real_time_data_sync_status()
+
+
 # # 定义BlockingScheduler
 blockingScheduler = BlockingScheduler()
 # sync_trade_date 同步交易日期
@@ -419,6 +426,9 @@ blockingScheduler.add_job(sync_high_risk_stocks, 'cron', hour='0,09,12,16', minu
 # 同步互动回答
 blockingScheduler.add_job(sync_all_interactive_questions, 'cron', hour='08,12,17', minute='05')
 
+# 实时数据状态同步check
+blockingScheduler.add_job(real_time_task_check_status, 'interval', seconds=59, max_instances=4)
+
 print('定时任务启动成功')
 blockingScheduler.start()
 #

{mns-scheduler-1.1.1.1 → mns-scheduler-1.1.1.4}/mns_scheduler.egg-info/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: mns-scheduler
-Version: 1.1.1.1
+Version: 1.1.1.4

{mns-scheduler-1.1.1.1 → mns-scheduler-1.1.1.4}/mns_scheduler.egg-info/SOURCES.txt

@@ -43,6 +43,7 @@ mns_scheduler/concept/ths/update_concept_info/sync_one_symbol_all_concepts_api.p
 mns_scheduler/db/__init__.py
 mns_scheduler/db/col_move_service.py
 mns_scheduler/db/db_status.py
+mns_scheduler/db/real_time_task_check.py
 mns_scheduler/dt/__init__.py
 mns_scheduler/dt/stock_dt_pool_sync.py
 mns_scheduler/finance/__init__.py

{mns-scheduler-1.1.1.1 → mns-scheduler-1.1.1.4}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='mns-scheduler',
-    version='1.1.1.1',
+    version='1.1.1.4',
     packages=find_packages(),
     install_requires=[],  # 如果有依赖项，可以在这里列出
 )

mns-scheduler-1.1.1.1/mns_scheduler/zz_task/__init__.py

@@ -1,7 +0,0 @@
-import sys
-import os
-
-file_path = os.path.abspath(__file__)
-end = file_path.index('mns') + 17
-project_path = file_path[0:end]
-sys.path.append(project_path)