mns-scheduler 1.3.3.5__py3-none-any.whl → 1.3.3.8__py3-none-any.whl

mns_scheduler/company_info/em_stock_info/sync_em_stock_info_sync.py

@@ -61,7 +61,6 @@ def sync_all_em_stock_info():
         em_us_stock_info['_id'] = em_us_stock_info['symbol']
         mongodb_util.save_mongo(em_us_stock_info, extra_income_db_name.EM_US_STOCK_INFO)
         em_us_etf_info = em_us_stock_info.loc[(em_us_stock_info['amount'] != 0) & (em_us_stock_info['total_mv'] == 0)]
-        em_us_etf_info = em_us_etf_info.loc[em_us_etf_info['amount'] > 10000000]
         em_us_etf_info = em_us_etf_info.sort_values(by=['amount'], ascending=False)
         mongodb_util.save_mongo(em_us_etf_info, extra_income_db_name.EM_US_ETF_INFO)
 

mns_scheduler/trade/auto_login/trader_auto_service.py

@@ -8,7 +8,7 @@ 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
-
+from loguru import logger
 
 # qmt 自动登录
 def qmt_auto_login():
@@ -21,9 +21,11 @@ def ths_auto_login():
 
 
 def auto_login():
-    qmt_auto_login()
-    time.sleep(5)
+    logger.info("打开ths下单程序")
     ths_auto_login()
+    time.sleep(5)
+    logger.info("打开qmt下单程序")
+    qmt_auto_login()
 
 
 if __name__ == '__main__':

mns_scheduler/trade/task/trader_task_service.py

@@ -11,26 +11,42 @@ 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'
+# 交易服务端
+TRADER_SERVER_PATH = 'H:\\mns_trader_server.bat'
 # 实时行情同步任务 python名称
-TRADER_SERVER_NAME = "mns-trader"
+TRADER_SERVER_NAME = "mns_trader_server"
 
 
 # 打开交易客户端
 def open_trader_terminal():
-    # 打开任务进程
-    cmd_util.open_bat_file(TRADER_SERVER_PATH)
-    # 自动登陆
+    # 打开 [交易web服务端]
+    logger.info('打开 [交易web服务端]')
+    if bool(1- is_open_trader_server()):
+        cmd_util.open_bat_file(TRADER_SERVER_PATH)
+    time.sleep(10)
+    logger.info('自动登陆ths和qmt')
+    # 自动登陆ths和qmt
     trader_auto_service.auto_login()
     time.sleep(5)
-    # 需先打开同花顺终端在开始交易服务
+    # 杀死[交易web服务端]，使用同花顺需要先打开xiadan.exe，在重新打开[交易web服务端]
+    logger.info('杀死[交易web服务端]')
     kill_server()
     time.sleep(5)
-    # 打开任务进程
+    logger.info('重新打开 [交易web服务端]')
+    # 重新打开 [交易web服务端]
     cmd_util.open_bat_file(TRADER_SERVER_PATH)
 
 
+def is_open_trader_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):
+        return True
+    else:
+        return False
+
+
 def kill_server():
     all_cmd_processes = cmd_util.get_all_process()
     all_cmd_processes_trader = all_cmd_processes.loc[
@@ -45,4 +61,5 @@ def kill_server():
 
 
 if __name__ == '__main__':
+    # kill_server()
     open_trader_terminal()

mns_scheduler/zz_task/compensation/compensate_task.py

@@ -0,0 +1,113 @@
+
+from loguru import logger
+from datetime import datetime
+import mns_common.component.trade_date.trade_date_common_service_api as trade_date_common_service_api
+import mns_scheduler.k_line.month_week_daily.daily_week_month_line_sync as daily_week_month_line_sync_api
+import mns_scheduler.zt.open_data.kcx_high_chg_open_data_sync as kcx_high_chg_open_data_sync
+import mns_scheduler.zt.export.export_kcx_high_chg_open_data_to_excel as export_kcx_high_chg_open_data_to_excel
+import mns_scheduler.zt.connected_boards.zt_five_boards_sync_api as zt_five_boards_sync_api
+import mns_scheduler.zt.zt_pool.em_zt_pool_sync_api as em_zt_pool_sync_api
+import mns_scheduler.k_line.clean.k_line_info_clean_task as k_line_info_clean_service
+import mns_scheduler.open.sync_one_day_open_data_to_db_service as sync_one_day_open_data_to_db_service
+import mns_scheduler.zt.high_chg.sync_high_chg_pool_service as sync_high_chg_pool_service
+import mns_scheduler.zt.high_chg.sync_high_chg_real_time_quotes_service as sync_high_chg_real_time_quotes_service
+import mns_scheduler.zt.zt_pool.ths_zt_pool_sync_api as ths_zt_pool_sync_api
+
+
+
+# 定时同步每日交易行情数据(前复权)
+def stock_daily_sync_qfq():
+    now_date = datetime.now()
+    str_now_date = now_date.strftime('%Y-%m-%d')
+    logger.info('同步每日行情数据(前复权):' + str_now_date)
+    daily_week_month_line_sync_api.sync_all_daily_data('daily',
+                                                       'qfq', 'stock_qfq_daily', str_now_date)
+
+
+# 同步当日k c x 高涨幅数据
+def realtime_quotes_now_zt_kc_data_sync():
+    now_date = datetime.now()
+    str_day = now_date.strftime('%Y-%m-%d')
+    if trade_date_common_service_api.is_trade_day(str_day):
+        # 同步当日kcx 高涨幅 当天交易数据和开盘数据
+        kcx_high_chg_open_data_sync.sync_all_kc_zt_data(str_day, None)
+        # 同步当日开盘数据
+        sync_one_day_open_data_to_db_service.sync_one_day_open_data(str_day)
+        # 涨停数据同步到excel
+        export_kcx_high_chg_open_data_to_excel.export_kc_zt_data(str_day)
+
+
+# 同步涨停池
+def sync_stock_zt_pool():
+    now_date = datetime.now()
+    str_day = now_date.strftime('%Y-%m-%d')
+    if trade_date_common_service_api.is_trade_day(str_day):
+        logger.info('同步当天涨停池股开始')
+        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_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('同步当天涨停池股票完成')
+
+
+# 保存今天高涨幅数据
+def sync_toady_stock_zt_pool():
+    logger.info('同步今天涨幅大于9.5的symbol')
+    now_date = datetime.now()
+    str_day = now_date.strftime('%Y-%m-%d')
+    # 同步高涨幅实时行情
+    sync_high_chg_real_time_quotes_service.sync_high_chg_real_time_quotes(str_day)
+    # 同步高涨幅列表
+    sync_high_chg_pool_service.sync_stock_high_chg_pool_list(str_day, None)
+
+
+# 计算下一个交易日k线数据
+def generate_new_day_k_line_info():
+    now_date = datetime.now()
+    str_day = now_date.strftime('%Y-%m-%d')
+    # 生成下一个交易日日期k线数据 number=2 获取下一个交易日 日期
+    if trade_date_common_service_api.is_trade_day(str_day):
+        dis_number = 2
+    else:
+        dis_number = 1
+    next_trade_day = trade_date_common_service_api.get_further_trade_date(str_day, dis_number)
+    k_line_info_clean_service.sync_k_line_info_task(next_trade_day)
+    logger.info('计算当日k线信息完成:{}', str_day)
+
+
+# 同步一天k线 涨停 数据
+def sync_daily_data_info():
+    # 同步k线数据
+    try:
+        stock_daily_sync_qfq()
+    except BaseException as e:
+        logger.error("同步当日k线数据异常:{}", e)
+
+    # 同步当日k c x 高涨幅数据
+    try:
+        realtime_quotes_now_zt_kc_data_sync()
+    except BaseException as e:
+        logger.error("同步当日kcx高涨幅数据异常:{}", e)
+
+    # 同步涨停池数据信息
+    try:
+        sync_stock_zt_pool()
+    except BaseException as e:
+        logger.error("同步涨停数据信息异常:{}", e)
+
+    # 同步今日高涨幅数据 依赖涨停股票池的数据
+    try:
+        sync_toady_stock_zt_pool()
+    except BaseException as e:
+        logger.error("同步今日高涨幅数据异常:{}", e)
+
+    # 计算当日k线数据
+    try:
+        generate_new_day_k_line_info()
+    except BaseException as e:
+        logger.error("计算当日k线数据异常:{}", e)
+
+
+if __name__ == '__main__':
+    sync_daily_data_info()

mns_scheduler/zz_task/data_sync_task.py

@@ -455,6 +455,9 @@ blockingScheduler.add_job(update_one_symbol_all_concepts, 'cron', hour='07,08,18
 # 打开交易客户端
 blockingScheduler.add_job(trader_client_auto_login, 'cron', hour='08,09', minute='04')
 
+# 获取当前持仓
+blockingScheduler.add_job(sync_position, 'cron', hour='0,08,09', minute='14')
+
 # 同步公司基本信息
 blockingScheduler.add_job(update_company_base_info, 'cron', hour='08,18', minute='05')
 
@@ -476,26 +479,12 @@ blockingScheduler.add_job(self_choose_stock_task, 'cron', hour='08,17,21', minut
 # 开盘前同步同花顺新概念指数
 blockingScheduler.add_job(sync_new_concept_index, 'cron', hour='09,22', minute='01,10,20,28,41,58')
 
-# 获取同花顺持仓
-blockingScheduler.add_job(sync_position, 'cron', hour='0,08,09', minute='14')
-
 # 更新同花顺概念信息
 blockingScheduler.add_job(concept_info_clean, 'cron', hour='9,12,20', minute='24')
 
 # 更新开盘啦指数关系
 blockingScheduler.add_job(update_best_choose_plate_relation, 'cron', hour='09,18', minute='25')
 
-# # 打开实时行情任务同步
-#
-# blockingScheduler.add_job(real_time_sync_task_open, 'cron', hour='09', minute='15')
-# blockingScheduler.add_job(real_time_sync_task_open, 'cron', hour='09', minute='29')
-# blockingScheduler.add_job(real_time_sync_task_open, 'cron', hour='12', minute='59')
-# # 关闭实时行情任务
-#
-# blockingScheduler.add_job(real_time_sync_task_close, 'cron', hour='09', minute='28')
-# blockingScheduler.add_job(real_time_sync_task_close, 'cron', hour='11', minute='31')
-# blockingScheduler.add_job(real_time_sync_task_close, 'cron', hour='15', minute='01')
-
 # 自动打新 打新中签高时间段 10:30-11:30
 blockingScheduler.add_job(auto_ipo_buy, 'cron', hour='10', minute='40,50')
 

{mns_scheduler-1.3.3.5.dist-info → mns_scheduler-1.3.3.8.dist-info}/METADATA

@@ -1,4 +1,4 @@
 Metadata-Version: 2.1
 Name: mns-scheduler
-Version: 1.3.3.5
+Version: 1.3.3.8
 

{mns_scheduler-1.3.3.5.dist-info → mns_scheduler-1.3.3.8.dist-info}/RECORD

@@ -14,7 +14,7 @@ mns_scheduler/company_info/constant/company_constant_data.py,sha256=0qhRXLASsQlY
 mns_scheduler/company_info/de_list_stock/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
 mns_scheduler/company_info/de_list_stock/de_list_stock_service.py,sha256=QNtKc1ZI6xHjupcxbOBN7fBhi6oAGtL7X1TQZVzfpnk,1993
 mns_scheduler/company_info/em_stock_info/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
-mns_scheduler/company_info/em_stock_info/sync_em_stock_info_sync.py,sha256=eHtnaGIuZXcLAz6De_qTo2GoxEkls5WTyCugGCIwE9w,3820
+mns_scheduler/company_info/em_stock_info/sync_em_stock_info_sync.py,sha256=csPArPy7IZPcycvEB3vl1ENVsrkcv0db5dMxVXIfn0c,3738
 mns_scheduler/company_info/remark/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
 mns_scheduler/company_info/remark/company_remark_info_sync.py,sha256=L8wC8LU7-GYZb1TyKLjODJURROOEO4izZBxnWEM7Ahc,2334
 mns_scheduler/concept/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
@@ -126,11 +126,11 @@ mns_scheduler/trade/auto_ipo_buy_api.py,sha256=jVe5ZiXwzkDy_j_4X4rUamSzJpmzhV16l
 mns_scheduler/trade/auto_sell_service_api.py,sha256=A2RB3WFxVHqbNPaPvhIgO-3uaicFZVmBKUy2TsfMU90,4624
 mns_scheduler/trade/sync_position_api.py,sha256=eGJAL1WoP_WwDloKQqeUXZUqtQv8G6VlODe8EDhmgMY,2748
 mns_scheduler/trade/auto_login/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
-mns_scheduler/trade/auto_login/trader_auto_service.py,sha256=1cvKwbfAKmjG312aHLvMXVFs59y8Sg6WnDEWqS_nyMs,686
+mns_scheduler/trade/auto_login/trader_auto_service.py,sha256=bsagj26s74Zv5OEyGahhBX_OK4Iuo5ZmuItsON9DDmY,795
 mns_scheduler/trade/balance/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
 mns_scheduler/trade/balance/ths_account_balance_service.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
 mns_scheduler/trade/task/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
-mns_scheduler/trade/task/trader_task_service.py,sha256=YQst2m0MWLnQ7FceCL5EkCEN-Ry7lw_ZTZm6DJdOIQc,1560
+mns_scheduler/trade/task/trader_task_service.py,sha256=1vdjfs-M9y0ana2OLwWdlkB9YS-hm9LrChlw3Ectyeg,2305
 mns_scheduler/trade/tfp/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
 mns_scheduler/trade/tfp/stock_tfp_info_sync.py,sha256=ViAVG-1GWLkRxiSBPLIfNICZRnpNZ3mHf44R7X7O4IE,2440
 mns_scheduler/zb/__init__.py,sha256=Tyvi_iQlv3jz59EdH67Mycnt9CSixcWPQoJwu55bOq0,165
@@ -155,8 +155,10 @@ mns_scheduler/zt/zt_pool/em_zt_pool_sync_api.py,sha256=LOEUyTA5g7N6FWxUpHWimWTeX
 mns_scheduler/zt/zt_pool/ths_zt_pool_sync_api.py,sha256=9Sv1G88poLG3_8aLPkfr8bdwD_AzbSrwvHTGPErOtQU,7501
 mns_scheduler/zt/zt_pool/update_null_zt_reason_api.py,sha256=caW-MuF0RFLavJZafeLDYQ29-GxwGsmr5YVrN4lost8,2135
 mns_scheduler/zz_task/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
-mns_scheduler/zz_task/data_sync_task.py,sha256=5HchdkllTsxE1SE7eDSs0v3plPL0aJwqwgP6d336pa0,23230
-mns_scheduler-1.3.3.5.dist-info/METADATA,sha256=JlGIL4FSSrijaspTvPC6rCZ7umUQrW_YzPTHJiP0cFk,64
-mns_scheduler-1.3.3.5.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-mns_scheduler-1.3.3.5.dist-info/top_level.txt,sha256=PXQDFBGR1pWmsUbH5yiLAh71P5HZODTRED0zJ8CCgOc,14
-mns_scheduler-1.3.3.5.dist-info/RECORD,,
+mns_scheduler/zz_task/data_sync_task.py,sha256=bJgvVldBnpjfxDUGnZbYr0OTCL6c07yVBSEwp5VucUg,22628
+mns_scheduler/zz_task/compensation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mns_scheduler/zz_task/compensation/compensate_task.py,sha256=RCPBZC2waLR2HP918neXsWGvV08n5hvc15ucASFGYY8,4820
+mns_scheduler-1.3.3.8.dist-info/METADATA,sha256=Vd1TZboTTBYaA--nMDpoSNavBMk0tdm_M3UsIuJhJxk,64
+mns_scheduler-1.3.3.8.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+mns_scheduler-1.3.3.8.dist-info/top_level.txt,sha256=PXQDFBGR1pWmsUbH5yiLAh71P5HZODTRED0zJ8CCgOc,14
+mns_scheduler-1.3.3.8.dist-info/RECORD,,