mns-scheduler 1.2.4.6__tar.gz → 1.2.4.8__tar.gz

{mns_scheduler-1.2.4.6 → mns_scheduler-1.2.4.8}/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: mns-scheduler
-Version: 1.2.4.6
+Version: 1.2.4.8

{mns_scheduler-1.2.4.6 → mns_scheduler-1.2.4.8}/mns_scheduler/concept/ths/common/ths_concept_sync_common_api.py

@@ -126,8 +126,6 @@ def save_ths_concept_detail(new_concept_symbol_df,
     ]]
     query_detail = {"concept_code": int(concept_code)}
     exist_concept_detail = mongodb_util.find_query_data(db_name_constant.THS_STOCK_CONCEPT_DETAIL, query_detail)
-    # 更新入选理由
-    update_long_short(new_concept_symbol_df, exist_concept_detail)
 
     if exist_concept_detail is None or exist_concept_detail.shape[0] == 0:
         new_concept_symbol_df['grade'] = 1
@@ -191,7 +189,6 @@ def update_long_short(new_concept_symbol_df, exist_concept_detail):
 #     exist_concept_detail = exist_concept_detail.loc[exist_concept_detail]
 
 
-
 def update_company_info(new_concept_symbol_df):
     if new_concept_symbol_df.shape[0] > 0:
         symbol_list = list(new_concept_symbol_df['symbol'])

{mns_scheduler-1.2.4.6 → mns_scheduler-1.2.4.8}/mns_scheduler/concept/ths/update_concept_info/sync_one_symbol_all_concepts_api.py

@@ -183,4 +183,4 @@ def sync_symbol_all_concept(symbol):
 
 
 if __name__ == '__main__':
-    sync_symbol_all_concept('839493')
+    sync_symbol_all_concept('831175')

{mns_scheduler-1.2.4.6 → mns_scheduler-1.2.4.8}/mns_scheduler/db/real_time_task_check.py

@@ -14,6 +14,7 @@ from loguru import logger
 from datetime import datetime
 import mns_common.utils.date_handle_util as date_handle_util
 from mns_common.db.MongodbUtil import MongodbUtil
+import mns_common.component.trade_date.trade_date_common_service_api as trade_date_common_service_api
 
 mongodb_util = MongodbUtil('27017')
 
@@ -22,8 +23,10 @@ MAX_NUMBER_KEY = 'max_number_key'
 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'
+#
+REAL_TIME_TASK_NAME_PATH = 'H:\\real_time_task.bat'
+# 定时任务
+REAL_TIME_SCHEDULER_NAME_PATH = 'H:\\real_time_scheduler.bat'
 
 
 def get_real_time_max_number():
@@ -49,13 +52,52 @@ def check_max_number():
 #  实时行情数据同步状态check
 def run_check_real_time_data_sync_status():
     now_date = datetime.now()
+    hour = datetime.hour
+    minute = datetime.minute
+    str_day = now_date.strftime('%Y-%m-%d')
+
+    if bool(1 - trade_date_common_service_api.is_trade_day(str_day)):
+        return False
+
+    if hour == 11 and minute == 31:
+        all_cmd_processes = cmd_util.get_all_process()
+        if data_frame_util.is_empty(all_cmd_processes):
+            return False
+        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 False
+        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)
+
+    if hour == 12 and minute == 59:
+        all_cmd_processes = cmd_util.get_all_process()
+        if data_frame_util.is_empty(all_cmd_processes):
+            return False
+        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 False
+        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)
+
     if bool(1 - date_handle_util.is_trade_time(now_date)):
         return False
     flag = check_max_number()
     if bool(1 - flag):
         all_cmd_processes = cmd_util.get_all_process()
         if data_frame_util.is_empty(all_cmd_processes):
-            return None
+            return False
         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
@@ -70,7 +112,7 @@ def run_check_real_time_data_sync_status():
             except BaseException as e:
                 logger.error("关闭实时行情任务异常:{}", e)
         # 重开任务进程
-        cmd_util.open_bat_file(REAL_TIME_SCHEDULER_NAME_PATH)
+        cmd_util.open_bat_file(REAL_TIME_TASK_NAME_PATH)
 
 
 def get_real_time_quotes_task(all_cmd_processes):

{mns_scheduler-1.2.4.6 → mns_scheduler-1.2.4.8}/mns_scheduler/db/script/sync/sync_hui_ce_test_data.py

@@ -37,12 +37,12 @@ def sync_k_line(str_day):
 
 
 if __name__ == '__main__':
-    # str_day_01 = '2024-11-14'
+    str_day_01 = '2024-12-13'
     # sync_k_line(str_day_01)
     # sync_k_line('2024-11-13')
     # sync_k_line('2024-11-12')
-    # sync_k_line('2024-11-15')
-    # sync_real_time_data(str_day_01, 10, 1010)
+    # sync_k_line('2024-11-15') 232
+    sync_real_time_data(str_day_01, 1409, 7010)
     # sync_real_time_data('2024-11-15', 10, 1010)
 
     sync_k_line('2024-12-20')

{mns_scheduler-1.2.4.6 → mns_scheduler-1.2.4.8}/mns_scheduler/open/sync_one_day_open_data_to_db_service.py

@@ -68,4 +68,4 @@ def handle_init_real_time_quotes_data(real_time_quotes_now, str_now_date, number
 
 
 if __name__ == '__main__':
-    sync_one_day_open_data('2024-06-21')
+    sync_one_day_open_data('2024-12-30')

{mns_scheduler-1.2.4.6 → mns_scheduler-1.2.4.8}/mns_scheduler/zt/high_chg/sync_high_chg_real_time_quotes_service.py

@@ -142,4 +142,4 @@ def save_realtime_quotes_now_zt_data(realtime_quotes_now_zt, str_day, symbol):
 
 
 if __name__ == '__main__':
-    sync_high_chg_real_time_quotes('2024-06-24')
+    sync_high_chg_real_time_quotes('2024-12-26')

{mns_scheduler-1.2.4.6 → mns_scheduler-1.2.4.8}/mns_scheduler/zt/script/sync_high_chg_pool_his_data.py

@@ -36,4 +36,4 @@ def sync_his_zt_pool_data(begin_day, end_day):
 
 
 if __name__ == '__main__':
-    sync_high_chg_pool_service.sync_stock_high_chg_pool_list('2024-12-20', None)
+    sync_high_chg_pool_service.sync_stock_high_chg_pool_list('2024-12-26', None)

{mns_scheduler-1.2.4.6 → mns_scheduler-1.2.4.8}/mns_scheduler.egg-info/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: mns-scheduler
-Version: 1.2.4.6
+Version: 1.2.4.8

{mns_scheduler-1.2.4.6 → mns_scheduler-1.2.4.8}/setup.py

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