mns-scheduler 1.0.4.0__py3-none-any.whl → 1.0.4.2__py3-none-any.whl

mns_scheduler/concept/clean/ths_concept_clean_api.py

@@ -9,20 +9,63 @@ from mns_common.db.MongodbUtil import MongodbUtil
 import pandas as pd
 import mns_common.api.ths.ths_stock_api as ths_stock_api
 import time
+from loguru import logger
+import mns_common.component.company.company_common_service_api as company_common_service_api
+import mns_common.constant.db_name_constant as db_name_constant
 
 mongodb_util = MongodbUtil('27017')
 
 
 # 统计概念数量
 def update_concept_num():
-    ths_concept_list = mongodb_util.find_all_data('ths_concept_list')
+    ths_concept_list = mongodb_util.find_all_data(db_name_constant.THS_CONCEPT_LIST)
     for ths_concept_one in ths_concept_list.itertuples():
-        query = {'concept_code': ths_concept_one.symbol}
-        concept_count = (mongodb_util
-                         .count(query, 'ths_stock_concept_detail'))
-        ths_concept_list_one_df = ths_concept_list.loc[ths_concept_list['symbol'] == ths_concept_one.symbol]
-        ths_concept_list_one_df['concept_count'] = concept_count
-        mongodb_util.save_mongo(ths_concept_list_one_df, 'ths_concept_list')
+        try:
+            query = {'concept_code': ths_concept_one.symbol}
+            ths_stock_concept_detail_df = (mongodb_util
+                                           .find_query_data(db_name_constant.THS_STOCK_CONCEPT_DETAIL, query))
+            concept_count = ths_stock_concept_detail_df.shape[0]
+            ths_concept_list_one_df = ths_concept_list.loc[ths_concept_list['symbol'] == ths_concept_one.symbol]
+            ths_concept_list_one_df['concept_count'] = concept_count
+
+            ths_stock_concept_detail_df = ths_stock_concept_detail_df.reset_index(drop=True)
+            if 'industry' in ths_stock_concept_detail_df.columns:
+                del ths_stock_concept_detail_df['industry']
+
+            company_info_df = company_common_service_api.get_company_info_industry()
+            company_info_df = company_info_df[['_id', 'industry']]
+            company_info_df = company_info_df.loc[
+                company_info_df['_id'].isin(list(ths_stock_concept_detail_df['symbol']))]
+            company_info_df = company_info_df.set_index(['_id'], drop=True)
+
+            ths_stock_concept_detail_df = ths_stock_concept_detail_df.set_index(['symbol'], drop=False)
+            ths_stock_concept_detail_df = pd.merge(ths_stock_concept_detail_df, company_info_df,
+                                                   how='outer',
+                                                   left_index=True, right_index=True)
+            ths_stock_concept_detail_df.dropna(subset=['industry'], axis=0, inplace=True)
+
+            grouped = ths_stock_concept_detail_df.groupby('industry')
+            result_list = grouped.size()
+            ths_concept_group = pd.DataFrame(result_list, columns=['number'])
+            ths_concept_group['industry'] = ths_concept_group.index
+            ths_concept_group = ths_concept_group.sort_values(by=['number'], ascending=False)
+            if ths_concept_group.shape[0] >= 2:
+                first_relevance_industry = list(ths_concept_group.iloc[0:1]['industry'])[0]
+                second_relevance_industry = list(ths_concept_group.iloc[1:2]['industry'])[0]
+            else:
+                first_relevance_industry = list(ths_concept_group.iloc[0:1]['industry'])[0]
+                second_relevance_industry = '无'
+            ths_concept_list_one_df['first_relevance_industry'] = first_relevance_industry
+            ths_concept_list_one_df['second_relevance_industry'] = second_relevance_industry
+
+            ths_stock_concept_detail_df['first_relevance_industry'] = first_relevance_industry
+            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)
+            mongodb_util.save_mongo(ths_stock_concept_detail_df, db_name_constant.THS_STOCK_CONCEPT_DETAIL)
+
+        except BaseException as e:
+            logger.error("更新概念信息异常:{},{}", e, ths_concept_one.name)
 
 
 # 更新空名字
@@ -58,5 +101,5 @@ def update_null_name():
 
 
 if __name__ == '__main__':
-    update_null_name()
     update_concept_num()
+    update_null_name()

mns_scheduler/zz_task/data_sync_task.py

@@ -347,7 +347,7 @@ blockingScheduler.add_job(sync_today_trade_k_line_info, 'cron', hour='08', minut
 blockingScheduler.add_job(sync_stock_gdfx_free_top_10_one_day, 'cron', hour='08,22', minute='23')
 
 # 更新同花顺概念信息
-blockingScheduler.add_job(ths_concept_info_clean, 'cron', hour='9,18', minute='01')
+blockingScheduler.add_job(ths_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')

{mns_scheduler-1.0.4.0.dist-info → mns_scheduler-1.0.4.2.dist-info}/METADATA

@@ -1,4 +1,4 @@
 Metadata-Version: 2.1
 Name: mns-scheduler
-Version: 1.0.4.0
+Version: 1.0.4.2
 

{mns_scheduler-1.0.4.0.dist-info → mns_scheduler-1.0.4.2.dist-info}/RECORD

@@ -15,7 +15,7 @@ mns_scheduler/company_info/company_constant_data.py,sha256=LwyBWLoErAUPXss68ebVj
 mns_scheduler/company_info/company_info_sync_api.py,sha256=2sQk197p5qjq2DQlRpVbotSSIN87x43T-RGAtMiXQI4,20332
 mns_scheduler/concept/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
 mns_scheduler/concept/clean/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
-mns_scheduler/concept/clean/ths_concept_clean_api.py,sha256=SR5NRzh4N2r0ouXX3SRAONJyH44eorJdpaayekbNWCE,2459
+mns_scheduler/concept/clean/ths_concept_clean_api.py,sha256=Pdb5u5qSOVewT-q26S_632BfrjHrVaQUbf3PmXz0OIo,5253
 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=8KOz1AlUFmo0hdlkOuc5rDLKIeYkRK3-ooA5Z_wJX10,6724
@@ -63,9 +63,9 @@ mns_scheduler/zt/today_high_chg_pool_sync_api.py,sha256=G6FXMH7HnvhyMFoE-RszggkB
 mns_scheduler/zt/zt_five_boards_sync_api.py,sha256=HfjPHKD99fU9c37kSenEX2_qNvFAjQGgy8ERuacSxwk,10916
 mns_scheduler/zt/zt_pool_sync_api.py,sha256=tzSCnqAelV7MQBZ3KcpOQQHNYnjFnmvoDFcapBpU_NA,7534
 mns_scheduler/zz_task/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
-mns_scheduler/zz_task/data_sync_task.py,sha256=wpzBETzZEIk1S9eYJiZt7Gzh4bWzJDwEsJtfB690mKM,15508
+mns_scheduler/zz_task/data_sync_task.py,sha256=jYYED_j4F3jwPnQiRM9kaVzTA-LdrCIBezEPZFESr-M,15511
 mns_scheduler/zz_task/sync_realtime_quotes_task.py,sha256=DN3bq2XCDZC-PHlbD2NTog48bR44EruIEc2QVGKg7Tk,932
-mns_scheduler-1.0.4.0.dist-info/METADATA,sha256=fyqm6-_lhySuCEW5GFJ1GAWolPO0kJPrQxkIsI48-mg,64
-mns_scheduler-1.0.4.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-mns_scheduler-1.0.4.0.dist-info/top_level.txt,sha256=PXQDFBGR1pWmsUbH5yiLAh71P5HZODTRED0zJ8CCgOc,14
-mns_scheduler-1.0.4.0.dist-info/RECORD,,
+mns_scheduler-1.0.4.2.dist-info/METADATA,sha256=szaz1VXnlh9rwKYil44ufAby6-RkjsALcpNOEq-TxQs,64
+mns_scheduler-1.0.4.2.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+mns_scheduler-1.0.4.2.dist-info/top_level.txt,sha256=PXQDFBGR1pWmsUbH5yiLAh71P5HZODTRED0zJ8CCgOc,14
+mns_scheduler-1.0.4.2.dist-info/RECORD,,