mns-scheduler 1.1.6.1__tar.gz → 1.1.6.3__tar.gz

{mns_scheduler-1.1.6.1 → mns_scheduler-1.1.6.3}/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: mns-scheduler
-Version: 1.1.6.1
+Version: 1.1.6.3

{mns_scheduler-1.1.6.1 → mns_scheduler-1.1.6.3}/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.3/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.1 → mns_scheduler-1.1.6.3}/mns_scheduler/self_choose/ths_self_choose_service.py

@@ -111,9 +111,13 @@ def add_continue_boards_zt_stocks():
 # 自选股操作 删除当天自选股 增加新的连板股票  添加固定选择自选
 def self_choose_stock_handle():
     delete_all_self_choose_stocks()
+    # 自己买入的股票
     add_trade_stocks()
+    # 本地自选
     add_self_choose_local()
-    add_continue_boards_zt_stocks()
+    # 连板股票
+    # add_continue_boards_zt_stocks()
+    # 固定自选
     # add_fixed_optional()
 
 

{mns_scheduler-1.1.6.1 → mns_scheduler-1.1.6.3}/mns_scheduler/zt/zt_pool/update_null_zt_reason_api.py

@@ -14,7 +14,9 @@ from loguru import logger
 
 
 def update_null_zt_reason(str_day):
-    query = {"str_day": str_day, "$or": [{"zt_reason": "0", }, {"zt_reason": float('nan')}]}
+    query = {"str_day": str_day, "$or": [{"zt_reason": "0", },
+                                         {"zt_reason": ""},
+                                         {"zt_reason": float('nan')}]}
     stock_zt_pool_df_null_zt_reason = mongodb_util.find_query_data('stock_zt_pool', query)
     if data_frame_util.is_empty(stock_zt_pool_df_null_zt_reason):
         return None
@@ -42,4 +44,4 @@ def update_null_zt_reason(str_day):
 
 
 if __name__ == '__main__':
-    update_null_zt_reason('2024-10-08')
+    update_null_zt_reason('2024-02-27')

{mns_scheduler-1.1.6.1 → mns_scheduler-1.1.6.3}/mns_scheduler/zz_task/data_sync_task.py

@@ -489,7 +489,7 @@ blockingScheduler.add_job(sync_financial_report_task, 'cron', hour='17', minute=
 # 同步港股公司和行业信息
 blockingScheduler.add_job(sync_hk_company_industry_info, 'cron', hour='08,15', minute='10')
 # 更新空的涨停原因股票
-blockingScheduler.add_job(update_null_zt_reason, 'cron', hour='16,17,18,19,20,21,22,23', minute='10')
+blockingScheduler.add_job(update_null_zt_reason, 'cron', hour='16,17,18,19,20,21,22,23', minute='19')
 
 print('定时任务启动成功')
 blockingScheduler.start()

{mns_scheduler-1.1.6.1 → mns_scheduler-1.1.6.3}/mns_scheduler.egg-info/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: mns-scheduler
-Version: 1.1.6.1
+Version: 1.1.6.3

{mns_scheduler-1.1.6.1 → mns_scheduler-1.1.6.3}/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.1 → mns_scheduler-1.1.6.3}/setup.py

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