mns-scheduler 1.1.6.2__tar.gz → 1.1.6.5__tar.gz

{mns_scheduler-1.1.6.2 → mns_scheduler-1.1.6.5}/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: mns-scheduler
-Version: 1.1.6.2
+Version: 1.1.6.5

{mns_scheduler-1.1.6.2 → mns_scheduler-1.1.6.5}/mns_scheduler/company_info/base/sync_company_base_info_api.py

@@ -22,6 +22,7 @@ import mns_common.component.company.company_common_service_api as company_common
 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
 from functools import lru_cache
+import mns_scheduler.company_info.base.sync_company_hold_info_api as sync_company_hold_info_api
 
 mongodb_util = MongodbUtil('27017')
 # 分页大小
@@ -151,6 +152,9 @@ def single_thread_sync_company_info(east_money_stock_info,
     fail_list = []
     for company_one in east_money_stock_info.itertuples():
         try:
+            # 同步公司控股子公司信息 异步执行
+            sync_company_hold_info_api.sync_company_hold_info(company_one.symbol)
+
             company_info_type = ths_company_info_web.get_company_info_detail(company_one.symbol)
             company_info_type = set_kzz_debt(company_info_type, company_one.symbol)
             company_info_type['first_industry_code'] = company_info_type['hycode'].apply(
@@ -425,8 +429,8 @@ if __name__ == '__main__':
     # 300293
     # sync_company_base_info(None)
     # new_company_info_update()
-    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(symbol_list)
+    # 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(None)
     # group_by_industry()

mns_scheduler-1.1.6.5/mns_scheduler/company_info/base/sync_company_hold_info_api.py

@@ -0,0 +1,40 @@
+import sys
+import os
+
+file_path = os.path.abspath(__file__)
+end = file_path.index('mns') + 16
+project_path = file_path[0:end]
+sys.path.append(project_path)
+import mns_common.api.ths.company.ths_company_info_api as ths_company_info_api
+import mns_common.component.cookie.cookie_info_service as cookie_info_service
+import mns_common.utils.data_frame_util as data_frame_util
+from mns_common.db.MongodbUtil import MongodbUtil
+import mns_common.constant.db_name_constant as db_name_constant
+from datetime import datetime
+from mns_common.utils.async_fun import async_fun
+from loguru import logger
+
+mongodb_util = MongodbUtil('27017')
+
+
+# 同步公司控股子公司信息
+@async_fun
+def sync_company_hold_info(symbol):
+    try:
+        ths_cookie = cookie_info_service.get_ths_cookie()
+        company_hold_info_df = ths_company_info_api.get_company_hold_info(symbol, ths_cookie)
+
+        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)
+    except BaseException as e:
+        logger.error("同步公司控股子公司信息:{},{}", symbol, e)
+
+
+if __name__ == '__main__':
+    sync_company_hold_info('300085')

{mns_scheduler-1.1.6.2 → mns_scheduler-1.1.6.5}/mns_scheduler/company_info/constant/company_constant_data.py

@@ -21,7 +21,7 @@ def get_fix_symbol_industry():
                          ['300836', '佰奥智能', '640701', '机器人'],
                          ['300293', '蓝英装备', '640701', '机器人'],
                          ['688630', '芯碁微装', '270108', '半导体设备'],
-                         ['001309', '德明利', '270108', '半导体设备'],
+                         ['001309', '德明利', '270100', '数字芯片设计'],
                          ['600338', '西藏珠峰', '240603', '锂'],
                          ['300042', '朗科科技', '270108', '半导体设备'],
                          ['688507', '索辰科技', '710402', '横向通用软件'],

{mns_scheduler-1.1.6.2 → mns_scheduler-1.1.6.5}/mns_scheduler/concept/clean/ths_concept_clean_api.py

@@ -77,6 +77,7 @@ def update_one_concept_relevance_industry(concept_code):
     ths_stock_concept_detail_df['second_relevance_industry'] = second_relevance_industry
 
     mongodb_util.save_mongo(ths_concept_list_one_df, db_name_constant.THS_CONCEPT_LIST)
+    ths_stock_concept_detail_df['valid'] = True
     mongodb_util.save_mongo(ths_stock_concept_detail_df, db_name_constant.THS_STOCK_CONCEPT_DETAIL)
 
 

{mns_scheduler-1.1.6.2 → mns_scheduler-1.1.6.5}/mns_scheduler/concept/ths/common/ths_concept_sync_common_api.py

@@ -135,6 +135,7 @@ def save_ths_concept_detail(new_concept_symbol_df,
     query_detail = {"concept_code": int(concept_code)}
     exist_concept_detail = mongodb_util.find_query_data(db_name_constant.THS_STOCK_CONCEPT_DETAIL, query_detail)
     if exist_concept_detail is None or exist_concept_detail.shape[0] == 0:
+        new_concept_symbol_df['valid'] = True
         mongodb_util.save_mongo(new_concept_symbol_df, db_name_constant.THS_STOCK_CONCEPT_DETAIL)
         # 保存到当日新增概念列表
         new_concept_symbol_df['concept_type'] = 'ths'
@@ -144,6 +145,7 @@ def save_ths_concept_detail(new_concept_symbol_df,
         new_concept_symbol_df = new_concept_symbol_df.loc[~(
             new_concept_symbol_df['symbol'].isin(exist_concept_detail_symbol_list))]
         if new_concept_symbol_df.shape[0] > 0:
+            new_concept_symbol_df['valid'] = True
             mongodb_util.save_mongo(new_concept_symbol_df, db_name_constant.THS_STOCK_CONCEPT_DETAIL)
             # 保存到当日新增概念列表
             new_concept_symbol_df['concept_type'] = 'ths'

{mns_scheduler-1.1.6.2 → mns_scheduler-1.1.6.5}/mns_scheduler/concept/ths/sync_new_index/sync_ths_concept_new_index_api.py

@@ -37,9 +37,9 @@ def sync_ths_concept_new_index():
 
 def sync_ths_concept_new_index_from_app():
     # 当前最大概念代码
-    max_concept_code = ths_concept_sync_common_api.get_max_concept_code()
+    max_concept_code = int(ths_concept_sync_common_api.get_max_concept_code())
     # 最大概念代码上限
-    max_concept_code_limit = max_concept_code + 2
+    max_concept_code_limit =max_concept_code + 2
     # 同花顺概念列表
     ths_concept_list_exist = ths_concept_common_service_api.get_all_ths_concept()
     # 同步向上3次

{mns_scheduler-1.1.6.2 → mns_scheduler-1.1.6.5}/mns_scheduler/self_choose/ths_self_choose_service.py

@@ -116,7 +116,7 @@ def self_choose_stock_handle():
     # 本地自选
     add_self_choose_local()
     # 连板股票
-    # add_continue_boards_zt_stocks()
+    add_continue_boards_zt_stocks()
     # 固定自选
     # add_fixed_optional()
 

{mns_scheduler-1.1.6.2 → mns_scheduler-1.1.6.5}/mns_scheduler.egg-info/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: mns-scheduler
-Version: 1.1.6.2
+Version: 1.1.6.5

{mns_scheduler-1.1.6.2 → mns_scheduler-1.1.6.5}/mns_scheduler.egg-info/SOURCES.txt

@@ -12,6 +12,7 @@ mns_scheduler/big_deal/ths_big_deal_sync.py
 mns_scheduler/company_info/__init__.py
 mns_scheduler/company_info/base/__init__.py
 mns_scheduler/company_info/base/sync_company_base_info_api.py
+mns_scheduler/company_info/base/sync_company_hold_info_api.py
 mns_scheduler/company_info/clean/__init__.py
 mns_scheduler/company_info/clean/company_info_clean_api.py
 mns_scheduler/company_info/constant/__init__.py

{mns_scheduler-1.1.6.2 → mns_scheduler-1.1.6.5}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='mns-scheduler',
-    version='1.1.6.2',
+    version='1.1.6.5',
     packages=find_packages(),
     install_requires=[],  # 如果有依赖项，可以在这里列出
 )