mns-scheduler 1.1.2.4__py3-none-any.whl → 1.1.2.7__py3-none-any.whl

mns_scheduler/db/__init__.py

@@ -5,6 +5,3 @@ 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/db/col_move_service.py

@@ -112,4 +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-21')
+    sync_col_move('2024-07-02')

mns_scheduler/db/real_time_task_check.py

@@ -53,7 +53,7 @@ def run_check_real_time_data_sync_status():
         return False
     flag = check_max_number()
     if bool(1 - flag):
-        all_cmd_processes = cmd_util.get_cmd_processes()
+        all_cmd_processes = cmd_util.get_all_process()
         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)

mns_scheduler/k_line/clean/daily/daily_k_line_service.py

@@ -18,7 +18,7 @@ NORMAL_DAILY_K_LINE_NUMBER = 60
 
 
 def handle_day_line(k_line_info, str_day, symbol, deal_days):
-    sub_stock_new_max_deal_days = stock_type_classify_param['sub_stock_new_max_deal_days']
+    sub_stock_new_max_deal_days = stock_type_classify_param['sub_new_stock_max_deal_days']
     if deal_days > sub_stock_new_max_deal_days:
         return handle_day_line_normal(k_line_info, str_day, symbol, deal_days)
 

mns_scheduler/k_line/clean/week_month/normal_week_month_k_line_service.py

@@ -14,7 +14,7 @@ mongodb_util = MongodbUtil('27017')
 
 # 处理月线 周线 todo 暂时简单计算周线之和
 def handle_month_week_line(k_line_info, str_day, symbol, deal_days):
-    sub_stock_new_max_deal_days = stock_type_classify_param['sub_stock_new_max_deal_days']
+    sub_stock_new_max_deal_days = stock_type_classify_param['sub_new_stock_max_deal_days']
     if deal_days > sub_stock_new_max_deal_days:
         k_line_info = handle_month_line(k_line_info, str_day, symbol)
         k_line_info = handle_week_line(k_line_info, str_day, symbol)

mns_scheduler/k_line/clean/week_month/sub_new_week_month_k_line_service.py

@@ -33,7 +33,10 @@ def handle_month_line(k_line_info, stock_qfq_daily, deal_days):
         k_line_info['month01'] = month_01
         k_line_info['month02'] = month_02
         k_line_info['month01_date'] = list(stock_qfq_daily_month_01.iloc[0:1]['date'])[0]
-        k_line_info['month02_date'] = list(stock_qfq_daily_month_02.iloc[0:1]['date'])[0]
+        if k_line_length != MAX_TRADE_DAYS_PER_MONTH:
+            k_line_info['month02_date'] = list(stock_qfq_daily_month_02.iloc[0:1]['date'])[0]
+        else:
+            k_line_info['month02_date'] = ''
     elif deal_days > MAX_TRADE_DAYS_PER_MONTH * 2:
         stock_qfq_daily_month_01 = stock_qfq_daily.iloc[0:MAX_TRADE_DAYS_PER_MONTH]
         month_01 = round(sum(stock_qfq_daily_month_01['chg']), 2)

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-03', ['603227'])
+    k_line_info_clean_task.sync_k_line_info('2024-07-12', ['300784'])
     # clean_history_data()

mns_scheduler/trade/auto_login/__init__.py

@@ -0,0 +1,7 @@
+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)

mns_scheduler/trade/auto_login/trader_auto_service.py

@@ -0,0 +1,30 @@
+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)
+import mns_common.component.deal.deal_service_api as deal_service_api
+from mns_common.component.deal.terminal_enum import TerminalEnum
+import time
+
+
+# qmt 自动登录
+def qmt_auto_login():
+    deal_service_api.auto_login(TerminalEnum.QMT.terminal_code)
+
+
+# 同花顺自动登陆
+def ths_auto_login():
+    deal_service_api.auto_login(TerminalEnum.EASY_TRADER.terminal_code)
+
+
+def auto_login():
+    qmt_auto_login()
+    time.sleep(5)
+    ths_auto_login()
+
+
+if __name__ == '__main__':
+    auto_login()

mns_scheduler/trade/task/__init__.py

@@ -0,0 +1,7 @@
+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)

mns_scheduler/trade/task/trader_task_service.py

@@ -0,0 +1,48 @@
+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)
+import mns_common.utils.cmd_util as cmd_util
+import time
+import mns_scheduler.trade.auto_login.trader_auto_service as trader_auto_service
+import mns_common.utils.data_frame_util as data_frame_util
+from loguru import logger
+
+# 交易任务
+TRADER_SERVER_PATH = 'H:\\mns-trader.bat'
+# 实时行情同步任务 python名称
+TRADER_SERVER_NAME = "mns_trader"
+
+
+# 打开交易客户端
+def open_trader_terminal():
+    # 打开任务进程
+    cmd_util.open_bat_file(TRADER_SERVER_PATH)
+    # 自动登陆
+    trader_auto_service.auto_login()
+    time.sleep(5)
+    # 需先打开同花顺终端在开始交易服务
+    kill_server()
+    time.sleep(5)
+    # 打开任务进程
+    cmd_util.open_bat_file(TRADER_SERVER_PATH)
+
+
+def kill_server():
+    all_cmd_processes = cmd_util.get_all_process()
+    all_cmd_processes_trader = all_cmd_processes.loc[
+        (all_cmd_processes['total_info'].str.contains(TRADER_SERVER_NAME, case=False, na=False))]
+    if data_frame_util.is_not_empty(all_cmd_processes_trader):
+        for processes_one in all_cmd_processes_trader.itertuples():
+            try:
+                process_pid = processes_one.process_pid
+                cmd_util.kill_process_by_pid(process_pid)
+            except BaseException as e:
+                logger.error("杀死进程异常:{}", e)
+
+
+if __name__ == '__main__':
+    open_trader_terminal()

mns_scheduler/zt/zt_pool/ths_zt_pool_sync_api.py

@@ -17,6 +17,7 @@ import mns_common.api.akshare.k_line_api as k_line_api
 import mns_common.utils.date_handle_util as date_handle_util
 from mns_common.db.MongodbUtil import MongodbUtil
 import mns_common.constant.db_name_constant as db_name_constant
+import time
 
 mongodb_util = MongodbUtil('27017')
 
@@ -226,20 +227,22 @@ def save_ths_zt_pool(ths_zt_pool_df, str_day):
 
 
 if __name__ == '__main__':
-    trade_date = '2024-06-21'
+    trade_date = '2015-05-28'
     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)
+    while True:
+        query = {"$and": [{'_id': {"$gte": '2013-07-04'}}, {'_id': {"$lte": '2015-05-05'}}]}
+
+        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)
+                time.sleep(2)
+            except BaseException as e:
+                logger.warning("同步涨停到日期:{},{}", trade_one.trade_date, e)

mns_scheduler/zz_task/data_sync_task.py

@@ -49,6 +49,7 @@ import mns_scheduler.concept.ths.sync_new_index.sync_ths_concept_new_index_api a
 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
+import mns_scheduler.trade.task.trader_task_service as trader_task_service
 
 
 # 同步交易日期任务完成
@@ -348,6 +349,11 @@ def real_time_task_check_status():
     real_time_task_check_api.run_check_real_time_data_sync_status()
 
 
+# 打开交易客户端
+def trader_client_auto_login():
+    trader_task_service.open_trader_terminal()
+
+
 # # 定义BlockingScheduler
 blockingScheduler = BlockingScheduler()
 # sync_trade_date 同步交易日期
@@ -429,6 +435,9 @@ blockingScheduler.add_job(sync_all_interactive_questions, 'cron', hour='08,12,17
 # 实时数据状态同步check
 blockingScheduler.add_job(real_time_task_check_status, 'interval', seconds=59, max_instances=4)
 
+# 打开交易客户端
+blockingScheduler.add_job(trader_client_auto_login, 'cron', hour='09,12', minute='05')
+
 print('定时任务启动成功')
 blockingScheduler.start()
 #

{mns_scheduler-1.1.2.4.dist-info → mns_scheduler-1.1.2.7.dist-info}/METADATA

@@ -1,4 +1,4 @@
 Metadata-Version: 2.1
 Name: mns-scheduler
-Version: 1.1.2.4
+Version: 1.1.2.7
 

{mns_scheduler-1.1.2.4.dist-info → mns_scheduler-1.1.2.7.dist-info}/RECORD

@@ -38,10 +38,10 @@ mns_scheduler/concept/ths/sync_new_index/sync_ths_concept_new_index_api.py,sha25
 mns_scheduler/concept/ths/update_concept_info/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
 mns_scheduler/concept/ths/update_concept_info/sync_one_concept_all_symbols_api.py,sha256=wlsr70rcS-uAH6b8NXPbA-wG37saeIQ0FIg8vSSTXQA,1920
 mns_scheduler/concept/ths/update_concept_info/sync_one_symbol_all_concepts_api.py,sha256=HVqDSBruORebtiliKps2swJo_GNg_8mqT0r9cZX6sj8,8839
-mns_scheduler/db/__init__.py,sha256=1dpcEuWKyblKcpyOss0Iyy_ZS4ZJsh8x8GoMAv3TiS8,193
-mns_scheduler/db/col_move_service.py,sha256=VSGJROyErfytjGzSlhyTdH6z3ayHG5nFfJk8qjdpJhE,4057
+mns_scheduler/db/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
+mns_scheduler/db/col_move_service.py,sha256=-d3JUCjWyaGKBhyUSkqwpCgZtHkIy1JOasgpxmH74zg,4057
 mns_scheduler/db/db_status.py,sha256=e5eW5ZSm5J7tHvmxxhFmFdbZb2_oB_SAcdcFqc4KDmw,733
-mns_scheduler/db/real_time_task_check.py,sha256=qiOMgcCCBmaPllux-RaianKf_w2Xw2TgrVtj25wzixs,3169
+mns_scheduler/db/real_time_task_check.py,sha256=R8-ZmS7wzC_zZPGgDwv6kx2v25hBrYOTvXlU3cP2BVQ,3167
 mns_scheduler/dt/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
 mns_scheduler/dt/stock_dt_pool_sync.py,sha256=5ivRUOnFtOapZniwTbujf1lVq3y4btm2Cmd5R6JJAVo,3466
 mns_scheduler/finance/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
@@ -62,17 +62,17 @@ mns_scheduler/k_line/clean/k_line_info_clean_impl.py,sha256=2GgRc9Nb9wXMueoZhl9e
 mns_scheduler/k_line/clean/k_line_info_clean_task.py,sha256=ey6xTXAxxXh8_8cPzsWmUtVmG8Sd7jXFbpRpTrFrLDo,7622
 mns_scheduler/k_line/clean/daily/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
 mns_scheduler/k_line/clean/daily/daily_k_line_clean_common_service.py,sha256=j00d0LFZIjl5iabYnDOvU-aGRHgUI8mVaH__RmR0ZM8,18385
-mns_scheduler/k_line/clean/daily/daily_k_line_service.py,sha256=GOXtxZp6HVmqXQOpAsbiEx1lNo2z5p_zMwBqG42hzpQ,6654
+mns_scheduler/k_line/clean/daily/daily_k_line_service.py,sha256=BOzE5smjgJyUPdNvV4CUmN2phHT1VCtusosq7uhrGCw,6654
 mns_scheduler/k_line/clean/week_month/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
-mns_scheduler/k_line/clean/week_month/normal_week_month_k_line_service.py,sha256=8IDPddhbaV7n1m56ZlR--iJ1cvIhbv_iNCkq5eXNSOE,4862
-mns_scheduler/k_line/clean/week_month/sub_new_week_month_k_line_service.py,sha256=0XyurQkxG6kRxuqmQ-8z58Htma-uCGmSeYG39CfY0zI,5398
+mns_scheduler/k_line/clean/week_month/normal_week_month_k_line_service.py,sha256=4qInTtReDd77Jzb7ngme8yXHRd6INSbSCq84lhS3ScI,4862
+mns_scheduler/k_line/clean/week_month/sub_new_week_month_k_line_service.py,sha256=BS5wouEZhz4WfqubDgjO2CcfmYonCFqRl1BOPnVN3r8,5518
 mns_scheduler/k_line/hot_stocks/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
 mns_scheduler/k_line/hot_stocks/recent_hot_stocks_clean_service.py,sha256=whm-pYhAd_7OKurIw2cteBwWse5vVXS88lcrTbbcSaE,2628
 mns_scheduler/k_line/sync/__init__.py,sha256=ffZXFCLFdIwOsbxnw__u1MbQYh9yz7Bs8UMP6VF0X2M,161
 mns_scheduler/k_line/sync/bfq_k_line_sync.py,sha256=i2NNdp4uVa-kiqQvOaY6odd8-DmQtlejeMXeVklKOIs,4067
 mns_scheduler/k_line/sync/daily_week_month_line_sync.py,sha256=SHAvMkDW-2TKEC4wWkMdiOQWa4Ktc0Umm59OlceK1dg,5795
 mns_scheduler/k_line/test/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
-mns_scheduler/k_line/test/k_line_info_clean_his_data.py,sha256=r0Bkf9BdDHWOraXoaKQ-LdkLWxtxnMck5Vu-Uetcpvc,1173
+mns_scheduler/k_line/test/k_line_info_clean_his_data.py,sha256=2s0UW2dHGS_k25Rl9CeB7XZtbYRxWaHSp9Se5Okk7EI,1173
 mns_scheduler/kpl/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
 mns_scheduler/kpl/selection/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
 mns_scheduler/kpl/selection/index/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
@@ -107,6 +107,10 @@ mns_scheduler/trade/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhU
 mns_scheduler/trade/auto_ipo_buy_api.py,sha256=jVe5ZiXwzkDy_j_4X4rUamSzJpmzhV16lNKwbeWgpQw,386
 mns_scheduler/trade/auto_sell_service_api.py,sha256=b-4xmW6W6cd6dMuLPD7ZJu3tUtchMcUG-p7wOMm_RRY,4640
 mns_scheduler/trade/sync_position_api.py,sha256=deeOySGWsUbTiM2S0bb5wCSjtC59gdmwwjVZsCf3Wn4,2748
+mns_scheduler/trade/auto_login/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
+mns_scheduler/trade/auto_login/trader_auto_service.py,sha256=S2J36VrFcV8ZTQ2eeR_1c23d4eHe810kCyOINk6b6o8,686
+mns_scheduler/trade/task/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
+mns_scheduler/trade/task/trader_task_service.py,sha256=xBqByakfCO2ruWXuWWsRPJtZ_oCLXLgaOHDiLdD4SVw,1560
 mns_scheduler/zb/__init__.py,sha256=Tyvi_iQlv3jz59EdH67Mycnt9CSixcWPQoJwu55bOq0,165
 mns_scheduler/zb/stock_zb_pool_sync.py,sha256=ky3CNDzpjB6C_frCf4YGNXdidnUo-uUUKsJpY62P4Bk,1936
 mns_scheduler/zt/__init__.py,sha256=Rzolrn2R5RZIj-eOmu9KcL6oZBY9Wjz_uBFXPlzirQc,1641
@@ -125,10 +129,10 @@ mns_scheduler/zt/script/sync_high_chg_pool_his_data.py,sha256=OXyJqhPIbXkECXzGr0
 mns_scheduler/zt/script/sync_now_higt_chg_zt.py,sha256=bhoIGDWTI3w0YKVfIAVNHWpUrYqJYDMGPt-1i3d_Zmw,1850
 mns_scheduler/zt/zt_pool/__init__.py,sha256=Tyvi_iQlv3jz59EdH67Mycnt9CSixcWPQoJwu55bOq0,165
 mns_scheduler/zt/zt_pool/em_zt_pool_sync_api.py,sha256=wUtc9kL6ICyz8Os1ix_o-ZERdt6A7owxKyTS25j7UIM,7642
-mns_scheduler/zt/zt_pool/ths_zt_pool_sync_api.py,sha256=Xx_R_WujCtV_p4k1eKaYPshQVpErtegub2OyIOBxzUw,10338
+mns_scheduler/zt/zt_pool/ths_zt_pool_sync_api.py,sha256=0juoFzZ4zAxhbsyitQ5FQrEeUu7CWCxmMEypBVKriH4,10353
 mns_scheduler/zz_task/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
-mns_scheduler/zz_task/data_sync_task.py,sha256=bILPyMR0LEtCxdjEonplUOnGCYHhI65pFrzQWdf8WqI,18050
-mns_scheduler-1.1.2.4.dist-info/METADATA,sha256=n0rrqsIoSg0mpiptjAKTG1HQwAeTAwxnmdjXfGboE_U,64
-mns_scheduler-1.1.2.4.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-mns_scheduler-1.1.2.4.dist-info/top_level.txt,sha256=PXQDFBGR1pWmsUbH5yiLAh71P5HZODTRED0zJ8CCgOc,14
-mns_scheduler-1.1.2.4.dist-info/RECORD,,
+mns_scheduler/zz_task/data_sync_task.py,sha256=ciJkI3inI_SJ6s5Tlm3Zv8o59eoPKhUgnZfRW6xCmjg,18351
+mns_scheduler-1.1.2.7.dist-info/METADATA,sha256=CsKtE1LfmZlu_h8Zeq_JQjjFHol4rWni6UhFQSeWFwQ,64
+mns_scheduler-1.1.2.7.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+mns_scheduler-1.1.2.7.dist-info/top_level.txt,sha256=PXQDFBGR1pWmsUbH5yiLAh71P5HZODTRED0zJ8CCgOc,14
+mns_scheduler-1.1.2.7.dist-info/RECORD,,

{mns_scheduler-1.1.2.4.dist-info → mns_scheduler-1.1.2.7.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: bdist_wheel (0.43.0)
 Root-Is-Purelib: true
 Tag: py3-none-any