mns-scheduler 1.1.0.2__py3-none-any.whl → 1.1.0.4__py3-none-any.whl

mns_scheduler/backup/em/em_new_concept_sync_common_api.py

@@ -110,7 +110,7 @@ def save_ths_concept_detail(new_concept_symbol_df, concept_name, str_day, str_no
     query_company_info = {'symbol': {'$in': new_concept_symbol_list}}
     query_field = {"first_industry": 1, "first_industry": 1, "industry": 1, "company_type": 1, "flow_mv_sp": 1,
                    "total_mv_sp": 1}
-    company_info = mongodb_util.find_query_data_choose_field('company_info', query_company_info, query_field)
+    company_info = mongodb_util.find_query_data_choose_field('base', query_company_info, query_field)
 
     company_info = company_info.set_index(['_id'], drop=True)
     new_concept_symbol_df = new_concept_symbol_df.set_index(['symbol'], drop=False)

mns_scheduler/company_info/base/__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/company_info/{company_info_sync_api.py → base/sync_company_base_info_api.py}

@@ -11,7 +11,7 @@ import pandas as pd
 from loguru import logger
 import mns_common.api.ths.concept.web.ths_company_info_web as ths_company_info_web
 import mns_common.api.em.east_money_stock_v2_api as east_money_stock_v2_api
-import mns_scheduler.company_info.company_constant_data as company_constant_data_api
+import mns_scheduler.company_info.constant.company_constant_data as company_constant_data
 import mns_common.component.common_service_fun_api as common_service_fun_api
 import mns_common.component.concept.ths_concept_common_service_api as ths_concept_common_service_api
 from mns_common.db.MongodbUtil import MongodbUtil
@@ -21,11 +21,10 @@ import mns_common.api.kpl.constant.kpl_constant as kpl_constant
 import mns_common.component.company.company_common_service_api as company_common_service_api
 import mns_common.component.k_line.common.k_line_common_service_api as k_line_common_service_api
 import mns_common.constant.db_name_constant as db_name_constant
-import mns_scheduler.concept.common.detaill.ths_concept_detail_api as ths_concept_detail_api
 
 mongodb_util = MongodbUtil('27017')
 # 分页大小
-MAX_PAGE_NUMBER = 6000
+MAX_PAGE_NUMBER = 2000
 import threading
 
 # 定义一个全局锁，用于保护 result 变量的访问
@@ -58,60 +57,6 @@ def calculate_circu_ratio(symbol):
     return mv_circulation_ratio
 
 
-def filed_sort(company_info):
-    return company_info[[
-        "_id",
-        "name",
-        "industry",
-        "first_sw_industry",
-        "first_industry_code",
-        "second_sw_industry",
-        "second_industry_code",
-        "third_sw_industry",
-        "third_industry_code",
-        "ths_concept_name",
-        "ths_concept_code",
-        "ths_concept_sync_day",
-        "em_industry",
-        "em_concept",
-        "business_nature",
-        "actual_controller_name",
-        "actual_controller_rate",
-        "final_controller_name",
-        "final_controller_rate",
-        "mv_circulation_ratio",
-        "flow_mv_sp",
-        "total_mv_sp",
-        "now_price",
-        "total_share",
-        "flow_share",
-        "total_mv",
-        "flow_mv",
-        "flow_mv_level",
-        "holder_controller_name",
-        "holder_controller_rate",
-        "area",
-        "list_date",
-        "deal_days",
-        "pe_ttm",
-        "pb",
-        "ROE",
-        "classification",
-        "base_business",
-        "address",
-        "market_id",
-        "symbol",
-        "amount",
-        "sync_date",
-        "ths_concept_list_info",
-        "kpl_plate_name",
-        "kpl_most_relative_name",
-        "kpl_plate_list_info",
-        'operate_profit',
-        'total_operate_income'
-    ]]
-
-
 def get_east_money_stock_info():
     all_real_time_quotes = east_money_stock_v2_api.get_all_real_time_quotes()
     all_real_time_quotes = all_real_time_quotes[['symbol',
@@ -147,81 +92,7 @@ def create_index():
                               [("symbol", 1)])
 
 
-# 修改行业信息
-def fix_company_industry(symbol):
-    if symbol is not None:
-        query = {"symbol": symbol}
-        company_info = mongodb_util.find_query_data('company_info_base', query)
-    else:
-        company_info = mongodb_util.find_all_data('company_info_base')
-
-    company_info = company_info.set_index(['second_sw_industry'], drop=False)
-    del company_info['industry']
-    # fix industry  name
-    industry_final_fix_df = company_constant_data_api.get_industry_final_fix_df()
-    industry_final_fix_df = industry_final_fix_df.set_index(['second_sw_industry'], drop=True)
-    company_info = pd.merge(company_info, industry_final_fix_df, how='outer',
-                            left_index=True, right_index=True)
-    # 将申万第三行业做为行业
-    company_info = company_constant_data_api.fix_industry_use_sw_third(company_info.copy())
-    company_info['industry'] = company_info['industry'].fillna('综合')
-    company_info = filed_sort(company_info)
-    company_info['company_type'] = company_info['business_nature']
-
-    # 将list_date列中的所有NaN值设置为99990909
-    company_info['list_date'].fillna(20990909.0, inplace=True)
-
-    # 将日期数值转换为日期时间格式
-    company_info['list_date_01'] = pd.to_datetime(company_info['list_date'], format='%Y%m%d')
-
-    company_info['list_date'] = company_info['list_date'].apply(
-        lambda x: pd.to_numeric(x, errors="coerce"))
-
-    now_date = datetime.now()
-
-    # 计算日期差值 距离现在上市时间
-    company_info['diff_days'] = company_info.apply(
-        lambda row: (now_date - row['list_date_01']).days, axis=1)
-
-    str_now_date = now_date.strftime('%Y-%m-%d %H:%M:%S')
-    company_info['sync_date'] = str_now_date
-
-    try:
-        # 次新股
-        sub_stock = ths_concept_detail_api.get_ths_concept_detail('885598', None)
-        sub_stock_symbol_list = list(sub_stock['symbol'])
-    except BaseException as e:
-        logger.error("出现异常:{},{}", symbol, e)
-        query = {'concept_code': 885598}
-        ths_stock_concept_detail = mongodb_util.find_query_data('ths_stock_concept_detail', query)
-        sub_stock_symbol_list = list(ths_stock_concept_detail['symbol'])
-    company_info.loc[:, 'sub_stock'] = False
-    company_info.loc[company_info['symbol'].isin(sub_stock_symbol_list), 'sub_stock'] = True
-
-    try:
-        company_info.dropna(subset=['symbol'], axis=0, inplace=True)
-        company_info.dropna(subset=['_id'], axis=0, inplace=True)
-        mongodb_util.save_mongo(company_info, db_name_constant.COMPANY_INFO)
-        # 保存历史数据
-        save_company_info_his(company_info)
-    except BaseException as e:
-        logger.error("出现异常:{},{}", symbol, e)
-
-    return company_info
-
-
-def save_company_info_his(company_info_df):
-    now_date = datetime.now()
-    str_day = now_date.strftime('%Y-%m-%d')
-    company_info_df['symbol'] = company_info_df['_id']
-    company_info_df['str_day'] = str_day
-    company_info_df['_id'] = company_info_df['_id'] + "_" + str_day
-    remove_query = {'str_day': str_day}
-    tag = mongodb_util.remove_data(remove_query, db_name_constant.COMPANY_INFO_HIS)
-    success = tag.acknowledged
-    if success:
-        mongodb_util.insert_mongo(company_info_df, db_name_constant.COMPANY_INFO_HIS)
-
+# 同步公司基本信息
 
 def sync_company_base_info(symbol_list):
     global result
@@ -250,12 +121,16 @@ def sync_company_base_info(symbol_list):
     page_number = round(count / MAX_PAGE_NUMBER, 0) + 1
     page_number = int(page_number)
     threads = []
+
+    exist_company_df = mongodb_util.find_all_data(db_name_constant.COMPANY_INFO)
+
     # 创建多个线程来获取数据
     for page in range(page_number):  # 0到100页
         end_count = (page + 1) * MAX_PAGE_NUMBER
         begin_count = page * MAX_PAGE_NUMBER
         page_df = east_money_stock_info.loc[begin_count:end_count]
-        thread = threading.Thread(target=single_thread_sync_company_info, args=(page_df, kpl_real_time_quotes))
+        thread = threading.Thread(target=single_thread_sync_company_info,
+                                  args=(page_df, kpl_real_time_quotes, exist_company_df))
         threads.append(thread)
         thread.start()
 
@@ -264,11 +139,11 @@ def sync_company_base_info(symbol_list):
         thread.join()
 
     fail_df = east_money_stock_info.loc[east_money_stock_info['symbol'].isin(result)]
-    single_thread_sync_company_info(fail_df, kpl_real_time_quotes)
+    single_thread_sync_company_info(fail_df, kpl_real_time_quotes, exist_company_df)
 
 
 def single_thread_sync_company_info(east_money_stock_info,
-                                    kpl_real_time_quotes):
+                                    kpl_real_time_quotes, exist_company_df):
     global result
     fail_list = []
     for company_one in east_money_stock_info.itertuples():
@@ -318,10 +193,10 @@ def single_thread_sync_company_info(east_money_stock_info,
             now_date = datetime.now()
             str_now_date = now_date.strftime('%Y-%m-%d %H:%M:%S')
             company_info_type['sync_date'] = str_now_date
-            fix_symbol_industry_df = company_constant_data_api.get_fix_symbol_industry()
+            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
-                company_info_type = company_constant_data_api.fix_symbol_industry(company_info_type, company_one.symbol)
+                company_info_type = company_constant_data.fix_symbol_industry(company_info_type, company_one.symbol)
 
             # todo fix industry
             company_info_type['industry'] = company_info_type['second_sw_industry']
@@ -334,8 +209,9 @@ def single_thread_sync_company_info(east_money_stock_info,
             str_day = now_date.strftime('%Y-%m-%d')
             deal_days = k_line_common_service_api.get_deal_days(str_day, company_one.symbol)
             company_info_type['deal_days'] = deal_days
+
             # 设置年报信息
-            company_info_type = get_recent_year_income(company_one.symbol, company_info_type)
+            company_info_type = get_recent_year_income(company_one.symbol, company_info_type, exist_company_df)
 
             try:
                 if data_frame_util.is_not_empty(kpl_real_time_quotes):
@@ -356,7 +232,7 @@ def single_thread_sync_company_info(east_money_stock_info,
             except BaseException as e:
                 logger.warning("设置开盘啦数据异常:{},{}", company_one.symbol, e)
 
-            company_info_type = filed_sort(company_info_type)
+            company_info_type = company_constant_data.filed_sort(company_info_type)
             mongodb_util.save_mongo(company_info_type.copy(), 'company_info_base')
             logger.info("同步公司信息完成:{}", company_one.symbol + '-' + company_one.name)
         except BaseException as e:
@@ -395,22 +271,12 @@ def set_kpl_data(kpl_real_time_quotes_one, company_info_type, company_one):
     return company_info_type
 
 
-# 更新新上市公司信息
-def new_company_info_update():
-    east_money_stock_info = get_east_money_stock_info()
-    new_stock = common_service_fun_api.get_new_stock(east_money_stock_info)
-    for company_one in new_stock.itertuples():
-        try:
-            sync_company_base_info([company_one.symbol])
-            fix_company_industry(company_one.symbol)
-
-        except BaseException as e:
-            logger.error("出现异常:{}", e)
-    company_common_service_api.company_info_industry_cache_clear
-
-
 # 保存申万行业分类
 def save_sw_data(company_info_type):
+    now_date = datetime.now()
+    hour = now_date.hour
+    if hour <= 15:
+        return company_info_type
     first_sw_info = company_info_type[[
         'first_sw_industry',
         'first_industry_code'
@@ -486,7 +352,18 @@ def save_sw_data(company_info_type):
 
 
 # 获取最近年报收入
-def get_recent_year_income(symbol, company_info_type):
+def get_recent_year_income(symbol, company_info_type, exist_company_df):
+    now_date = datetime.now()
+    hour = now_date.hour
+    if hour <= 15:
+        exist_company_one_df = exist_company_df.loc[exist_company_df['_id'] == symbol]
+        if data_frame_util.is_not_empty(exist_company_one_df):
+            company_info_type['operate_profit'] = list(exist_company_one_df['operate_profit'])[0]
+            company_info_type['total_operate_income'] = list(exist_company_one_df['total_operate_income'])[0]
+        else:
+            company_info_type['operate_profit'] = 0
+            company_info_type['total_operate_income'] = 0
+        return company_info_type
     query = {'symbol': symbol, "REPORT_TYPE": "年报"}
     em_stock_profit = mongodb_util.descend_query(query, db_name_constant.EM_STOCK_PROFIT, 'REPORT_DATE', 1)
     if data_frame_util.is_not_empty(em_stock_profit):
@@ -511,5 +388,4 @@ if __name__ == '__main__':
     # sync_company_base_info(None)
     # new_company_info_update()
     sync_company_base_info(None)
-    fix_company_industry(None)
     # group_by_industry()

mns_scheduler/company_info/clean/__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/company_info/clean/company_info_clean_api.py

@@ -0,0 +1,112 @@
+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
+import pandas as pd
+from datetime import datetime
+from loguru import logger
+import mns_scheduler.company_info.constant.company_constant_data as company_constant_data
+import mns_common.constant.db_name_constant as db_name_constant
+import mns_scheduler.concept.common.detaill.ths_concept_detail_api as ths_concept_detail_api
+import mns_scheduler.company_info.base.sync_company_base_info_api as company_info_sync_api
+
+mongodb_util = MongodbUtil('27017')
+import mns_common.component.common_service_fun_api as common_service_fun_api
+import mns_common.component.company.company_common_service_api as company_common_service_api
+
+
+
+
+
+# 修改行业信息
+def fix_company_industry(symbol):
+    if symbol is not None:
+        query = {"symbol": symbol}
+        company_info = mongodb_util.find_query_data('company_info_base', query)
+    else:
+        company_info = mongodb_util.find_all_data('company_info_base')
+
+    company_info = company_info.set_index(['second_sw_industry'], drop=False)
+    del company_info['industry']
+    # fix industry  name
+    industry_final_fix_df = company_constant_data.get_industry_final_fix_df()
+    industry_final_fix_df = industry_final_fix_df.set_index(['second_sw_industry'], drop=True)
+    company_info = pd.merge(company_info, industry_final_fix_df, how='outer',
+                            left_index=True, right_index=True)
+    # 将申万第三行业做为行业
+    company_info = company_constant_data.fix_industry_use_sw_third(company_info.copy())
+    company_info['industry'] = company_info['industry'].fillna('综合')
+    company_info = company_constant_data.filed_sort(company_info)
+    company_info['company_type'] = company_info['business_nature']
+
+    # 将list_date列中的所有NaN值设置为99990909
+    company_info['list_date'].fillna(20990909.0, inplace=True)
+
+    # 将日期数值转换为日期时间格式
+    company_info['list_date_01'] = pd.to_datetime(company_info['list_date'], format='%Y%m%d')
+
+    company_info['list_date'] = company_info['list_date'].apply(
+        lambda x: pd.to_numeric(x, errors="coerce"))
+
+    now_date = datetime.now()
+
+    # 计算日期差值 距离现在上市时间
+    company_info['diff_days'] = company_info.apply(
+        lambda row: (now_date - row['list_date_01']).days, axis=1)
+
+    str_now_date = now_date.strftime('%Y-%m-%d %H:%M:%S')
+    company_info['sync_date'] = str_now_date
+
+    try:
+        # 次新股
+        sub_stock = ths_concept_detail_api.get_ths_concept_detail('885598', None)
+        sub_stock_symbol_list = list(sub_stock['symbol'])
+    except BaseException as e:
+        logger.error("出现异常:{},{}", symbol, e)
+        query = {'concept_code': 885598}
+        ths_stock_concept_detail = mongodb_util.find_query_data('ths_stock_concept_detail', query)
+        sub_stock_symbol_list = list(ths_stock_concept_detail['symbol'])
+    company_info.loc[:, 'sub_stock'] = False
+    company_info.loc[company_info['symbol'].isin(sub_stock_symbol_list), 'sub_stock'] = True
+
+    try:
+        company_info.dropna(subset=['symbol'], axis=0, inplace=True)
+        company_info.dropna(subset=['_id'], axis=0, inplace=True)
+        mongodb_util.save_mongo(company_info, db_name_constant.COMPANY_INFO)
+        # 保存历史数据
+        save_company_info_his(company_info)
+    except BaseException as e:
+        logger.error("出现异常:{},{}", symbol, e)
+
+    return company_info
+
+
+def save_company_info_his(company_info_df):
+    now_date = datetime.now()
+    str_day = now_date.strftime('%Y-%m-%d')
+    company_info_df['symbol'] = company_info_df['_id']
+    company_info_df['str_day'] = str_day
+    company_info_df['_id'] = company_info_df['_id'] + "_" + str_day
+    remove_query = {'str_day': str_day}
+    tag = mongodb_util.remove_data(remove_query, db_name_constant.COMPANY_INFO_HIS)
+    success = tag.acknowledged
+    if success:
+        mongodb_util.insert_mongo(company_info_df, db_name_constant.COMPANY_INFO_HIS)
+
+
+# 更新新上市公司信息
+def new_company_info_update():
+    east_money_stock_info = company_info_sync_api.get_east_money_stock_info()
+    new_stock = common_service_fun_api.get_new_stock(east_money_stock_info)
+    for company_one in new_stock.itertuples():
+        try:
+            company_info_sync_api.sync_company_base_info([company_one.symbol])
+            fix_company_industry(company_one.symbol)
+
+        except BaseException as e:
+            logger.error("出现异常:{}", e)
+    company_common_service_api.company_info_industry_cache_clear

mns_scheduler/company_info/constant/__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/company_info/{company_constant_data.py → constant/company_constant_data.py}

@@ -310,10 +310,64 @@ def fix_symbol_industry(company_info, symbol):
 
 def fix_one_symbol():
     symbol = '300483'
-    company_info = mongodb_util.find_query_data('company_info', query={'_id': symbol})
+    company_info = mongodb_util.find_query_data('base', query={'_id': symbol})
     company_info = fix_symbol_industry(company_info, symbol)
     company_info['industry'] = company_info['second_sw_industry']
-    mongodb_util.save_mongo(company_info, 'company_info')
+    mongodb_util.save_mongo(company_info, 'base')
+
+
+def filed_sort(company_info):
+    return company_info[[
+        "_id",
+        "name",
+        "industry",
+        "first_sw_industry",
+        "first_industry_code",
+        "second_sw_industry",
+        "second_industry_code",
+        "third_sw_industry",
+        "third_industry_code",
+        "ths_concept_name",
+        "ths_concept_code",
+        "ths_concept_sync_day",
+        "em_industry",
+        "em_concept",
+        "business_nature",
+        "actual_controller_name",
+        "actual_controller_rate",
+        "final_controller_name",
+        "final_controller_rate",
+        "mv_circulation_ratio",
+        "flow_mv_sp",
+        "total_mv_sp",
+        "now_price",
+        "total_share",
+        "flow_share",
+        "total_mv",
+        "flow_mv",
+        "flow_mv_level",
+        "holder_controller_name",
+        "holder_controller_rate",
+        "area",
+        "list_date",
+        "deal_days",
+        "pe_ttm",
+        "pb",
+        "ROE",
+        "classification",
+        "base_business",
+        "address",
+        "market_id",
+        "symbol",
+        "amount",
+        "sync_date",
+        "ths_concept_list_info",
+        "kpl_plate_name",
+        "kpl_most_relative_name",
+        "kpl_plate_list_info",
+        'operate_profit',
+        'total_operate_income'
+    ]]
 
 
 if __name__ == '__main__':

mns_scheduler/company_info/de_list_stock/__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/concept/ths/common/ths_concept_sync_common_api.py

@@ -11,7 +11,8 @@ project_path = file_path[0:end]
 sys.path.append(project_path)
 mongodb_util = MongodbUtil('27017')
 import mns_common.api.msg.push_msg_api as push_msg_api
-import mns_scheduler.company_info.company_info_sync_api as company_info_sync_api
+import mns_scheduler.company_info.base.sync_company_base_info_api as company_info_sync_api
+import mns_scheduler.company_info.clean.company_info_clean_api as company_info_clean_api
 import mns_scheduler.concept.common.detaill.ths_concept_detail_api as ths_concept_detail_api
 
 max_concept_code = 886110
@@ -86,7 +87,7 @@ def save_ths_concept_detail(new_concept_symbol_df,
     query_field = {"first_industry": 1, "first_industry": 1, "industry": 1,
                    "company_type": 1, "flow_mv_sp": 1,
                    "total_mv_sp": 1}
-    company_info = mongodb_util.find_query_data_choose_field('company_info',
+    company_info = mongodb_util.find_query_data_choose_field('base',
                                                              query_company_info, query_field)
 
     company_info = company_info.set_index(['_id'], drop=True)
@@ -149,7 +150,7 @@ def update_company_info(new_concept_symbol_df):
     if new_concept_symbol_df.shape[0] > 0:
         symbol_list = list(new_concept_symbol_df['symbol'])
         company_info_sync_api.sync_company_base_info(symbol_list)
-        company_info_sync_api.fix_company_industry(None)
+        company_info_clean_api.fix_company_industry(None)
         # 公司缓存信息清除
         company_common_service_api.company_info_industry_cache_clear()
 

mns_scheduler/concept/ths/update_concept_info/sync_one_concept_all_symbols_api.py

@@ -17,7 +17,7 @@ mongodb_util = MongodbUtil('27017')
 # 通过概念指数同步所有概念下的股票组成
 
 # 同步概念下所有股票组成
-def update_concept_all_symbol_detail():
+def update_concept_all_detail_info():
     query = {"symbol": {'$exists': True}}
     new_concept_list = mongodb_util.find_query_data("ths_concept_list", query)
     new_concept_list = new_concept_list.sort_values(by=['symbol'], ascending=False)
@@ -34,7 +34,7 @@ def update_concept_all_symbol_detail():
             time.sleep(1)
             new_concept_symbol_df.loc[:, 'way'] = 'index_sync'
             ths_concept_sync_common_api.save_ths_concept_detail(new_concept_symbol_df, one_concept.name,
-                                                                    str_day, str_now_time, one_concept.symbol)
+                                                                str_day, str_now_time, one_concept.symbol)
 
 
 if __name__ == '__main__':

mns_scheduler/concept/ths/update_concept_info/sync_one_symbol_all_concepts_api.py

@@ -86,8 +86,8 @@ def choose_type_new_concept(ths_concept_df):
 def update_symbol_new_concept(symbol_df, page_number):
     for stock_one in symbol_df.itertuples():
         try:
-            symbol_ths_concept_all_df = ths_concept_detail_web.get_symbol_add_new_concept(stock_one.symbol)
-            logger.info("同步symbol概念信息:{}", stock_one.symbol)
+            symbol_ths_concept_all_df = ths_concept_detail_web.get_one_symbol_all_ths_concepts(stock_one.symbol)
+            logger.info("同步代码{},所有概念信息", stock_one.symbol)
             if data_frame_util.is_empty(symbol_ths_concept_all_df):
                 continue
 
@@ -178,4 +178,4 @@ def sync_symbol_all_concept(symbol):
 
 
 if __name__ == '__main__':
-    sync_symbol_all_concept('300085')
+    sync_symbol_all_concept(None)

mns_scheduler/db/db_status.py

@@ -16,7 +16,7 @@ import mns_common.utils.ip_util as ip_util
 def db_status_check():
     try:
         query = {'symbol': '000001'}
-        mongodb_util.find_query_data('company_info', query)
+        mongodb_util.find_query_data('base', query)
     except BaseException as e:
         ip = ip_util.get_host_ip()
         push_msg_api.push_msg_to_wechat("数据库挂了", "地址:" + ip + "-" + "数据库挂了")

mns_scheduler/zz_task/data_sync_task.py

@@ -32,13 +32,13 @@ import \
 import \
     mns_scheduler.concept.ths.update_concept_info.sync_one_symbol_all_concepts_api as sync_one_symbol_all_concepts_api
 import mns_scheduler.kpl.selection.total.sync_kpl_best_total_sync_api as sync_kpl_best_total_sync_api
-import mns_scheduler.company_info.company_info_sync_api as company_info_sync_api
+import mns_scheduler.company_info.base.sync_company_base_info_api as company_info_sync_api
 import mns_scheduler.trade.auto_ipo_buy_api as auto_ipo_buy_api
 import mns_scheduler.kpl.selection.index.sync_best_choose_his_index as sync_best_choose_his_index
 import mns_scheduler.concept.ths.common.ths_concept_update_common_api as ths_concept_update_common_api
 import mns_scheduler.trade.sync_position_api as sync_position_api
 import mns_scheduler.concept.clean.kpl_concept_clean_api as kpl_concept_clean_api
-import mns_scheduler.company_info.de_list_stock_service as de_list_stock_service
+import mns_scheduler.company_info.de_list_stock.de_list_stock_service as de_list_stock_service
 import mns_scheduler.irm.stock_irm_cninfo_service as stock_irm_cninfo_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
@@ -46,7 +46,7 @@ import mns_scheduler.zt.high_chg.sync_high_chg_real_time_quotes_service as sync_
 import mns_scheduler.risk.self.wei_pan_stock_api as wei_pan_stock_api
 import mns_scheduler.risk.transactions.transactions_check_api as transactions_check_api
 import mns_scheduler.concept.ths.sync_new_index.sync_ths_concept_new_index_api as sync_ths_concept_new_index_api
-
+import mns_scheduler.company_info.clean.company_info_clean_api as company_info_clean_api
 
 # 同步交易日期任务完成
 def sync_trade_date():
@@ -234,9 +234,9 @@ def concept_info_clean():
 
 
 # 同步概念下所有股票组成 by 概念指数
-def update_one_concept_all_symbol_detail():
+def update_concept_all_detail_info():
     logger.info('同步概念下所有股票组成')
-    sync_one_concept_all_symbols_api.update_concept_all_symbol_detail()
+    sync_one_concept_all_symbols_api.update_concept_all_detail_info()
     ths_concept_update_common_api.update_ths_concept_choose_null_reason()
 
 
@@ -280,7 +280,7 @@ def sync_new_concept_index_task():
 # 清洗公司基本信息
 def update_company_base_info():
     company_info_sync_api.sync_company_base_info(None)
-    company_info_sync_api.fix_company_industry(None)
+    company_info_clean_api.fix_company_industry(None)
     # 退市股票同步
     de_list_stock_service.sync_de_list_stock()
     logger.info('同步公司基本信息任务完成')
@@ -378,7 +378,7 @@ blockingScheduler.add_job(sync_stock_gdfx_free_top_10_one_day, 'cron', hour='08,
 blockingScheduler.add_job(concept_info_clean, 'cron', hour='9,12,20', minute='24')
 
 # 更新概念指数下所有股票组成 by 概念代码
-blockingScheduler.add_job(update_one_concept_all_symbol_detail, 'cron', hour='08,18,12', minute='30')
+blockingScheduler.add_job(update_concept_all_detail_info, 'cron', hour='08,18,12', minute='30')
 
 # 同步单只股票下所有概念 by 股票代码
 blockingScheduler.add_job(update_one_symbol_all_concepts, 'cron', hour='09,18,12', minute='15')
@@ -393,7 +393,7 @@ blockingScheduler.add_job(sync_new_concept_index_task, 'interval', minutes=10, m
 blockingScheduler.add_job(sync_all_kpl_plate_info, 'interval', minutes=5, max_instances=4)
 
 # 同步公司基本信息
-blockingScheduler.add_job(update_company_base_info, 'cron', hour='08,19', minute='05')
+blockingScheduler.add_job(update_company_base_info, 'cron', hour='18,22', minute='05')
 # 更新当天涨停股票池
 blockingScheduler.add_job(sync_stock_zt_pool, 'cron', hour='15,19,21,23', minute='42')
 

mns_scheduler/zz_task/sync_realtime_quotes_task.py

@@ -6,7 +6,7 @@ end = file_path.index('mns') + 17
 project_path = file_path[0:end]
 sys.path.append(project_path)
 import mns_scheduler.real_time.realtime_quotes_now_sync as realtime_quotes_now_sync
-import mns_scheduler.company_info.company_info_sync_api as company_info_sync_api
+import mns_scheduler.company_info.clean.company_info_clean_api as company_info_clean_api
 from loguru import logger
 from apscheduler.schedulers.blocking import BlockingScheduler
 
@@ -14,7 +14,7 @@ from apscheduler.schedulers.blocking import BlockingScheduler
 def sync_realtime_quotes():
     logger.error("同步实时数据开始")
     # 更新新股公司信息
-    company_info_sync_api.new_company_info_update()
+    company_info_clean_api.new_company_info_update()
     realtime_quotes_now_sync.sync_realtime_quotes()
     logger.error("同步实时数据完成")
 

{mns_scheduler-1.1.0.2.dist-info → mns_scheduler-1.1.0.4.dist-info}/METADATA

@@ -1,4 +1,4 @@
 Metadata-Version: 2.1
 Name: mns-scheduler
-Version: 1.1.0.2
+Version: 1.1.0.4
 

{mns_scheduler-1.1.0.2.dist-info → mns_scheduler-1.1.0.4.dist-info}/RECORD

@@ -2,7 +2,7 @@ mns_scheduler/__init__.py,sha256=Tyvi_iQlv3jz59EdH67Mycnt9CSixcWPQoJwu55bOq0,165
 mns_scheduler/backup/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
 mns_scheduler/backup/em/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
 mns_scheduler/backup/em/em_new_concept_his_sync.py,sha256=Yqbuz9VE9433o0Z6BvDo5adhj3lK4vmN66XNQBIdC1k,4992
-mns_scheduler/backup/em/em_new_concept_sync_common_api.py,sha256=KnNCf0KXy31GFwF1-wbbkfDM-H7-cEtcVoCwl4QmoVs,7083
+mns_scheduler/backup/em/em_new_concept_sync_common_api.py,sha256=358wt-U7-c0fe-6EPSFD24i0-ykunYnTXBerlXyPDIs,7075
 mns_scheduler/backup/em/em_new_concept_sync_web.py,sha256=wVS0yLyPYzpcxfWAuUqmqbYkjw9wjpo48CvLSZFckzw,2334
 mns_scheduler/backup/ths/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mns_scheduler/backup/ths/sync_ths_concept_by_ak_api.py,sha256=8QBiRKc0Q3ez-kBwvz7G8HrFDD_ANd8smOpQtGyvKIs,5371
@@ -10,9 +10,14 @@ mns_scheduler/backup/ths/sync_ths_new_concept_by_web_api.py,sha256=dLd2V67AFnE9x
 mns_scheduler/big_deal/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
 mns_scheduler/big_deal/ths_big_deal_sync.py,sha256=aMFj-_pLprh4vGjSSzmr_tlYoPA0L4Lm0SkLRkQwIiw,4564
 mns_scheduler/company_info/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
-mns_scheduler/company_info/company_constant_data.py,sha256=_JUan2ds_o4dMUwiPyKnF6oUQd8Nf2UqkHYhSv1FW08,14531
-mns_scheduler/company_info/company_info_sync_api.py,sha256=fCRHXGBx4ugJI3KydqhtjYAHXEmyTPIgr-NBhYPCOXM,22576
-mns_scheduler/company_info/de_list_stock_service.py,sha256=GCp6hlvO-SuH1oIpEsYZwEnGUOa6fXb2D7CqAUYXKQA,1993
+mns_scheduler/company_info/base/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
+mns_scheduler/company_info/base/sync_company_base_info_api.py,sha256=zI6CaQ7LuXeXjJMexb1i70dPyhZQB3LHbsbrRhJaVDc,18173
+mns_scheduler/company_info/clean/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
+mns_scheduler/company_info/clean/company_info_clean_api.py,sha256=zMPbIz91l8DpIGc7ljG6dEdD5QXjir2a0wWHGt2Ca78,4805
+mns_scheduler/company_info/constant/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
+mns_scheduler/company_info/constant/company_constant_data.py,sha256=emaRsH5y-d6IleEG2Od4zNvkL9_Yqg4PimbQVYOM7eM,15870
+mns_scheduler/company_info/de_list_stock/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
+mns_scheduler/company_info/de_list_stock/de_list_stock_service.py,sha256=GCp6hlvO-SuH1oIpEsYZwEnGUOa6fXb2D7CqAUYXKQA,1993
 mns_scheduler/concept/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
 mns_scheduler/concept/clean/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
 mns_scheduler/concept/clean/kpl_concept_clean_api.py,sha256=xxIIgrXLI6xLf10t4unJa7aMB_QeKeki1HJVeXsntkY,4512
@@ -22,16 +27,16 @@ mns_scheduler/concept/common/detaill/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeu
 mns_scheduler/concept/common/detaill/ths_concept_detail_api.py,sha256=tRuSkET-lw1M7rHDImrIM_1X-uMhxq_zF_d3FX1DoUc,9378
 mns_scheduler/concept/ths/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
 mns_scheduler/concept/ths/common/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
-mns_scheduler/concept/ths/common/ths_concept_sync_common_api.py,sha256=W-Bu2PVFOTh5h2h_27_RcszXLRLq6TU1hCg9y_FGVyw,6780
+mns_scheduler/concept/ths/common/ths_concept_sync_common_api.py,sha256=zP7Hu97m0BwMs1M3F5TWiLCJ0g-wwFunQduoG189bhE,6873
 mns_scheduler/concept/ths/common/ths_concept_update_common_api.py,sha256=4BQT3A9t-nDIyCpILgRZF7ZOgK1oabp-gJl5nyWvKWc,4418
 mns_scheduler/concept/ths/sync_new_index/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
 mns_scheduler/concept/ths/sync_new_index/sync_ths_concept_new_index_api.py,sha256=9ol2cvxSO2Ot4Z5fmlo9tUPFe6WwsuVX_H9ogtv3QrI,7841
 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=ipRtiihpHlbxuces7YpHfvBtCDxgzrVXjcCKZiFBPaw,1928
-mns_scheduler/concept/ths/update_concept_info/sync_one_symbol_all_concepts_api.py,sha256=oPDi3h4BZWBUPnj3QeIvXhlqhL80_U6oiTuOEblSu54,8832
+mns_scheduler/concept/ths/update_concept_info/sync_one_concept_all_symbols_api.py,sha256=q3yVi_OtvM5ja-4cG_gkS8sJLhN8ylN6ZQcOU2SIODo,1922
+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=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
 mns_scheduler/db/col_move_service.py,sha256=1XMuC9E9eif8eeLWqnby_c9uhuoZO0ZaMa5xssWe4Wg,4090
-mns_scheduler/db/db_status.py,sha256=K1jtYIGZzDV6knpoJLLnXEhN3tyziJp_zY2gSfguHCA,747
+mns_scheduler/db/db_status.py,sha256=rxSvDHCwrqCHQFI6MnF6YBFo2F-baEMg6ShSOU35vVU,739
 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
@@ -117,9 +122,9 @@ mns_scheduler/zt/script/sync_high_chg_pool_his_data.py,sha256=R0syG5gcXRlLxswbBl
 mns_scheduler/zt/zt_pool/__init__.py,sha256=Tyvi_iQlv3jz59EdH67Mycnt9CSixcWPQoJwu55bOq0,165
 mns_scheduler/zt/zt_pool/zt_pool_sync_api.py,sha256=YusilleacIhhks1m7qkYHdBS16yvjai2avCSfrDpWAg,7607
 mns_scheduler/zz_task/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
-mns_scheduler/zz_task/data_sync_task.py,sha256=Nl-hSRxrgdQh57UubES_MtI0RBYDaZUnBb-M_Sr6Bd8,17319
-mns_scheduler/zz_task/sync_realtime_quotes_task.py,sha256=DN3bq2XCDZC-PHlbD2NTog48bR44EruIEc2QVGKg7Tk,932
-mns_scheduler-1.1.0.2.dist-info/METADATA,sha256=Es8f0EL6Evt89ypZrAYq1q2HFcg_Xr0v-5xamio_y50,64
-mns_scheduler-1.1.0.2.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-mns_scheduler-1.1.0.2.dist-info/top_level.txt,sha256=PXQDFBGR1pWmsUbH5yiLAh71P5HZODTRED0zJ8CCgOc,14
-mns_scheduler-1.1.0.2.dist-info/RECORD,,
+mns_scheduler/zz_task/data_sync_task.py,sha256=VSmcXpMrEZLQTolnh4YHWD0OFiVTYTrvDnkz3871gWE,17418
+mns_scheduler/zz_task/sync_realtime_quotes_task.py,sha256=AMTdeyZ-eGaVpZjggKTPr818FFYkRihY3nAvH5Je2A0,941
+mns_scheduler-1.1.0.4.dist-info/METADATA,sha256=yttamFeH_h_w26Rq69LlXQtCrCzJbZudZ8M_NTA8il8,64
+mns_scheduler-1.1.0.4.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+mns_scheduler-1.1.0.4.dist-info/top_level.txt,sha256=PXQDFBGR1pWmsUbH5yiLAh71P5HZODTRED0zJ8CCgOc,14
+mns_scheduler-1.1.0.4.dist-info/RECORD,,