mns-scheduler 1.0.1.7__py3-none-any.whl → 1.0.1.9__py3-none-any.whl

mns_scheduler/company_info/company_info_sync_api.py

@@ -13,7 +13,7 @@ import mns_common.api.ths.ths_stock_api as ths_stock_api
 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_common.component.common_service_fun_api as common_service_fun_api
-import mns_common.component.concept.concept_common_service_api as concept_common_service_api
+import mns_common.component.concept.ths_concept_common_service_api as ths_concept_common_service_api
 from mns_common.db.MongodbUtil import MongodbUtil
 import mns_common.api.kpl.symbol.kpl_real_time_quotes_api as kpl_real_time_quotes_api
 import mns_common.utils.data_frame_util as data_frame_util
@@ -292,7 +292,7 @@ def single_thread_sync_company_info(east_money_stock_info,
             company_info_type['classification'] = company_one.classification
             company_info_type['mv_circulation_ratio'] = calculate_circu_ratio(company_one.symbol)
             # 获取同花顺最新概念
-            company_info_type = concept_common_service_api.set_ths_concept(company_one.symbol, company_info_type)
+            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')
             company_info_type['sync_date'] = str_now_date

mns_scheduler/kpl/selection/index/sync_best_choose_index.py

@@ -46,24 +46,25 @@ def choose_field_choose_first_index():
 
 
 # 多线程分片同步
-def multithread_shard_sync_index(data_df, page_number):
+def multithread_shard_sync_index(first_kpl_df, page_number):
     global result
-    for stock_one in data_df.itertuples():
+    for first_kpl_one in first_kpl_df.itertuples():
         try:
-            kpl_best_choose_sub_index_detail = selection_plate_api.best_choose_sub_index(stock_one.plate_code)
+            kpl_best_choose_sub_index_detail = selection_plate_api.best_choose_sub_index(first_kpl_one.plate_code)
             if data_frame_util.is_not_empty(kpl_best_choose_sub_index_detail):
                 # 保存第二级精选指数
-                sync_best_choose_second_index(kpl_best_choose_sub_index_detail)
+                sync_best_choose_second_index(kpl_best_choose_sub_index_detail, first_kpl_one.plate_code)
                 sub_plate_code_list = kpl_best_choose_sub_index_detail.to_string(index=False)
                 # 更新第一级和第二级指数关联关系
-                update_first_index_sub_index(stock_one.plate_code, sub_plate_code_list)
-                data_df.loc[data_df['plate_code'] == stock_one.plate_code, "sub_plate_code_list"] = sub_plate_code_list
+                update_first_index_sub_index(first_kpl_one.plate_code, sub_plate_code_list)
+                first_kpl_df.loc[
+                    first_kpl_df['plate_code'] == first_kpl_one.plate_code, "sub_plate_code_list"] = sub_plate_code_list
 
         except BaseException as e:
             logger.error("处理一级精选指数异常:{}", e)
     with result_lock:
         # 使用锁来保护 result 变量的访问，将每页的数据添加到结果中
-        result = pd.concat([result, data_df], ignore_index=True)
+        result = pd.concat([result, first_kpl_df], ignore_index=True)
 
 
 # 同步第一和第二级别精选指数  更新一级和二级之间的关联关系
@@ -105,12 +106,12 @@ def sync_best_choose_index():
     if data_frame_util.is_empty(new_data_df):
         return None
     # 处理一级指数
-    handle_new_kpl_index(new_data_df, kpl_constant.FIRST_INDEX)
+    handle_new_kpl_index(new_data_df, kpl_constant.FIRST_INDEX, None)
     return result
 
 
 # 处理新增指数数据
-def handle_new_kpl_index(new_data_df, index_class):
+def handle_new_kpl_index(new_data_df, index_class, first_plate_code):
     for new_data_one in new_data_df.itertuples():
         try:
             concept_code = new_data_one.plate_code
@@ -125,11 +126,16 @@ def handle_new_kpl_index(new_data_df, index_class):
     now_date = datetime.now()
     str_day = now_date.strftime('%Y-%m-%d')
     str_now_date = now_date.strftime('%Y-%m-%d %H:%M:%S')
+    if first_plate_code is not None:
+        new_data_df['first_plate_code'] = first_plate_code
+    else:
+        new_data_df['first_plate_code'] = new_data_one.plate_code
+
     new_data_df['create_day'] = str_day
     new_data_df['create_time'] = str_now_date
     new_data_df.loc[:, "create_day"] = str_day
     new_data_df.loc[:, "create_time"] = str_now_date
-    new_data_df.loc[:, "valid"] = False
+    new_data_df.loc[:, "valid"] = True
     new_data_df = new_data_df[["_id",
                                "plate_code",
                                "plate_name",
@@ -138,11 +144,13 @@ def handle_new_kpl_index(new_data_df, index_class):
                                "sync_str_day",
                                "sync_str_time",
                                "create_day",
-                               "create_time"]]
+                               "create_time",
+                               "first_plate_code",
+                               "valid"]]
     mongodb_util.insert_mongo(new_data_df, 'kpl_best_choose_index')
 
 
-# 更新第一级精选指数 次级指数
+# 更新第一级精选指数 次级指数关系
 def update_first_index_sub_index(first_plate_code, sub_plate_code_list):
     now_date = datetime.now()
     str_day = now_date.strftime('%Y-%m-%d')
@@ -155,7 +163,7 @@ def update_first_index_sub_index(first_plate_code, sub_plate_code_list):
 
 
 # 同步二级精选指数
-def sync_best_choose_second_index(kpl_best_choose_sub_index_detail):
+def sync_best_choose_second_index(kpl_best_choose_sub_index_detail, first_plate_code):
     kpl_best_choose_sub_index_detail['_id'] = kpl_best_choose_sub_index_detail['plate_code']
     kpl_best_choose_sub_index_detail['index_class'] = kpl_constant.SUB_INDEX
     now_date = datetime.now()
@@ -177,4 +185,4 @@ def sync_best_choose_second_index(kpl_best_choose_sub_index_detail):
     if data_frame_util.is_empty(new_data_df):
         return None
 
-    handle_new_kpl_index(new_data_df, kpl_constant.SUB_INDEX)
+    handle_new_kpl_index(new_data_df, kpl_constant.SUB_INDEX, first_plate_code)

mns_scheduler/kpl/selection/total/sync_kpl_best_total_sync_api.py

@@ -1,14 +1,15 @@
 import sys
 import os
-
+import mns_common.component.concept.kpl_concept_common_service_api as kpl_concept_common_service_api
 import mns_common.api.kpl.selection.kpl_selection_plate_api as selection_plate_api
 from mns_common.db.MongodbUtil import MongodbUtil
 from loguru import logger
-import mns_common.api.kpl.constant.kpl_constant as kpl_constant
 import mns_common.utils.data_frame_util as data_frame_util
 import mns_scheduler.kpl.selection.index.sync_best_choose_index as sync_best_choose_first_index
 import mns_scheduler.kpl.selection.symbol.sync_best_choose_symbol as sync_best_choose_symbol
 import threading
+import mns_common.constant.db_name_constant as db_name_constant
+import mns_common.api.kpl.constant.kpl_constant as kpl_constant
 
 file_path = os.path.abspath(__file__)
 end = file_path.index('mns') + 17
@@ -81,6 +82,61 @@ def sync_all_plate_info():
     logger.info("同步开票啦精选概念股票组成完成")
 
 
+# 更新一二级关系
+def update_best_choose_plate_relation():
+    first_index_df = sync_best_choose_first_index.choose_field_choose_first_index()
+    kpl_all_concept_df = kpl_concept_common_service_api.get_kpl_all_concept()
+    for first_index_df_one in first_index_df.itertuples():
+        try:
+            kpl_best_choose_sub_index_detail = selection_plate_api.best_choose_sub_index(first_index_df_one.plate_code)
+            # 更新指数级别
+
+            kpl_one_concept_df_first = kpl_all_concept_df.loc[
+                kpl_all_concept_df['plate_code'] == first_index_df_one.plate_code]
+
+            if data_frame_util.is_not_empty(kpl_one_concept_df_first):
+                kpl_one_concept_df_first_exist = kpl_one_concept_df_first.loc[
+                    kpl_one_concept_df_first['index_class'] == kpl_constant.FIRST_INDEX]
+                if data_frame_util.is_not_empty(kpl_one_concept_df_first_exist):
+                    update_query = {"plate_code": first_index_df_one.plate_code}
+                    new_values = {"$set": {"first_plate_code": first_index_df_one.plate_code,
+                                           "heat_score": first_index_df_one.heat_score,
+                                           "plate_name": first_index_df_one.plate_name,
+                                           "first_plate_name": first_index_df_one.plate_name}}
+                    mongodb_util.update_many(update_query, new_values, db_name_constant.KPL_BEST_CHOOSE_INDEX)
+                else:
+                    update_query = {"plate_code": first_index_df_one.plate_code}
+                    new_values = {"$set": {
+                        "first_plate_code": first_index_df_one.plate_code,
+                        "first_plate_name": first_index_df_one.plate_name,
+                        "plate_name": first_index_df_one.plate_name,
+                        "index_class": kpl_constant.SUB_INDEX}}
+                    mongodb_util.update_many(update_query, new_values, db_name_constant.KPL_BEST_CHOOSE_INDEX)
+
+            if data_frame_util.is_not_empty(kpl_best_choose_sub_index_detail):
+                update_query = {"plate_code": {"$in": list(kpl_best_choose_sub_index_detail['plate_code'])}}
+                new_values = {"$set": {"first_plate_code": first_index_df_one.plate_code,
+                                       "first_plate_name": first_index_df_one.plate_name}}
+                mongodb_util.update_many(update_query, new_values, db_name_constant.KPL_BEST_CHOOSE_INDEX)
+        except BaseException as e:
+            logger.error("同步开盘啦精选板块指数关系异常:{},{}", first_index_df_one.plate_code, e)
+    # 更新二级指数关系
+    update_sub_index_relation(first_index_df, kpl_all_concept_df)
+
+
+def update_sub_index_relation(first_index_df, kpl_all_concept_df):
+    kpl_sub_concept_df_exist = kpl_all_concept_df.loc[
+        kpl_all_concept_df['index_class'] == kpl_constant.SUB_INDEX]
+    kpl_sub_concept_df_change = first_index_df.loc[
+        first_index_df['plate_code'].isin(list(kpl_sub_concept_df_exist['plate_code']))]
+    if data_frame_util.is_not_empty(kpl_sub_concept_df_change):
+        update_query = {"plate_code": {"$in": list(kpl_sub_concept_df_change['plate_code'])}}
+        new_values = {"$set": {"index_class": kpl_constant.FIRST_INDEX}}
+        mongodb_util.update_many(update_query, new_values, db_name_constant.KPL_BEST_CHOOSE_INDEX)
+
+
 if __name__ == '__main__':
+    update_best_choose_plate_relation()
+
     # 同步第一和第二级别精选指数
     sync_all_plate_info()

mns_scheduler/zt/zt_pool_sync_api.py

@@ -9,7 +9,7 @@ import pandas as pd
 import mns_common.api.akshare.stock_zt_pool_api as stock_zt_pool_api
 import mns_common.api.ths.ths_stock_zt_pool_api as ths_stock_zt_pool_api
 import mns_common.utils.date_handle_util as date_handle_util
-import mns_common.component.concept.concept_common_service_api as concept_common_service_api
+import mns_common.component.concept.ths_concept_common_service_api as ths_concept_common_service_api
 from mns_common.db.MongodbUtil import MongodbUtil
 import mns_common.component.company.company_common_service_api as company_common_service_api
 from loguru import logger
@@ -62,7 +62,7 @@ def save_zt_info(str_day):
 
         for stock_one in stock_em_zt_pool_df_data.itertuples():
             try:
-                stock_em_zt_pool_df_data = concept_common_service_api.set_last_ths_concept(stock_one.symbol,
+                stock_em_zt_pool_df_data = ths_concept_common_service_api.set_last_ths_concept(stock_one.symbol,
                                                                                            stock_em_zt_pool_df_data,
                                                                                            str_day)
                 ths_zt_pool_one_df = ths_zt_pool_df_data.loc[ths_zt_pool_df_data['symbol'] == stock_one.symbol]

mns_scheduler/zz_task/data_sync_task.py

@@ -242,6 +242,12 @@ def sync_all_kpl_plate_info():
     sync_new_concept_data_by_web()
 
 
+# 更新一二级关系
+def update_best_choose_plate_relation():
+    logger.info('同步开盘啦精选指数关系')
+    sync_kpl_best_total_sync_api.update_best_choose_plate_relation()
+
+
 # 同步新概念通过web端
 def sync_new_concept_data_web():
     # 同步同花顺新增概念指数通过web端接口爬取
@@ -327,6 +333,9 @@ blockingScheduler.add_job(sync_stock_zt_pool, 'cron', hour='15,19,21,23', minute
 # 自动打新 打新中签高时间段 10:30-11:30
 blockingScheduler.add_job(auto_ipo_buy, 'cron', hour='10', minute='40,50')
 
+# 更新开盘啦指数关系
+blockingScheduler.add_job(update_best_choose_plate_relation, 'cron', hour='09,18', minute='25')
+
 print('定时任务启动成功')
 blockingScheduler.start()
 

{mns_scheduler-1.0.1.7.dist-info → mns_scheduler-1.0.1.9.dist-info}/METADATA

@@ -1,4 +1,4 @@
 Metadata-Version: 2.1
 Name: mns-scheduler
-Version: 1.0.1.7
+Version: 1.0.1.9
 

{mns_scheduler-1.0.1.7.dist-info → mns_scheduler-1.0.1.9.dist-info}/RECORD

@@ -3,7 +3,7 @@ mns_scheduler/big_deal/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9
 mns_scheduler/big_deal/ths_big_deal_sync.py,sha256=wezGJWFRnKYBaPP9PVXLqMbHENOXgvJtw3HSGCSlX5c,4555
 mns_scheduler/company_info/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
 mns_scheduler/company_info/company_constant_data.py,sha256=LwyBWLoErAUPXss68ebVj3Qe8GouvKDFtyHrWuMd-qU,15238
-mns_scheduler/company_info/company_info_sync_api.py,sha256=yGOszsg7ivAypzyg-N6yBOeJeNekfHNm260yUOzem_M,20673
+mns_scheduler/company_info/company_info_sync_api.py,sha256=uXfIVclp4zTQz_b4MbvZB5lqmoUeURlzH18B13RPC50,20685
 mns_scheduler/concept/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
 mns_scheduler/concept/clean/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
 mns_scheduler/concept/clean/ths_effective_concept_clean_api.py,sha256=2CzG7zvA2mydjIvnckMWz8eR_tmdfOl8k-I0eov9fy4,2440
@@ -40,11 +40,11 @@ mns_scheduler/k_line/sync/daily_week_month_line_sync.py,sha256=SNKkwGoyE1qzds1o-
 mns_scheduler/kpl/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
 mns_scheduler/kpl/selection/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
 mns_scheduler/kpl/selection/index/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
-mns_scheduler/kpl/selection/index/sync_best_choose_index.py,sha256=II9uTG883zQYfF0Tow9xQ-9IXmA4VPBZjyZXcSBePKA,7591
+mns_scheduler/kpl/selection/index/sync_best_choose_index.py,sha256=-34drqAMsx792DxR8P1A8DrGCM5yIVGsop3UzDNzsPw,8016
 mns_scheduler/kpl/selection/symbol/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
 mns_scheduler/kpl/selection/symbol/sync_best_choose_symbol.py,sha256=kUKs0SWCqekhvV0o5A1pDv0Nw4x6VTS-ij0AryzKe8w,4679
 mns_scheduler/kpl/selection/total/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
-mns_scheduler/kpl/selection/total/sync_kpl_best_total_sync_api.py,sha256=IRWjVETR-a5P3UdVHj3MDSgJJnmo7vG8OE8K3lpWDWk,3859
+mns_scheduler/kpl/selection/total/sync_kpl_best_total_sync_api.py,sha256=B03DKH6IcmFK_OmXrbnjrxSOSjRrnYXrSUXOw9ft-HM,7527
 mns_scheduler/real_time/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
 mns_scheduler/real_time/realtime_quotes_now_create_db_index.py,sha256=qQCjcsG3WYgn3zemS45Ms0AHtbkCwlSVPPCntxVvK8Q,1066
 mns_scheduler/real_time/realtime_quotes_now_sync.py,sha256=YldmBI19eKNEL_yTZvBrWewL33B5G6a8cuEn7YQMV9w,8850
@@ -55,11 +55,11 @@ mns_scheduler/zt/export_open_data_to_excel.py,sha256=haOSmh-aXnScp58u0mLE_QvcWII
 mns_scheduler/zt/realtime_quotes_now_zt_kc_sync.py,sha256=9xTMcHBoSotN8ZvGOBkh_E8BDfPbwsCoLzX3XZMV0-s,17269
 mns_scheduler/zt/today_high_chg_pool_sync_api.py,sha256=G6FXMH7HnvhyMFoE-RszggkByEp4bThyebt_9KiSX7c,21283
 mns_scheduler/zt/zt_five_boards_sync_api.py,sha256=HfjPHKD99fU9c37kSenEX2_qNvFAjQGgy8ERuacSxwk,10916
-mns_scheduler/zt/zt_pool_sync_api.py,sha256=AhWYrpHzO3KOKecyGqQFvopYd2KFmf1ykRiv2R9Pjo4,7490
+mns_scheduler/zt/zt_pool_sync_api.py,sha256=_EUlc_22fRtAGp--wc0d6UFmO5uKqoWbe09gNnSU_aI,7502
 mns_scheduler/zz_task/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
-mns_scheduler/zz_task/data_sync_task.py,sha256=SgVpGmlBOZJS1d0KMZanzbXOO-lT1cmg9JsNj-1H1ug,13443
+mns_scheduler/zz_task/data_sync_task.py,sha256=oeEC_bSL8lsmdx3SRFnW_EUfv3HXcpByut4zAszQu3w,13768
 mns_scheduler/zz_task/sync_realtime_quotes_task.py,sha256=DN3bq2XCDZC-PHlbD2NTog48bR44EruIEc2QVGKg7Tk,932
-mns_scheduler-1.0.1.7.dist-info/METADATA,sha256=fG-QpUmDiN_620Ip75cxINvZlctFJ56NL8_51PaMSfY,64
-mns_scheduler-1.0.1.7.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-mns_scheduler-1.0.1.7.dist-info/top_level.txt,sha256=PXQDFBGR1pWmsUbH5yiLAh71P5HZODTRED0zJ8CCgOc,14
-mns_scheduler-1.0.1.7.dist-info/RECORD,,
+mns_scheduler-1.0.1.9.dist-info/METADATA,sha256=74obxgGjTYzMdH_qMqCKRc4GwZaUK-3l9zemBoIoxqM,64
+mns_scheduler-1.0.1.9.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+mns_scheduler-1.0.1.9.dist-info/top_level.txt,sha256=PXQDFBGR1pWmsUbH5yiLAh71P5HZODTRED0zJ8CCgOc,14
+mns_scheduler-1.0.1.9.dist-info/RECORD,,