mns-scheduler 1.4.0.2__py3-none-any.whl → 1.4.3.3__py3-none-any.whl

mns_scheduler/company_info/base/sync_company_base_info_api.py

@@ -34,67 +34,6 @@ result_lock = threading.Lock()
 result = []
 
 
-# 计算实际流通比例
-def calculate_circulation_ratio(symbol):
-    query = {"symbol": symbol}
-    stock_gdfx_free_top_10 = mongodb_util.descend_query(query, 'stock_gdfx_free_top_10', "period", 10)
-    if stock_gdfx_free_top_10.shape[0] == 0:
-        mv_circulation_ratio = 1
-    else:
-        # 排除香港结算公司 大于5%减持不用发公告  香港中央结算    HKSCC
-        stock_gdfx_free_top_10['is_hk'] = stock_gdfx_free_top_10['shareholder_name'].apply(
-            lambda shareholder_name: "HK" if shareholder_name.startswith('香港中央结算') or shareholder_name.startswith(
-                'HKSCC') else "A")
-
-        # 持股大于5%      # 排除香港结算公司 大于5%减持不用发公告  香港中央结算    HKSCC
-        stock_gdfx_free_top_10 = stock_gdfx_free_top_10.loc[
-            (stock_gdfx_free_top_10['circulation_ratio'] >= 5) & (stock_gdfx_free_top_10['is_hk'] == 'A')]
-
-        circulation_ratio = sum(stock_gdfx_free_top_10['circulation_ratio'])
-        mv_circulation_ratio = round((100 - circulation_ratio) / 100, 2)
-        # 防止错误数据
-        if mv_circulation_ratio < 0:
-            mv_circulation_ratio = 1
-    return mv_circulation_ratio
-
-
-def get_east_money_stock_info():
-    all_real_time_quotes = em_stock_info_api.get_a_stock_info()
-    all_real_time_quotes = all_real_time_quotes[['symbol',
-                                                 'name',
-                                                 "now_price",
-                                                 'total_mv',
-                                                 'flow_mv',
-                                                 'pe_ttm',
-                                                 'sz_sh',
-                                                 'area',
-                                                 'pb',
-                                                 'list_date',
-                                                 'ROE',
-                                                 'total_share',
-                                                 'flow_share',
-                                                 'industry',
-                                                 'amount',
-                                                 "hk_stock_code",
-                                                 "hk_stock_name",
-                                                 'concept']]
-
-    return all_real_time_quotes
-
-
-def create_index():
-    mongodb_util.create_index('company_info',
-                              [("classification", 1)])
-    mongodb_util.create_index('company_info',
-                              [("industry", 1)])
-    mongodb_util.create_index('company_info',
-                              [("flow_mv", 1)])
-    mongodb_util.create_index('company_info',
-                              [("list_date", 1)])
-    mongodb_util.create_index('company_info',
-                              [("symbol", 1)])
-
-
 # 同步公司基本信息
 
 def sync_company_base_info(symbol_list):
@@ -102,6 +41,8 @@ def sync_company_base_info(symbol_list):
     result = []
     create_index()
     east_money_stock_info = get_east_money_stock_info()
+    east_money_stock_info = east_money_stock_info.sort_values(by=['list_date'], ascending=False)
+
     de_listed_stock_list = company_common_service_api.get_de_list_company()
     east_money_stock_info = east_money_stock_info.loc[~(
         east_money_stock_info['symbol'].isin(de_listed_stock_list))]
@@ -145,6 +86,30 @@ def sync_company_base_info(symbol_list):
     single_thread_sync_company_info(fail_df, kpl_real_time_quotes, exist_company_df)
 
 
+def get_east_money_stock_info():
+    all_real_time_quotes = em_stock_info_api.get_a_stock_info()
+    all_real_time_quotes = all_real_time_quotes[['symbol',
+                                                 'name',
+                                                 "now_price",
+                                                 'total_mv',
+                                                 'flow_mv',
+                                                 'pe_ttm',
+                                                 'sz_sh',
+                                                 'area',
+                                                 'pb',
+                                                 'list_date',
+                                                 'ROE',
+                                                 'total_share',
+                                                 'flow_share',
+                                                 'industry',
+                                                 'amount',
+                                                 "hk_stock_code",
+                                                 "hk_stock_name",
+                                                 'concept']]
+
+    return all_real_time_quotes
+
+
 def single_thread_sync_company_info(east_money_stock_info,
                                     kpl_real_time_quotes, exist_company_df):
     global result
@@ -201,12 +166,23 @@ def single_thread_sync_company_info(east_money_stock_info,
             company_info_type['total_mv_sp'] = company_one.total_mv_sp
             company_info_type['flow_mv_level'] = company_one.flow_mv_level
             company_info_type['classification'] = company_one.classification
-            company_info_type['mv_circulation_ratio'] = calculate_circulation_ratio(company_one.symbol)
-            # 获取同花顺最新概念
-            company_info_type = ths_concept_common_service_api.set_ths_concept(company_one.symbol, company_info_type)
+
             now_date = datetime.now()
             str_now_date = now_date.strftime('%Y-%m-%d %H:%M:%S')
+
+            now_str_day = now_date.strftime('%Y-%m-%d')
             company_info_type['sync_date'] = str_now_date
+
+            result_dict = calculate_circulation_ratio(company_one.symbol, now_str_day)
+
+            company_info_type['mv_circulation_ratio'] = result_dict['mv_circulation_ratio']
+            company_info_type['qfii_type'] = result_dict['qfii_type']
+            company_info_type['qfii_number'] = result_dict['qfii_number']
+            company_info_type['share_holder_sync_day'] = result_dict['share_holder_sync_day']
+
+            # 获取同花顺最新概念
+            company_info_type = ths_concept_common_service_api.set_ths_concept(company_one.symbol, company_info_type)
+
             fix_symbol_industry_df = company_constant_data.get_fix_symbol_industry()
             if company_one.symbol in list(fix_symbol_industry_df['symbol']):
                 # fix sw_industry
@@ -257,6 +233,113 @@ def single_thread_sync_company_info(east_money_stock_info,
         result = fail_list
 
 
+# 计算实际流通比例
+def calculate_circulation_ratio(symbol, now_str_day):
+    query = {"symbol": symbol}
+    stock_gdfx_free_top_1 = mongodb_util.descend_query(query, 'stock_gdfx_free_top_10', "period", 1)
+    if stock_gdfx_free_top_1.shape[0] == 0:
+        mv_circulation_ratio = 1
+        qfii_number = 0
+        qfii_type = 'A股'
+        share_holder_sync_day = now_str_day
+    else:
+        period_time = list(stock_gdfx_free_top_1['period'])[0]
+
+        query_free = {'symbol': symbol, 'period': period_time}
+        stock_gdfx_free_top_10 = mongodb_util.find_query_data('stock_gdfx_free_top_10', query_free)
+
+        stock_gdfx_free_top_10['shares_number_str'] = stock_gdfx_free_top_10['shares_number'].astype(str)
+
+        stock_gdfx_free_top_10['id_key'] = stock_gdfx_free_top_10['symbol'] + '_' + stock_gdfx_free_top_10[
+            'period'] + '_' + stock_gdfx_free_top_10.shares_number_str
+
+        stock_gdfx_free_top_10.drop_duplicates('id_key', keep='last', inplace=True)
+
+        # 排除香港结算公司 大于5%减持不用发公告  香港中央结算    HKSCC
+        stock_gdfx_free_top_10['is_hk'] = stock_gdfx_free_top_10['shareholder_name'].apply(
+            lambda shareholder_name: "HK" if shareholder_name.startswith('香港中央结算') or shareholder_name.startswith(
+                'HKSCC') else "A")
+
+        # 持股大于5% 减持需要发公告
+        # 排除香港结算公司不发公共 小于5%减持不用发公告
+        # 香港中央结算    HKSCC
+        stock_free_top_greater_than_5 = stock_gdfx_free_top_10.loc[
+            (stock_gdfx_free_top_10['circulation_ratio'] >= 5) & (stock_gdfx_free_top_10['is_hk'] == 'A')]
+
+        stock_free_qfii = stock_gdfx_free_top_10.loc[stock_gdfx_free_top_10['shareholder_nature'] == 'QFII']
+
+        share_holder_sync_day = list(stock_gdfx_free_top_10['create_day'])[0]
+
+        # qfii 数量
+        qfii_number = stock_free_qfii.shape[0]
+        # qfii 类型
+        qfii_type = set_qfii_type(qfii_number, stock_free_qfii.copy())
+
+        circulation_ratio = sum(stock_free_top_greater_than_5['circulation_ratio'])
+        mv_circulation_ratio = round((100 - circulation_ratio) / 100, 2)
+        # 防止错误数据
+        if mv_circulation_ratio < 0:
+            mv_circulation_ratio = 1
+
+    result_dict = {
+        'mv_circulation_ratio': mv_circulation_ratio,
+        'qfii_type': qfii_type,
+        'qfii_number': qfii_number,
+        'share_holder_sync_day': share_holder_sync_day
+
+    }
+    return result_dict
+
+
+def set_qfii_type(qfii_number, stock_free_qfii):
+    if qfii_number > 0:
+        stock_free_qfii['new_change'] = stock_free_qfii['change']
+        stock_free_qfii.loc[stock_free_qfii['change_ratio'] == 0, 'new_change'] = 0
+        stock_free_qfii.loc[stock_free_qfii['change'] == '新进', 'new_change'] = \
+            stock_free_qfii['shares_number']
+        stock_free_qfii['new_change'] = stock_free_qfii['new_change'].astype(float)
+
+        stock_free_qfii_new_in = stock_free_qfii.loc[stock_free_qfii['change'] == '新进']
+        if data_frame_util.is_not_empty(stock_free_qfii_new_in):
+            qfii_type = 1
+            return qfii_type
+
+        stock_free_qfii_add = stock_free_qfii.loc[
+            (~stock_free_qfii['change'].isin(['不变', '新进'])) & (stock_free_qfii['new_change'] > 0)]
+
+        if data_frame_util.is_not_empty(stock_free_qfii_add):
+            qfii_type = 2
+            return qfii_type
+
+        stock_free_qfii_not_change = stock_free_qfii.loc[stock_free_qfii['change'] == '不变']
+
+        if data_frame_util.is_not_empty(stock_free_qfii_not_change):
+            qfii_type = 3
+            return qfii_type
+
+        stock_free_qfii_reduce = stock_free_qfii.loc[
+            (~stock_free_qfii['change'].isin(['不变', '新进'])) & (stock_free_qfii['new_change'] < 0)]
+
+        if data_frame_util.is_not_empty(stock_free_qfii_reduce):
+            qfii_type = 4
+            return qfii_type
+    else:
+        return 0
+
+
+def create_index():
+    mongodb_util.create_index('company_info',
+                              [("classification", 1)])
+    mongodb_util.create_index('company_info',
+                              [("industry", 1)])
+    mongodb_util.create_index('company_info',
+                              [("flow_mv", 1)])
+    mongodb_util.create_index('company_info',
+                              [("list_date", 1)])
+    mongodb_util.create_index('company_info',
+                              [("symbol", 1)])
+
+
 def set_kpl_data(kpl_real_time_quotes_one, company_info_type, company_one):
     if data_frame_util.is_not_empty(kpl_real_time_quotes_one):
         company_info_type['kpl_plate_name'] = list(kpl_real_time_quotes_one['plate_name_list'])[0]
@@ -444,5 +527,5 @@ if __name__ == '__main__':
     # query = {"total_operate_income": 0}
     # un_report_company_info = mongodb_util.find_query_data(db_name_constant.COMPANY_INFO, query)
     # symbol_list = list(un_report_company_info['symbol'])
+    sync_company_base_info(['920009'])
     sync_company_base_info(None)
-    # group_by_industry()

mns_scheduler/company_info/base/sync_company_hold_info_api.py

@@ -27,11 +27,8 @@ def sync_company_hold_info(symbol):
         now_date = datetime.now()
         sync_str_date = now_date.strftime('%Y-%m-%d %H:%M:%S')
         if data_frame_util.is_not_empty(company_hold_info_df):
-            query = {'symbol': symbol}
-            result = mongodb_util.remove_data(query, db_name_constant.COMPANY_HOLDING_INFO)
-            if result.acknowledged:
-                company_hold_info_df['sync_str_date'] = sync_str_date
-                mongodb_util.insert_mongo(company_hold_info_df, db_name_constant.COMPANY_HOLDING_INFO)
+            company_hold_info_df['sync_str_date'] = sync_str_date
+            mongodb_util.insert_mongo(company_hold_info_df, db_name_constant.COMPANY_HOLDING_INFO)
     except BaseException as e:
         logger.error("同步公司控股子公司信息:{},{}", symbol, e)
 

mns_scheduler/company_info/base/sync_company_product_area_industry.py

@@ -49,11 +49,6 @@ def sync_company_product_area_industry(symbol, date):
         try:
             symbol = stock_one.symbol
 
-            if date is not None:
-                query_exist = {"symbol": symbol, "time": date}
-                if mongodb_util.exist_data_query(db_name_constant.COMPANY_BUSINESS_INFO, query_exist):
-                    continue
-
             classification = stock_one.classification
             if classification in ['H', 'K']:
                 market = '17'

mns_scheduler/company_info/clean/company_info_clean_api.py

@@ -47,7 +47,7 @@ def clean_company_info(symbol):
     company_info['company_type'] = company_info['business_nature']
 
     # 将list_date列中的所有NaN值设置为99990909
-    company_info.fillna({'list_date': 20990909.0}, inplace=True)
+    company_info.fillna({'list_date': 19890604}, inplace=True)
 
     # 将日期数值转换为日期时间格式
     company_info['list_date_01'] = pd.to_datetime(company_info['list_date'], format='%Y%m%d')

mns_scheduler/company_info/constant/company_constant_data.py

@@ -443,6 +443,9 @@ def filed_sort(company_info):
         "final_controller_name",
         "final_controller_rate",
         "mv_circulation_ratio",
+        'qfii_type',
+        'qfii_number',
+        'share_holder_sync_day',
         "flow_mv_sp",
         "total_mv_sp",
         "now_price",

mns_scheduler/company_info/em_stock_info/sync_em_stock_info_sync.py

@@ -6,66 +6,69 @@ end = file_path.index('mns') + 17
 project_path = file_path[0:end]
 sys.path.append(project_path)
 
-import mns_common.component.proxies.proxy_common_api as proxy_common_api
 from mns_common.db.MongodbUtil import MongodbUtil
 from loguru import logger
-import mns_common.api.em.real_time.east_money_stock_a_v2_api as east_money_stock_a_v2_api
 import mns_common.api.em.real_time.east_money_debt_api as east_money_debt_api
 import mns_common.api.em.real_time.east_money_etf_api as east_money_etf_api
-import mns_common.api.em.real_time.east_money_stock_hk_api as east_money_stock_hk_api
+import mns_common.api.em.real_time.east_money_stock_a_v2_api as east_money_stock_a_v2_api
+from datetime import datetime
 import mns_common.constant.extra_income_db_name as extra_income_db_name
+import mns_common.api.em.real_time.east_money_stock_hk_api as east_money_stock_hk_api
 import mns_common.component.cookie.cookie_info_service as cookie_info_service
-
 import mns_common.api.em.real_time.east_money_stock_us_api as east_money_stock_us_api
 
 mongodb_util = MongodbUtil('27017')
 
 
 def sync_all_em_stock_info():
+    now_date = datetime.now()
+    str_now_date = now_date.strftime('%Y-%m-%d %H:%M:%S')
+
     logger.info("同步东方财富a,etf,kzz,us,hk,信息开始")
-    proxy_ip = proxy_common_api.generate_proxy_ip_api(5)
-    proxies = {"https": proxy_ip}
+
     try:
         # 这里需要使用详情接口 获取全量数据
-        em_a_stock_info_df = east_money_stock_a_v2_api.get_all_real_time_quotes(proxies)
+        em_a_stock_info_df = east_money_stock_a_v2_api.get_stock_real_time_quotes(60)
+        em_a_stock_info_df['list_date'] = em_a_stock_info_df['list_date'].fillna(19890604)
         em_a_stock_info_df['_id'] = em_a_stock_info_df['symbol']
+        em_a_stock_info_df['sync_time'] = str_now_date
         mongodb_util.save_mongo(em_a_stock_info_df, extra_income_db_name.EM_A_STOCK_INFO)
     except BaseException as e:
         logger.error("同步东方财富A股信息异常:{}", e)
     try:
-        em_etf_info = east_money_etf_api.get_etf_real_time_quotes(proxies)
-        em_etf_info['_id'] = em_etf_info['symbol']
+        em_etf_info = east_money_etf_api.get_etf_real_time_quotes(30, 6)
+        em_etf_info['sync_time'] = str_now_date
         mongodb_util.save_mongo(em_etf_info, extra_income_db_name.EM_ETF_INFO)
     except BaseException as e:
         logger.error("同步东方财富ETF信息异常:{}", e)
 
     try:
-        em_kzz_info = east_money_debt_api.get_debt_real_time_quotes(proxies)
-
+        em_kzz_info = east_money_debt_api.get_kzz_real_time_quotes(30, 6)
         em_kzz_info['_id'] = em_kzz_info['symbol']
+        em_kzz_info['sync_time'] = str_now_date
         mongodb_util.save_mongo(em_kzz_info, extra_income_db_name.EM_KZZ_INFO)
     except BaseException as e:
         logger.error("同步东方财富可转债信息异常:{}", e)
 
-    em_cookie = cookie_info_service.get_em_cookie()
-    try:
-        em_hk_stock_info = east_money_stock_hk_api.get_hk_real_time_quotes(em_cookie, proxies)
-        em_hk_stock_info['_id'] = em_hk_stock_info['symbol']
-        mongodb_util.save_mongo(em_hk_stock_info, extra_income_db_name.EM_HK_STOCK_INFO)
-    except BaseException as e:
-        logger.error("同步东方财富港股信息异常:{}", e)
-
-    try:
-        em_cookie = cookie_info_service.get_em_cookie()
-        em_us_stock_info = east_money_stock_us_api.get_us_stock_real_time_quotes(em_cookie, proxies)
-        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.sort_values(by=['amount'], ascending=False)
-        mongodb_util.save_mongo(em_us_etf_info, extra_income_db_name.EM_US_ETF_INFO)
-
-    except BaseException as e:
-        logger.error("同步东方财富美股信息异常:{}", e)
+    # em_cookie = cookie_info_service.get_em_cookie()
+    # try:
+    #     em_hk_stock_info = east_money_stock_hk_api.get_hk_real_time_quotes(em_cookie, proxies)
+    #     em_hk_stock_info['_id'] = em_hk_stock_info['symbol']
+    #     mongodb_util.save_mongo(em_hk_stock_info, extra_income_db_name.EM_HK_STOCK_INFO)
+    # except BaseException as e:
+    #     logger.error("同步东方财富港股信息异常:{}", e)
+    #
+    # try:
+    #     em_cookie = cookie_info_service.get_em_cookie()
+    #     em_us_stock_info = east_money_stock_us_api.get_us_stock_real_time_quotes(em_cookie, proxies)
+    #     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.sort_values(by=['amount'], ascending=False)
+    #     mongodb_util.save_mongo(em_us_etf_info, extra_income_db_name.EM_US_ETF_INFO)
+    #
+    # except BaseException as e:
+    #     logger.error("同步东方财富美股信息异常:{}", e)
     logger.info("同步东方财富a,etf,kzz,us,hk,信息完成")
 
 

mns_scheduler/finance/xue_qiu/sync_xue_qiu_fiance_data.py

@@ -16,6 +16,7 @@ import time
 import mns_common.utils.data_frame_util as data_frame_util
 import mns_common.component.cookie.cookie_info_service as cookie_info_service
 from datetime import datetime
+import mns_common.component.em.em_stock_info_api as em_stock_info_api
 
 mongodb_util_27017 = MongodbUtil('27017')
 
@@ -25,9 +26,7 @@ mongodb_util_27017 = MongodbUtil('27017')
 # balance 资产负债
 # 同步所有股票 报表
 def sync_all_stocks_report():
-    em_a_stock_info_df = mongodb_util_27017.find_all_data('em_a_stock_info')
-    em_a_stock_info_df = em_a_stock_info_df[~em_a_stock_info_df['symbol'].astype(str).str.startswith(('8', '4'))]
-
+    em_a_stock_info_df = em_stock_info_api.get_a_stock_info()
     em_a_stock_info_df = common_service_fun_api.add_pre_prefix(em_a_stock_info_df)
     # 或等效写法 df['A'].str[0:6]
 
@@ -124,7 +123,7 @@ def save_one_symbol_data(stock_one, report_type_list, xue_qiu_cookie, save_tag,
 
             if symbol in fail_list:
                 fail_list.remove(symbol)
-        logger.info("同步完成数据:{}:{}", symbol, name)
+        logger.info("同步财务数据完成:{}:{}", symbol, name, report_name)
     except BaseException as e:
         logger.error("同步错误:{},异常信息:{}", symbol, e)
         fail_list.append(symbol)
@@ -132,7 +131,7 @@ def save_one_symbol_data(stock_one, report_type_list, xue_qiu_cookie, save_tag,
 
 
 def sync_xue_qiu_very_period_report(report_name, symbol):
-    em_a_stock_info_df = mongodb_util_27017.find_all_data('em_a_stock_info')
+    em_a_stock_info_df = em_stock_info_api.get_a_stock_info()
     if symbol is not None:
         em_a_stock_info_df = em_a_stock_info_df.loc[em_a_stock_info_df['symbol'] == symbol]
     em_a_stock_info_df = common_service_fun_api.add_pre_prefix(em_a_stock_info_df)

mns_scheduler/irm/stock_irm_cninfo_service.py

@@ -130,7 +130,7 @@ def sync_symbols_interactive_questions(symbol_list):
     real_time_quotes_all_stocks = common_service_fun_api.classify_symbol(real_time_quotes_all_stocks)
     real_time_quotes_all_stocks = real_time_quotes_all_stocks.sort_values(by=['chg'], ascending=False)
     fail_symbol_list = []
-    if symbol_list is not None:
+    if len(symbol_list) != 0:
         real_time_quotes_all_stocks = real_time_quotes_all_stocks.loc[
             real_time_quotes_all_stocks['symbol'].isin(symbol_list)]
     for stock_one in real_time_quotes_all_stocks.itertuples():
@@ -193,7 +193,8 @@ def save_new_data(stock_irm_cninfo_df):
 
 
 if __name__ == '__main__':
+    sync_symbols_interactive_questions([])
     get_stock_irm_cninfo_sh_api('688778')
     fail_symbol_list_01 = ['000638', '002886', '688778', '688766', '688733', '688778', '688793', '688787']
     # get_stock_irm_cninfo_sh_api('603633')
-    sync_symbols_interactive_questions(fail_symbol_list_01)
+    # sync_symbols_interactive_questions(None)

mns_scheduler/k_line/clean/k_line_info_clean_task.py

@@ -113,8 +113,9 @@ def multi_threaded_k_line_sync(str_day):
     real_time_quotes_now = real_time_quotes_now.loc[
         ~(real_time_quotes_now['symbol'].isin(de_list_company_df['symbol']))]
 
-    # 将list_date列中的所有NaN值设置为99990909
-    real_time_quotes_now['list_date'].fillna(20990909.0, inplace=True)
+    # 将list_date列中的所有NaN值设置为19890604
+    real_time_quotes_now['list_date'].fillna(19890604, inplace=True)
+    real_time_quotes_now['list_date'] = real_time_quotes_now['list_date'].replace(99990909, 19890604)
 
     # 将日期数值转换为日期时间格式
     real_time_quotes_now['list_date_01'] = pd.to_datetime(real_time_quotes_now['list_date'], format='%Y%m%d')
@@ -198,3 +199,7 @@ def create_k_line_index():
     mongodb_util.create_index('k_line_info', [("symbol", 1)])
     mongodb_util.create_index('k_line_info', [("str_day", 1)])
     mongodb_util.create_index('k_line_info', [("str_day", 1), ("symbol", 1)])
+
+
+if __name__ == '__main__':
+    sync_k_line_info_task('2025-11-13')

mns_scheduler/risk/transactions/transactions_check_api.py

@@ -49,7 +49,7 @@ def transactions_check_task():
     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(99999999)
+    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)

mns_scheduler/self_choose/ths_self_choose_service.py

@@ -40,9 +40,6 @@ mongodb_util = MongodbUtil('27017')
 fixed_optional_list = ['899050', '881157']
 
 
-
-
-
 def add_fixed_optional():
     ths_cookie = cookie_info_service.get_ths_cookie()
     for symbol in fixed_optional_list:
@@ -50,15 +47,16 @@ def add_fixed_optional():
 
 
 def delete_all_self_choose_stocks():
-    ths_cookie =  cookie_info_service.get_ths_cookie()
+    ths_cookie = cookie_info_service.get_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 =  cookie_info_service.get_ths_cookie()
+# 添加固定自选股票
+def add_self_choose_symbol():
+    ths_cookie = cookie_info_service.get_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):
@@ -66,6 +64,10 @@ def add_self_choose_local():
         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 = cookie_info_service.get_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)
@@ -77,6 +79,10 @@ def add_self_choose_local():
         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 = cookie_info_service.get_ths_cookie()
     query_plate = {'self_type': {
         "$in": [self_choose_constant.SELF_CHOOSE_THS_CONCEPT,
                 self_choose_constant.SELF_CHOOSE_THS_INDUSTRY]}}
@@ -103,7 +109,7 @@ def add_trade_stocks():
     trade_stocks_df = mongodb_util.find_query_data(db_name_constant.BUY_STOCK_NAME, query)
     if data_frame_util.is_not_empty(trade_stocks_df):
         stock_list = stock_list.union(set(trade_stocks_df['symbol']))
-    ths_cookie =  cookie_info_service.get_ths_cookie()
+    ths_cookie = cookie_info_service.get_ths_cookie()
     if len(stock_list) > 0:
         for symbol in stock_list:
             ths_self_choose_api.add_stock_to_account(symbol, ths_cookie)
@@ -111,7 +117,7 @@ def add_trade_stocks():
 
 # 添加连板到自选
 def add_continue_boards_zt_stocks():
-    ths_cookie =  cookie_info_service.get_ths_cookie()
+    ths_cookie = cookie_info_service.get_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):
@@ -135,14 +141,16 @@ def add_continue_boards_zt_stocks():
 # 自选股操作 删除当天自选股 增加新的连板股票  添加固定选择自选
 def self_choose_stock_handle():
     delete_all_self_choose_stocks()
-    # 固定自选
+    # 固定自选板块
     add_fixed_optional()
-    # 自己买入的股票
-    add_trade_stocks()
-    # 本地自选
-    add_self_choose_local()
+    # 添加同花顺概念
+    add_self_choose_concept()
     # 连板股票
     add_continue_boards_zt_stocks()
+    # 自己买入的股票
+    add_trade_stocks()
+    # 添加自选股票
+    add_self_choose_symbol()
 
 
 if __name__ == '__main__':

mns_scheduler/trade/sync_position_api.py

@@ -9,16 +9,16 @@ import mns_common.component.deal.deal_service_api as deal_service_api
 import pandas as pd
 import mns_common.utils.data_frame_util as data_frame_util
 import mns_common.constant.db_name_constant as db_name_constant
-import datetime
-
+from datetime import datetime
+from mns_common.component.deal.terminal_enum import TerminalEnum
 from mns_common.db.MongodbUtil import MongodbUtil
 
 mongodb_util = MongodbUtil('27017')
 
 
 # 同步持仓
-def sync_position():
-    now_date = datetime.datetime.now()
+def sync_position_ths():
+    now_date = datetime.now()
     str_day = now_date.strftime('%Y-%m-%d')
     query_exist = {'str_day': str_day}
     if mongodb_util.exist_data_query(db_name_constant.POSITION_STOCK, query_exist):
@@ -52,5 +52,38 @@ def sync_position():
         mongodb_util.save_mongo(position_df, db_name_constant.POSITION_STOCK)
 
 
+def sync_position_qmt():
+    now_date = datetime.now()
+    str_day = now_date.strftime('%Y-%m-%d')
+    query_exist = {'str_day': str_day}
+    # if mongodb_util.exist_data_query(db_name_constant.POSITION_STOCK, query_exist):
+    #     return None
+    position_list = deal_service_api.get_position(TerminalEnum.QMT.terminal_code)
+    if len(position_list) == 0:
+        return None
+    position_df = pd.DataFrame(position_list)
+    position_df = position_df.rename(columns={
+        "stock_code": "symbol",
+        "avg_price": "cost_price",
+        "profit_loss": "floating_profit_loss",
+        "market_value": "flow_mv",
+        "can_use_volume": "available_position",
+        "frozen_volume": "frozen_position",
+    })
+
+    position_df['cost_price'] = round(position_df['cost_price'], 2)
+    position_df['open_price'] = round(position_df['open_price'], 2)
+
+    position_df['open_position'] = position_df['available_position'] + position_df['frozen_position'] + position_df[
+        'on_road_volume']
+
+    position_df['symbol'] = position_df['symbol'].str.slice(0, 6)
+
+    position_df["_id"] = position_df['symbol'] + '-' + str_day
+    position_df["str_day"] = str_day
+    position_df["valid"] = True
+    mongodb_util.save_mongo(position_df, db_name_constant.POSITION_STOCK)
+
+
 if __name__ == '__main__':
-    sync_position()
+    sync_position_qmt()

mns_scheduler/zb/stock_zb_pool_sync.py

@@ -27,4 +27,4 @@ def sync_stock_zb_pool(str_now_day):
 
 
 if __name__ == '__main__':
-    sync_stock_zb_pool('2025-04-18')
+    sync_stock_zb_pool('2025-11-18')