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

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

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

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

@@ -15,17 +15,18 @@ 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
+import time
 
 mongodb_util = MongodbUtil('27017')
 
 MAX_NUMBER_KEY = 'max_number_key'
-# 实时行情同步任务 python名称
+# 定时任务 python名称
 REAL_TIME_SCHEDULER_NAME = "sync_realtime_quotes_task"
-# 实时行情补偿任务 python名称
+# 实时同步 python名称
 REAL_TIME_TASK_NAME = "realtime_quotes_now_sync"
-#
+# 实时同步 bat
 REAL_TIME_TASK_NAME_PATH = 'H:\\real_time_task.bat'
-# 定时任务
+# 定时任务 bat
 REAL_TIME_SCHEDULER_NAME_PATH = 'H:\\real_time_scheduler.bat'
 
 
@@ -52,13 +53,15 @@ def check_max_number():
 #  实时行情数据同步状态check
 def run_check_real_time_data_sync_status():
     now_date = datetime.now()
-    hour = datetime.hour
-    minute = datetime.minute
+    hour = now_date.hour
+    minute = now_date.minute
+    second = now_date.second
     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):
@@ -74,22 +77,19 @@ def run_check_real_time_data_sync_status():
             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)
+            cmd_util.open_bat_file(REAL_TIME_SCHEDULER_NAME_PATH)
+            # 防止太快重开多个
+            time.sleep(3)
+
+    # 普通轮训
 
     if bool(1 - date_handle_util.is_trade_time(now_date)):
         return False

{mns_scheduler-1.2.4.8 → mns_scheduler-1.2.5.1}/mns_scheduler/db/script/sync/remote_data_sync_to_local.py

@@ -15,6 +15,7 @@ remote_mongodb_util = RemoteMongodbUtil('27017')
 local_mongodb_util = LocalMongodbUtil('27017')
 
 col_list = [
+    'company_info',
     'company_remark_info',
     'company_holding_info',
     'industry_concept_remark',

mns_scheduler-1.2.5.1/mns_scheduler/db/script/update/update_col_field.py

@@ -0,0 +1,36 @@
+import sys
+import os
+
+file_path = os.path.abspath(__file__)
+end = file_path.index('mns') + 16
+project_path = file_path[0:end]
+sys.path.append(project_path)
+from mns_common.db.MongodbUtil import MongodbUtil
+from loguru import logger
+
+mongodb_util_27017 = MongodbUtil('27017')
+mongodb_util_27019 = MongodbUtil('27019')
+
+
+def update_col_data():
+    query = {"$and": [{'trade_date': {'$lte': '2024-05-23'}},
+                      {'trade_date': {'$gte': '2022-07-02'}}]}
+    trade_date_list_df = mongodb_util_27017.find_query_data('trade_date_list', query)
+    trade_date_list_df = trade_date_list_df.sort_values(by=['trade_date'], ascending=True)
+    for trade_one in trade_date_list_df.itertuples():
+        col_name = 'realtime_quotes_now_' + trade_one.trade_date
+        new_values = {'$unset': {
+            'classification': '',
+            'medium_order_net_inflow': '',
+            'small_order_net_inflow': '',
+            'str_day': '',
+            'list_date': '',
+            'amount_level': '',
+            'name': '', 'industry': '', 'concept': ''}}
+
+        mongodb_util_27019.update_many({}, new_values, col_name)
+        logger.info("完成集合数据更新:{}", col_name)
+
+
+if __name__ == '__main__':
+    update_col_data()

{mns_scheduler-1.2.4.8 → mns_scheduler-1.2.5.1}/mns_scheduler/k_line/clean/daily/daily_k_line_clean_common_service.py

@@ -200,23 +200,23 @@ def calculate_exchange_and_k_line_avg_param(stock_qfq_daily):
 
     # 收盘价格与均线差值
     stock_qfq_daily['close_difference_five'] = round(
-        100 * (stock_qfq_daily['close'] - stock_qfq_daily['avg_five']) / stock_qfq_daily['close'],
+        100 * (stock_qfq_daily['close'] - stock_qfq_daily['avg_five']) / stock_qfq_daily['avg_five'],
         2)
 
     stock_qfq_daily['close_difference_ten'] = round(
-        100 * (stock_qfq_daily['close'] - stock_qfq_daily['avg_ten']) / stock_qfq_daily['close'],
+        100 * (stock_qfq_daily['close'] - stock_qfq_daily['avg_ten']) / stock_qfq_daily['avg_ten'],
         2)
 
     stock_qfq_daily['close_difference_twenty'] = round(
-        100 * (stock_qfq_daily['close'] - stock_qfq_daily['avg_twenty']) / stock_qfq_daily['close'],
+        100 * (stock_qfq_daily['close'] - stock_qfq_daily['avg_twenty']) / stock_qfq_daily['avg_twenty'],
         2)
 
     stock_qfq_daily['close_difference_thirty'] = round(
-        100 * (stock_qfq_daily['close'] - stock_qfq_daily['avg_thirty']) / stock_qfq_daily['close'],
+        100 * (stock_qfq_daily['close'] - stock_qfq_daily['avg_thirty']) / stock_qfq_daily['avg_thirty'],
         2)
 
     stock_qfq_daily['close_difference_sixty'] = round(
-        100 * (stock_qfq_daily['close'] - stock_qfq_daily['avg_sixty']) / stock_qfq_daily['close'],
+        100 * (stock_qfq_daily['close'] - stock_qfq_daily['avg_sixty']) / stock_qfq_daily['avg_sixty'],
         2)
 
     stock_qfq_daily = stock_qfq_daily[[

{mns_scheduler-1.2.4.8 → mns_scheduler-1.2.5.1}/mns_scheduler/k_line/test/k_line_info_clean_his_data.py

@@ -26,5 +26,5 @@ def clean_history_data():
 
 if __name__ == '__main__':
     # 001389  001359
-    k_line_info_clean_task.sync_k_line_info('2024-07-12', ['300784'])
+    k_line_info_clean_task.sync_k_line_info('2025-01-22', ['301099'])
     # clean_history_data()

mns_scheduler-1.2.5.1/mns_scheduler/zt/script/__init__.py

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

mns_scheduler-1.2.5.1/mns_scheduler/zt/script/fix_error_deal_day.py

@@ -0,0 +1,41 @@
+import sys
+import os
+
+file_path = os.path.abspath(__file__)
+end = file_path.index('mns') + 16
+project_path = file_path[0:end]
+sys.path.append(project_path)
+from mns_common.db.MongodbUtil import MongodbUtil
+from loguru import logger
+import mns_common.utils.date_handle_util as date_handle_util
+mongodb_util = MongodbUtil('27017')
+
+from mns_scheduler.db.script.sync.remote_mongo_util import RemoteMongodbUtil
+
+
+remote_mongodb_util = RemoteMongodbUtil('27017')
+
+
+def fix_error_deal_days(db_name):
+    realtime_quotes_now_zt_new_kc_open_df = mongodb_util.find_query_data(db_name, {})
+    realtime_quotes_now_zt_new_kc_open_df['id_key'] = realtime_quotes_now_zt_new_kc_open_df['_id']
+    for stock_one in realtime_quotes_now_zt_new_kc_open_df.itertuples():
+        try:
+            symbol = stock_one.symbol
+            str_day = stock_one.str_day
+            query = {'symbol': symbol, 'date': {"$lt": date_handle_util.no_slash_date(str_day)}}
+            deal_days = mongodb_util.count(query, 'stock_qfq_daily')
+            new_values = {"$set": {"deal_days": deal_days}}
+            id_key = stock_one.id_key
+            update_query = {'_id': id_key}
+            mongodb_util.update_many(update_query, new_values, db_name)
+            logger.info("更新到:{},{}", symbol, str_day)
+        except BaseException as e:
+            logger.error("出现异常:{},{},{}", symbol, str_day, e)
+
+
+if __name__ == '__main__':
+    # db_name_0 = 'realtime_quotes_now_zt_new_kc_open'
+    db_name_01 = 'stock_high_chg_pool'
+    # fix_error_deal_days(db_name_0)
+    fix_error_deal_days(db_name_01)

{mns_scheduler-1.2.4.8 → mns_scheduler-1.2.5.1}/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-26', None)
+    sync_high_chg_pool_service.sync_stock_high_chg_pool_list('2025-01-09', None)

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

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

{mns_scheduler-1.2.4.8 → mns_scheduler-1.2.5.1}/mns_scheduler.egg-info/SOURCES.txt

@@ -49,6 +49,8 @@ mns_scheduler/db/script/sync/local_mongo_util.py
 mns_scheduler/db/script/sync/remote_data_sync_to_local.py
 mns_scheduler/db/script/sync/remote_mongo_util.py
 mns_scheduler/db/script/sync/sync_hui_ce_test_data.py
+mns_scheduler/db/script/update/__init__.py
+mns_scheduler/db/script/update/update_col_field.py
 mns_scheduler/debt/__init__.py
 mns_scheduler/debt/kzz_bond_info_sync.py
 mns_scheduler/dt/__init__.py
@@ -144,6 +146,7 @@ mns_scheduler/zt/high_chg/sync_high_chg_real_time_quotes_service.py
 mns_scheduler/zt/open_data/__init__.py
 mns_scheduler/zt/open_data/kcx_high_chg_open_data_sync.py
 mns_scheduler/zt/script/__init__.py
+mns_scheduler/zt/script/fix_error_deal_day.py
 mns_scheduler/zt/script/kcx_high_chg_open_his_data_handle.py
 mns_scheduler/zt/script/sync_high_chg_pool_his_data.py
 mns_scheduler/zt/script/sync_now_higt_chg_zt.py

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

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