mns-scheduler 1.1.8.4__py3-none-any.whl → 1.4.5.7__py3-none-any.whl

mns_scheduler/kpl/selection/total/sync_kpl_best_total_sync_api.py

@@ -10,6 +10,7 @@ import mns_scheduler.kpl.selection.symbol.sync_best_choose_symbol as sync_best_c
 import threading
 import mns_common.constant.db_name_constant as db_name_constant
 import mns_common.api.kpl.constant.kpl_constant as kpl_constant
+import mns_scheduler.kpl.selection.symbol.sync_kpl_concept_symbol_choose_reason_api as sync_kpl_concept_symbol_choose_reason_api
 
 file_path = os.path.abspath(__file__)
 end = file_path.index('mns') + 17
@@ -84,6 +85,10 @@ def sync_all_plate_info():
     update_null_name()
     logger.info("更新开盘啦空名字名称")
 
+    # 更新开盘啦入选原因
+    sync_kpl_concept_symbol_choose_reason_api.update_null_choose_reason()
+    logger.info("更新开盘啦入选原因")
+
 
 # 更新一二级关系
 def update_best_choose_plate_relation():

mns_scheduler/lhb/__init__.py

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

mns_scheduler/lhb/stock_lhb_sync_service.py

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

mns_scheduler/open/__init__.py

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

mns_scheduler/open/sync_one_day_open_data_to_db_service.py

@@ -2,7 +2,7 @@ import sys
 import os
 
 file_path = os.path.abspath(__file__)
-end = file_path.index('mns') + 16
+end = file_path.index('mns') + 17
 project_path = file_path[0:end]
 sys.path.append(project_path)
 # 同步当天所有开盘数据
@@ -13,7 +13,6 @@ 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_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
 
 mongodb_util = MongodbUtil('27017')
@@ -68,4 +67,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('2025-03-21')

mns_scheduler/risk/__init__.py

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

mns_scheduler/risk/compliance/undisclosed_annual_report_api.py

@@ -1,6 +1,6 @@
 from datetime import datetime
 import mns_common.component.self_choose.black_list_service_api as black_list_service_api
-import mns_scheduler.finance.finance_common_api as finance_common_api
+import mns_scheduler.finance.em.finance_common_api as finance_common_api
 from loguru import logger
 import mns_common.constant.db_name_constant as db_name_constant
 import mns_common.component.trade_date.trade_date_common_service_api as trade_date_common_service_api
@@ -21,6 +21,12 @@ def un_disclosed_report_check(sync_time, now_year, period, period_time):
                                                                    db_name_constant.EM_STOCK_PROFIT)
     un_report_df = pd.concat([un_report_asset_df, un_report_profit_df])
     if period == 4 or period == 1:
+        month = sync_time[5:7]
+        day = sync_time[8:10]
+        day = int(day)
+        month = int(month)
+        if (month < 4) or (month == 4 and day < 20):
+            return None
         last_report_day = str(now_year) + "-05-01"
     elif period == 2:
         last_report_day = str(now_year) + "-07-01"
@@ -62,4 +68,4 @@ def un_disclosed_report_check(sync_time, now_year, period, period_time):
 
 
 if __name__ == '__main__':
-    un_disclosed_report_check('2024-04-20', 2024, 4, '2023-12-31 00:00:00')
+    un_disclosed_report_check('2025-04-29', 2025, 4, '2024-12-31 00:00:00')

mns_scheduler/risk/financial/annual_report_audit_check_api.py

@@ -2,18 +2,21 @@ import sys
 import os
 
 file_path = os.path.abspath(__file__)
-end = file_path.index('mns') + 16
+end = file_path.index('mns') + 17
 project_path = file_path[0:end]
 sys.path.append(project_path)
 import mns_common.component.self_choose.black_list_service_api as black_list_service_api
 from mns_common.db.MongodbUtil import MongodbUtil
 from datetime import datetime
 from mns_common.constant.black_list_classify_enum import BlackClassify
+import mns_common.constant.db_name_constant as db_name_constant
 
 # 年报审计意见check
 mongodb_util = MongodbUtil('27017')
 # 审核标准意见
 OPINION_TYPE = "标准无保留意见"
+# 新上市不check
+NEW_STOCK = 365
 
 
 def annual_report_audit_check(new_report_df, period_time):
@@ -25,11 +28,18 @@ def annual_report_audit_check(new_report_df, period_time):
     notice_date = list(new_report_one_df['NOTICE_DATE'])[0]
     now_date = datetime.now()
     str_day = now_date.strftime('%Y-%m-%d')
-    str_now_date = now_date.strftime('%Y-%m-%d %H:%M:%S')
-
+    query = {'symbol': symbol, 'level_code': BlackClassify.AUDIT_PROBLEM.level_code}
+    mongodb_util.remove_data(query, db_name_constant.SELF_BLACK_STOCK)
     # 年报有问题
     if opinion_type != OPINION_TYPE:
+        query_company = {'_id': symbol}
+        company_info = mongodb_util.find_query_data(db_name_constant.COMPANY_INFO, query_company)
+        diff_days = list(company_info['diff_days'])[0]
+        if diff_days < NEW_STOCK:
+            return
+
         id_key = symbol + "_" + period_time + "_" + BlackClassify.AUDIT_PROBLEM.level_code
+
         black_list_service_api.save_black_stock(id_key,
                                                 symbol,
                                                 name,

mns_scheduler/risk/financial/net_assets_check_api.py

@@ -31,14 +31,17 @@ def net_assets_check(report_type, new_report_df, period_time):
         name = list(new_report_one_df['SECURITY_NAME_ABBR'])[0]
         now_date = datetime.now()
         str_day = now_date.strftime('%Y-%m-%d')
-        str_now_date = now_date.strftime('%Y-%m-%d %H:%M:%S')
         id_key = symbol + "_" + period_time + "_" + BlackClassify.FINANCIAL_PROBLEM_DEBT.level_code
         notice_date = list(new_report_one_df['NOTICE_DATE'])[0]
         query_company = {'_id': symbol, 'industry': {'$in': EXCLUDE_INDUSTRY}}
+        query = {'symbol': symbol, 'level_code': BlackClassify.FINANCIAL_PROBLEM_DEBT.level_code}
+        mongodb_util.remove_data(query, db_name_constant.SELF_BLACK_STOCK)
+
         if mongodb_util.exist_data_query(db_name_constant.COMPANY_INFO, query_company):
             return None
 
-        if liability_ratio >= MAX_LIABILITY_RATIO:
+        if liability_ratio >= MAX_LIABILITY_RATIO and net_asset < MIN_NET_ASSET:
+
             black_list_service_api.save_black_stock(id_key,
                                                     symbol,
                                                     name,
@@ -54,19 +57,19 @@ def net_assets_check(report_type, new_report_df, period_time):
                                                     BlackClassify.FINANCIAL_PROBLEM_DEBT.up_level_name,
                                                     BlackClassify.FINANCIAL_PROBLEM_DEBT.level_code,
                                                     BlackClassify.FINANCIAL_PROBLEM_DEBT.level_name)
-        if net_asset < MIN_NET_ASSET:
-            black_list_service_api.save_black_stock(id_key,
-                                                    symbol,
-                                                    name,
-                                                    str_day,
-                                                    notice_date,
-                                                    '净资产低:' + "[" + "负债比:" + str(
-                                                        liability_ratio) + "]" + "," + "净资产:"
-                                                    + str(round(net_asset / common_service_fun_api.HUNDRED_MILLION,
-                                                                0)) + "亿",
-                                                    '净资产低:' + "[" + str(liability_ratio) + "]",
-                                                    '',
-                                                    BlackClassify.FINANCIAL_PROBLEM_DEBT.up_level_code,
-                                                    BlackClassify.FINANCIAL_PROBLEM_DEBT.up_level_name,
-                                                    BlackClassify.FINANCIAL_PROBLEM_DEBT.level_code,
-                                                    BlackClassify.FINANCIAL_PROBLEM_DEBT.level_name)
+        # if net_asset < MIN_NET_ASSET:
+        #     black_list_service_api.save_black_stock(id_key,
+        #                                             symbol,
+        #                                             name,
+        #                                             str_day,
+        #                                             notice_date,
+        #                                             '净资产低:' + "[" + "负债比:" + str(
+        #                                                 liability_ratio) + "]" + "," + "净资产:"
+        #                                             + str(round(net_asset / common_service_fun_api.HUNDRED_MILLION,
+        #                                                         0)) + "亿",
+        #                                             '净资产低:' + "[" + str(liability_ratio) + "]",
+        #                                             '',
+        #                                             BlackClassify.FINANCIAL_PROBLEM_DEBT.up_level_code,
+        #                                             BlackClassify.FINANCIAL_PROBLEM_DEBT.up_level_name,
+        #                                             BlackClassify.FINANCIAL_PROBLEM_DEBT.level_code,
+        #                                             BlackClassify.FINANCIAL_PROBLEM_DEBT.level_name)

mns_scheduler/risk/financial/profit_income_check_api.py

@@ -5,9 +5,11 @@ import mns_common.constant.db_name_constant as db_name_constant
 import mns_common.component.self_choose.black_list_service_api as black_list_service_api
 import mns_common.component.common_service_fun_api as common_service_fun_api
 from mns_common.constant.black_list_classify_enum import BlackClassify
+from mns_common.db.MongodbUtil import MongodbUtil
 
+mongodb_util = MongodbUtil('27017')
 file_path = os.path.abspath(__file__)
-end = file_path.index('mns') + 16
+end = file_path.index('mns') + 17
 project_path = file_path[0:end]
 sys.path.append(project_path)
 
@@ -25,7 +27,6 @@ def profit_income_check(new_report_df, period_time, report_type):
     name = list(new_report_one_df['SECURITY_NAME_ABBR'])[0]
     now_date = datetime.now()
     str_day = now_date.strftime('%Y-%m-%d')
-    str_now_date = now_date.strftime('%Y-%m-%d %H:%M:%S')
     notice_date = list(new_report_one_df['NOTICE_DATE'])[0]
     if report_type == db_name_constant.EM_STOCK_PROFIT:
         # 利润总额  净利润 扣除非经常性损益后的净利润  三者最小为负
@@ -50,6 +51,10 @@ def profit_income_check(new_report_df, period_time, report_type):
             # 最小利润收入
         min_profit = min(total_profit, net_profit, operate_profit,
                          continued_profit, parent_profit, deduct_parent_profit)
+
+        query = {'symbol': symbol, 'level_code': BlackClassify.FINANCIAL_PROBLEM_PROFIT.level_code}
+        mongodb_util.remove_data(query, db_name_constant.SELF_BLACK_STOCK)
+
         if min_profit < 0:
 
             classification = common_service_fun_api.classify_symbol_one(symbol)

mns_scheduler/risk/financial_report_risk_check_api.py

@@ -2,7 +2,7 @@ import sys
 import os
 
 file_path = os.path.abspath(__file__)
-end = file_path.index('mns') + 16
+end = file_path.index('mns') + 17
 project_path = file_path[0:end]
 sys.path.append(project_path)
 import mns_scheduler.risk.financial.net_assets_check_api as net_assets_check_api

mns_scheduler/risk/major_violations/register_and_investigate_stock_sync_api.py

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

mns_scheduler/risk/self/wei_pan_stock_api.py

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

mns_scheduler/risk/test/__init__.py

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

mns_scheduler/risk/test/fix_blask_list.py

@@ -2,23 +2,21 @@ import sys
 import os
 
 file_path = os.path.abspath(__file__)
-end = file_path.index('mns') + 16
+end = file_path.index('mns') + 17
 project_path = file_path[0:end]
 sys.path.append(project_path)
 
 import mns_common.constant.db_name_constant as db_name_constant
-
-from mns_common.db.MongodbUtil import MongodbUtil
-
 import mns_scheduler.risk.financial_report_risk_check_api as financial_report_risk_check_api
+from mns_common.db.MongodbUtil import MongodbUtil
 
 mongodb_util = MongodbUtil('27017')
 
 
 def fix_profit_black_list():
-    period_time = "2023-12-31 00:00:00"
+    period_time = "2024-12-31 00:00:00"
     period = 4
-    report_type_list = [db_name_constant.EM_STOCK_PROFIT, db_name_constant.EM_STOCK_ASSET_LIABILITY]
+    report_type_list = [db_name_constant.EM_STOCK_ASSET_LIABILITY, db_name_constant.EM_STOCK_PROFIT]
     for report_type in report_type_list:
         query = {'REPORT_DATE': period_time}
         em_stock_profit_df_list = mongodb_util.find_query_data(report_type, query)

mns_scheduler/risk/transactions/transactions_check_api.py

@@ -2,10 +2,10 @@ import sys
 import os
 
 file_path = os.path.abspath(__file__)
-end = file_path.index('mns') + 16
+end = file_path.index('mns') + 17
 project_path = file_path[0:end]
 sys.path.append(project_path)
-import mns_common.api.em.east_money_stock_api as east_money_stock_api
+import mns_common.component.em.em_stock_info_api as em_stock_info_api
 from datetime import datetime
 import mns_common.component.self_choose.black_list_service_api as black_list_service_api
 import mns_common.component.trade_date.trade_date_common_service_api as trade_date_common_service_api
@@ -16,6 +16,7 @@ import mns_common.component.company.company_common_service_new_api as company_co
 from mns_common.constant.black_list_classify_enum import BlackClassify
 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.tfp.stock_tfp_api as stock_tfp_api
 
 mongodb_util = MongodbUtil('27017')
 
@@ -39,9 +40,21 @@ BJS_MARKET_MIN_VOLUME = 1500000
 
 
 def transactions_check_task():
-    real_time_quotes_now = east_money_stock_api.get_real_time_quotes_all_stocks()
+    # 获取当前日期和时间
+    now = datetime.now()
+
+    # 格式化输出
+    now_day_str = now.strftime("%Y%m%d")
+
+    now_day_number = float(now_day_str)
+
+    real_time_quotes_now = em_stock_info_api.get_a_stock_info()
+    real_time_quotes_now['list_date'] = real_time_quotes_now['list_date'].fillna(19890604)
+    real_time_quotes_now = real_time_quotes_now.loc[real_time_quotes_now['list_date'] <= now_day_number]
     real_time_quotes_now = common_service_fun_api.classify_symbol(real_time_quotes_now)
     real_time_quotes_now = common_service_fun_api.exclude_ts_symbol(real_time_quotes_now)
+    # 排除交易金额为0的
+    real_time_quotes_now = common_service_fun_api.exclude_amount_zero_stock(real_time_quotes_now)
 
     de_list_symbol = company_common_service_new_api.get_de_list_company()
 
@@ -100,8 +113,13 @@ def now_price_check(stock_one):
     now_date = datetime.now()
     str_day = now_date.strftime('%Y-%m-%d')
     str_now_date = now_date.strftime('%Y-%m-%d %H:%M:%S')
+
+    tfp_symbol_list = stock_tfp_api.get_stock_tfp_symbol_list_by_day(str_day)
+    if stock_one.symbol in tfp_symbol_list:
+        return
+
     key_id = stock_one.symbol + "_" + BlackClassify.CLOSE_PRICE_RISK.level_code
-    if now_price < MIN_NOW_PRICE:
+    if MIN_NOW_PRICE > now_price > 0:
         black_list_service_api.save_black_stock(
             key_id,
             stock_one.symbol,

mns_scheduler/self_choose/__init__.py

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

mns_scheduler/self_choose/ths_self_choose_service.py

@@ -2,22 +2,22 @@ import sys
 import os
 
 file_path = os.path.abspath(__file__)
-end = file_path.index('mns') + 16
+end = file_path.index('mns') + 17
 project_path = file_path[0:end]
 sys.path.append(project_path)
 import mns_common.api.ths.self_choose.ths_self_choose_api as ths_self_choose_api
 import mns_common.constant.db_name_constant as db_name_constant
 from mns_common.db.MongodbUtil import MongodbUtil
-import mns_common.api.ths.zt.ths_stock_zt_pool_api as ths_stock_zt_pool_api
+import mns_common.component.cookie.cookie_info_service as cookie_info_service
 import mns_common.component.common_service_fun_api as common_service_fun_api
 from datetime import datetime
 import mns_common.utils.data_frame_util as data_frame_util
-from functools import lru_cache
 import mns_common.constant.self_choose_constant as self_choose_constant
 import mns_common.component.trade_date.trade_date_common_service_api as trade_date_common_service_api
 
 mongodb_util = MongodbUtil('27017')
 
+
 # 固定的选择
 # fixed_optional_list = ['USDCNH', 'XAUUSD',
 #                        '881279',
@@ -38,40 +38,48 @@ mongodb_util = MongodbUtil('27017')
 #                        ]
 
 # 固定的选择
-fixed_optional_list = ['899050', '881157']
-
-
-@lru_cache()
-def get_ths_cookie():
-    query = {"type": "ths_cookie"}
-    stock_account_info = mongodb_util.find_query_data(db_name_constant.STOCK_ACCOUNT_INFO, query)
-    ths_cookie = list(stock_account_info['cookie'])[0]
-    return ths_cookie
-
+# fixed_optional_list = ['899050', '881157']
 
-def add_fixed_optional():
-    ths_cookie = get_ths_cookie()
-    for symbol in fixed_optional_list:
-        ths_self_choose_api.add_stock_to_account(symbol, ths_cookie)
+#
+# def add_fixed_optional():
+#     ths_cookie = cookie_info_service.get_ths_cookie()
+#     for symbol in fixed_optional_list:
+#         ths_self_choose_api.add_stock_to_account(symbol, ths_cookie)
 
-
-def delete_all_self_choose_stocks():
-    ths_cookie = get_ths_cookie()
+# 删除所有自选股票
+def delete_all_self_choose_stocks(ths_cookie):
     all_self_choose_stock_list = ths_self_choose_api.get_all_self_choose_stock_list(ths_cookie)
     for stock_one in all_self_choose_stock_list.itertuples():
         symbol = stock_one.code
         ths_self_choose_api.del_stock_from_account(symbol, ths_cookie)
 
 
-def add_self_choose_local():
-    ths_cookie = get_ths_cookie()
-
+# 添加固定自选股票
+def add_self_choose_symbol(ths_cookie):
+    # 固定自选
     self_choose_symbol_df = mongodb_util.find_all_data(db_name_constant.SELF_CHOOSE_STOCK)
     if data_frame_util.is_not_empty(self_choose_symbol_df):
         self_choose_symbol_df = self_choose_symbol_df.sort_values(by=['str_now_date'], ascending=False)
         for stock_one in self_choose_symbol_df.itertuples():
             ths_self_choose_api.add_stock_to_account(stock_one.symbol, ths_cookie)
 
+
+# 添加今日选择股票
+def add_today_choose_symbol(ths_cookie):
+    now_date = datetime.now()
+    str_day = now_date.strftime('%Y-%m-%d')
+    last_trade_day = trade_date_common_service_api.get_last_trade_day(str_day)
+    last_trade_day_time = last_trade_day + " 15:00:00"
+    query = {'str_now_date': {"$gte": last_trade_day_time}, "valid": True}
+    self_choose_symbol_today_df = mongodb_util.find_query_data(db_name_constant.TODAY_SELF_CHOOSE_STOCK, query)
+    if data_frame_util.is_not_empty(self_choose_symbol_today_df):
+        self_choose_symbol_today_df = self_choose_symbol_today_df.sort_values(by=['str_now_date'], ascending=True)
+        for stock_one in self_choose_symbol_today_df.itertuples():
+            ths_self_choose_api.add_stock_to_account(stock_one.symbol, ths_cookie)
+
+
+# 添加同花顺概念
+def add_self_choose_concept(ths_cookie):
     query_plate = {'self_type': {
         "$in": [self_choose_constant.SELF_CHOOSE_THS_CONCEPT,
                 self_choose_constant.SELF_CHOOSE_THS_INDUSTRY]}}
@@ -84,47 +92,95 @@ def add_self_choose_local():
 
 
 # 添加最近交易股票
-def add_trade_stocks():
+def add_trade_stocks(ths_cookie):
     now_date = datetime.now()
     str_day = now_date.strftime('%Y-%m-%d')
     last_trade_day = trade_date_common_service_api.get_last_trade_day(str_day)
     query = {"$and": [{"str_day": {"$gte": last_trade_day}}, {"str_day": {"$lte": str_day}}]}
+
+    position_stock_df = mongodb_util.find_query_data(db_name_constant.POSITION_STOCK, query)
+    if data_frame_util.is_not_empty(position_stock_df):
+        stock_list = set(position_stock_df['symbol'])
+    else:
+        stock_list = set([])
     trade_stocks_df = mongodb_util.find_query_data(db_name_constant.BUY_STOCK_NAME, query)
-    ths_cookie = get_ths_cookie()
     if data_frame_util.is_not_empty(trade_stocks_df):
-        for stock_one in trade_stocks_df.itertuples():
-            ths_self_choose_api.add_stock_to_account(stock_one.symbol, ths_cookie)
+        stock_list = stock_list.union(set(trade_stocks_df['symbol']))
+    if len(stock_list) > 0:
+        for symbol in stock_list:
+            ths_self_choose_api.add_stock_to_account(symbol, ths_cookie)
 
 
 # 添加连板到自选
-def add_continue_boards_zt_stocks():
-    ths_cookie = get_ths_cookie()
+def add_continue_boards_zt_stocks(ths_cookie):
     now_date = datetime.now()
     str_day = now_date.strftime('%Y-%m-%d')
     if trade_date_common_service_api.is_trade_day(str_day):
-        ths_stock_zt_pool_df = ths_stock_zt_pool_api.get_zt_reason(None)
+        query = {'str_day': str_day}
+        stock_zt_pool_df = mongodb_util.find_query_data(db_name_constant.STOCK_ZT_POOL, query)
+        if data_frame_util.is_empty(stock_zt_pool_df):
+            str_day = trade_date_common_service_api.get_before_trade_date(str_day, 2)
+            query = {'str_day': str_day}
+            stock_zt_pool_df = mongodb_util.find_query_data(db_name_constant.STOCK_ZT_POOL, query)
     else:
         str_day = trade_date_common_service_api.get_last_trade_day(str_day)
-        ths_stock_zt_pool_df = ths_stock_zt_pool_api.get_zt_reason(str_day)
-    ths_stock_zt_pool_df = ths_stock_zt_pool_df.loc[ths_stock_zt_pool_df['connected_boards_numbers'] > 1]
-    ths_stock_zt_pool_df = common_service_fun_api.exclude_st_symbol(ths_stock_zt_pool_df)
-    ths_stock_zt_pool_df = ths_stock_zt_pool_df.sort_values(by=['connected_boards_numbers'], ascending=False)
-    for stock_one in ths_stock_zt_pool_df.itertuples():
+        query = {'str_day': str_day}
+        stock_zt_pool_df = mongodb_util.find_query_data(db_name_constant.STOCK_ZT_POOL, query)
+    stock_zt_pool_df = stock_zt_pool_df.loc[stock_zt_pool_df['connected_boards_numbers'] >= 3]
+    stock_zt_pool_df = common_service_fun_api.exclude_st_symbol(stock_zt_pool_df)
+    stock_zt_pool_df = stock_zt_pool_df.sort_values(by=['connected_boards_numbers'], ascending=False)
+    for stock_one in stock_zt_pool_df.itertuples():
         ths_self_choose_api.add_stock_to_account(stock_one.symbol, ths_cookie)
 
 
+# 添加主线龙头
+def add_main_line_leader(ths_cookie):
+    main_line_leader_df = mongodb_util.find_query_data('main_line_leader', {})
+    if data_frame_util.is_not_empty(main_line_leader_df):
+        main_line_leader_df = count_main_line_number(main_line_leader_df)
+
+        main_line_leader_df = main_line_leader_df.sort_values(
+            by=['main_line_number', 'main_line_leader_grade'],
+            ascending=[False, False,]
+        )
+        for stock_one in main_line_leader_df.itertuples():
+            ths_self_choose_api.add_stock_to_account(stock_one.symbol, ths_cookie)
+
+
+# 统计主线的数量
+def count_main_line_number(main_line_detail_df):
+    # 统计主线的数量
+    main_line_detail_df['main_line_number'] = main_line_detail_df.groupby('main_line')['main_line'].transform(
+        'count')
+    # 相同主线数量 数量加1
+    main_line_detail_df['main_line_number'] = (
+                                                      main_line_detail_df.groupby('main_line_number')['main_line']
+                                                      .transform('rank', method='dense') - 1
+                                              ) * 0.1 + main_line_detail_df['main_line_number']
+
+    return main_line_detail_df
+
+
 # 自选股操作 删除当天自选股 增加新的连板股票  添加固定选择自选
 def self_choose_stock_handle():
-    delete_all_self_choose_stocks()
-    # 自己买入的股票
-    add_trade_stocks()
-    # 本地自选
-    add_self_choose_local()
+    ths_cookie = cookie_info_service.get_ths_cookie()
+
+    delete_all_self_choose_stocks(ths_cookie)
+    # 固定自选板块
+    # add_fixed_optional()
+    # 添加同花顺概念
+    add_self_choose_concept(ths_cookie)
+    # 添加主线龙头
+    add_main_line_leader(ths_cookie)
     # 连板股票
-    # add_continue_boards_zt_stocks()
-    # 固定自选
-    add_fixed_optional()
+    add_continue_boards_zt_stocks(ths_cookie)
+
+    # 自己买入的股票
+    add_trade_stocks(ths_cookie)
+    # 添加自选股票
+    add_self_choose_symbol(ths_cookie)
 
 
 if __name__ == '__main__':
+    # add_continue_boards_zt_stocks()
     self_choose_stock_handle()

mns_scheduler/trade/auto_login/trader_auto_service.py

@@ -2,12 +2,13 @@ import sys
 import os
 
 file_path = os.path.abspath(__file__)
-end = file_path.index('mns') + 16
+end = file_path.index('mns') + 17
 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
+from loguru import logger
 
 
 # qmt 自动登录
@@ -21,10 +22,12 @@ 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__':
-    auto_login()
+    qmt_auto_login()

mns_scheduler/trade/auto_sell_service_api.py

@@ -2,7 +2,7 @@ import os
 import sys
 
 file_path = os.path.abspath(__file__)
-end = file_path.index('mns') + 16
+end = file_path.index('mns') + 17
 project_path = file_path[0:end]
 sys.path.append(project_path)
 
@@ -109,10 +109,10 @@ def update_position_status(symbol, sell_entrust_no, str_day):
     mongodb_util.update_many(update_query, new_values, db_name_constant.POSITION_STOCK)
 
 
-import mns_common.api.em.east_money_stock_api as east_money_stock_api
+import mns_common.component.em.em_stock_info_api as em_stock_info_api
 
 if __name__ == '__main__':
     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)
+         real_time_quotes_now = em_stock_info_api.get_a_stock_info()
+         auto_sell_stock(real_time_quotes_now)

mns_scheduler/trade/balance/__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)