mns-scheduler 1.1.3.6__py3-none-any.whl → 1.1.4.0__py3-none-any.whl

mns_scheduler/common/redis/redis_msg_push_service.py

@@ -0,0 +1,18 @@
+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 redis
+import mns_common.constant.redis_msg_constant as redis_msg_constant
+
+# 连接到Redis服务器
+r = redis.Redis(host='localhost', port=6379, db=0)
+
+
+# 发送消息
+def send_redis_msg(message):
+    # 将消息推送到队列中
+    r.publish(redis_msg_constant.REDIS_MSG_TOPIC, message)

mns_scheduler/company_info/clean/company_info_clean_api.py

@@ -11,7 +11,7 @@ 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.concept.ths.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')

mns_scheduler/concept/clean/ths_concept_clean_api.py

@@ -7,11 +7,12 @@ project_path = file_path[0:end]
 sys.path.append(project_path)
 from mns_common.db.MongodbUtil import MongodbUtil
 import pandas as pd
-import mns_scheduler.concept.common.detaill.ths_concept_detail_api as ths_concept_detail_api
+import mns_scheduler.concept.ths.detaill.ths_concept_detail_api as ths_concept_detail_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
+import mns_common.component.concept.ths_concept_common_service_api as ths_concept_common_service_api
 
 mongodb_util = MongodbUtil('27017')
 
@@ -21,59 +22,64 @@ def update_ths_concept_info():
     ths_concept_list = mongodb_util.find_all_data(db_name_constant.THS_CONCEPT_LIST)
     for ths_concept_one in ths_concept_list.itertuples():
         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]
-                first_relevance_industry_number = list(ths_concept_group.iloc[0:1]['number'])[0]
-                second_relevance_industry = list(ths_concept_group.iloc[1:2]['industry'])[0]
-                second_relevance_industry_number = list(ths_concept_group.iloc[1:2]['number'])[0]
-            else:
-                first_relevance_industry = list(ths_concept_group.iloc[0:1]['industry'])[0]
-                first_relevance_industry_number = list(ths_concept_group.iloc[0:1]['number'])[0]
-                second_relevance_industry = '无'
-                second_relevance_industry_number = 0
-            ths_concept_list_one_df['first_relevance_industry'] = first_relevance_industry
-            ths_concept_list_one_df['second_relevance_industry'] = second_relevance_industry
-            ths_concept_list_one_df['first_relevance_industry_number'] = first_relevance_industry_number
-            ths_concept_list_one_df['second_relevance_industry_number'] = second_relevance_industry_number
-
-            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)
-
+            update_one_concept_relevance_industry(ths_concept_one.symbol)
         except BaseException as e:
             logger.error("更新概念信息异常:{},{}", e, ths_concept_one.name)
 
 
+# 更新一个概念行业相关
+def update_one_concept_relevance_industry(concept_code):
+    query = {'concept_code': concept_code}
+    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 = ths_concept_common_service_api.get_all_ths_concept()
+    ths_concept_list_one_df = ths_concept_list.loc[ths_concept_list['symbol'] == concept_code]
+    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]
+        first_relevance_industry_number = list(ths_concept_group.iloc[0:1]['number'])[0]
+        second_relevance_industry = list(ths_concept_group.iloc[1:2]['industry'])[0]
+        second_relevance_industry_number = list(ths_concept_group.iloc[1:2]['number'])[0]
+    else:
+        first_relevance_industry = list(ths_concept_group.iloc[0:1]['industry'])[0]
+        first_relevance_industry_number = list(ths_concept_group.iloc[0:1]['number'])[0]
+        second_relevance_industry = '无'
+        second_relevance_industry_number = 0
+    ths_concept_list_one_df['first_relevance_industry'] = first_relevance_industry
+    ths_concept_list_one_df['second_relevance_industry'] = second_relevance_industry
+    ths_concept_list_one_df['first_relevance_industry_number'] = first_relevance_industry_number
+    ths_concept_list_one_df['second_relevance_industry_number'] = second_relevance_industry_number
+
+    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)
+
+
 # 更新空名字
 def update_null_name():
     query = {"_id": {'$gte': 886025}}

mns_scheduler/concept/ths/common/ths_concept_sync_common_api.py

@@ -13,32 +13,27 @@ mongodb_util = MongodbUtil('27017')
 import mns_common.api.msg.push_msg_api as push_msg_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
+import mns_scheduler.concept.ths.detaill.ths_concept_detail_api as ths_concept_detail_api
 import mns_common.component.concept.ths_concept_common_service_api as ths_concept_common_service_api
 import mns_common.component.company.company_common_service_new_api as company_common_service_new_api
 import mns_common.utils.data_frame_util as data_frame_util
 import mns_common.constant.db_name_constant as db_name_constant
+import mns_scheduler.common.redis.redis_msg_push_service as redis_msg_push_service
+import mns_scheduler.concept.clean.ths_concept_clean_api as ths_concept_clean_api
+import mns_common.constant.redis_msg_constant as redis_msg_constant
 
-max_concept_code = 886110
 
-order_fields = [
-    "index",
-    "symbol",
-    "name",
-    "now_price",
-    "chg",
-    "change",
-    "exchange",
-    "amount",
-    "concept_code",
-]
-
-
-# 推送到手机
-def push_msg_to_we_chat_web(concept_code, concept_name, url):
+# 推送消息
+def push_msg_to_we_chat_and_redis(concept_code, concept_name, url):
     msg = "概念代码:" + str(concept_code) + "," + "概念名称:" + concept_name + "," + "url:   " + url
     title = "新增同花顺概念:" + str(concept_code) + "-" + concept_name
+    # 推送到微信
     push_msg_api.push_msg_to_wechat(title, msg)
+    # 项目之前推送消息
+    redis_msg_push_service.send_redis_msg(redis_msg_constant.THS_NEW_CONCEPT_ADD_MSG)
+
+    # 更新ths概念信息
+    ths_concept_clean_api.update_ths_concept_info()
 
 
 # 保存新概念信息到数据库
@@ -50,18 +45,6 @@ def save_ths_concept_list(concept_code, concept_name, str_day, str_now_time):
     mongodb_util.save_mongo(ths_concept_list, 'ths_concept_list')
 
 
-# 获取最大概念代码
-def get_max_concept_code():
-    query = {"symbol": {'$ne': 'null'}, "success": True}
-    ths_concept_max = mongodb_util.descend_query(query, 'ths_concept_list', 'symbol', 1)
-    if ths_concept_max.shape[0] == 0:
-        concept_code = 885284
-    else:
-        concept_code = list(ths_concept_max['symbol'])[0]
-
-    return concept_code
-
-
 # 保存新概念详细信息到数据库
 def save_ths_concept_detail(new_concept_symbol_df,
                             concept_name, str_day,
@@ -179,6 +162,18 @@ def update_company_info(new_concept_symbol_df):
         company_common_service_api.company_info_industry_cache_clear()
 
 
+# 获取最大概念代码
+def get_max_concept_code():
+    query = {"symbol": {'$ne': 'null'}, "success": True}
+    ths_concept_max = mongodb_util.descend_query(query, 'ths_concept_list', 'symbol', 1)
+    if ths_concept_max.shape[0] == 0:
+        concept_code = 885284
+    else:
+        concept_code = list(ths_concept_max['symbol'])[0]
+
+    return concept_code
+
+
 def get_concept_detail_info_web(concept_code):
     new_concept_symbol_list = ths_concept_detail_api.get_ths_concept_detail(concept_code, None)
     if new_concept_symbol_list is None or new_concept_symbol_list.shape[0] == 0:

mns_scheduler/concept/{common → ths}/detaill/ths_concept_detail_api.py

@@ -16,6 +16,11 @@ import math
 from loguru import logger
 import pandas as pd
 import mns_common.utils.data_frame_util as data_frame_util
+import time
+from datetime import datetime
+import mns_scheduler.concept.ths.common.ths_concept_sync_common_api as ths_concept_sync_common_api
+import mns_scheduler.common.redis.redis_msg_push_service as redis_msg_push_service
+import mns_common.constant.redis_msg_constant as redis_msg_constant
 
 
 def get_ths_concept_detail(concept_code, concept_name):
@@ -55,6 +60,9 @@ def get_ths_concept_detail(concept_code, concept_name):
         not_in_ths_concept_detail_by_explain = result_df.loc[~(
             result_df['symbol'].isin(ths_concept_detail_by_explain['symbol']))]
         result_df = pd.concat([ths_concept_detail_by_explain_new, not_in_ths_concept_detail_by_explain])
+    result_df['concept_code'] = concept_code
+    result_df['change'] = 0
+    result_df['index'] = 0
     return result_df
 
 
@@ -188,10 +196,30 @@ def merge_data_common_fun(result_df, real_time_quotes_all_stocks):
     return result_df
 
 
+# 同步概念详情到db
+def sync_ths_concept_detail_to_db(concept_code, concept_name):
+    new_concept_symbol_detail_df = get_ths_concept_detail(concept_code, concept_name)
+    if data_frame_util.is_empty(new_concept_symbol_detail_df):
+        time.sleep(10)
+        return None
+    now_date = datetime.now()
+    str_now_time = now_date.strftime('%Y-%m-%d %H:%M:%S')
+    time.sleep(1)
+    str_day = now_date.strftime('%Y-%m-%d')
+    new_concept_symbol_detail_df.loc[:, 'way'] = 'index_sync'
+    ths_concept_sync_common_api.save_ths_concept_detail(new_concept_symbol_detail_df,
+                                                        concept_name,
+                                                        str_day,
+                                                        str_now_time, concept_code)
+
+    # 项目之前推送消息
+    redis_msg_push_service.send_redis_msg(redis_msg_constant.THS_NEW_CONCEPT_ADD_MSG)
+
+
 if __name__ == '__main__':
-    get_ths_concept_detail('886080', '财税数字化')
-    real_time_quotes_all_stocks_df = east_money_stock_api.get_real_time_quotes_all_stocks()
-    get_ths_concept_detail_by_explain('886078', real_time_quotes_all_stocks_df)
-    get_ths_concept_detail_from_web('886078', real_time_quotes_all_stocks_df)
-    get_ths_concept_detail('886073', '铜缆高速连接')
-    get_ths_concept_detail_by_wen_cai('PCB概念', real_time_quotes_all_stocks_df)
+    sync_ths_concept_detail_to_db('886084', '光纤概念')
+    # real_time_quotes_all_stocks_df = east_money_stock_api.get_real_time_quotes_all_stocks()
+    # get_ths_concept_detail_by_explain('886084', real_time_quotes_all_stocks_df)
+    # get_ths_concept_detail_from_web('886084', real_time_quotes_all_stocks_df)
+    # get_ths_concept_detail('886084', '光纤概念')
+    # get_ths_concept_detail_by_wen_cai('光纤概念', real_time_quotes_all_stocks_df)

mns_scheduler/concept/ths/sync_new_index/sync_ths_concept_new_index_api.py

@@ -14,10 +14,13 @@ from mns_common.db.MongodbUtil import MongodbUtil
 from datetime import datetime
 import mns_scheduler.concept.clean.ths_concept_clean_api as ths_concept_clean_api
 import pandas as pd
-import mns_scheduler.concept.common.detaill.ths_concept_detail_api as ths_concept_detail_api
+import mns_scheduler.concept.ths.detaill.ths_concept_detail_api as ths_concept_detail_api
 import mns_common.constant.db_name_constant as db_name_constant
+import mns_scheduler.common.redis.redis_msg_push_service as redis_msg_push_service
+import mns_common.constant.redis_msg_constant as redis_msg_constant
 
 mongodb_util = MongodbUtil('27017')
+import mns_common.component.concept.ths_concept_common_service_api as ths_concept_common_service_api
 
 
 def sync_ths_concept_new_index():
@@ -28,17 +31,17 @@ def sync_ths_concept_new_index():
 
 
 '''
-同步ths新概念 通过app搜索
+同步ths新概念 通过app搜索代码
 '''
 
 
 def sync_ths_concept_new_index_from_app():
     # 当前最大概念代码
     max_concept_code = ths_concept_sync_common_api.get_max_concept_code()
-    # 最大概念代码上线
+    # 最大概念代码上限
     max_concept_code_limit = max_concept_code + 2
     # 同花顺概念列表
-    ths_concept_list_exist = mongodb_util.find_all_data(db_name_constant.THS_CONCEPT_LIST)
+    ths_concept_list_exist = ths_concept_common_service_api.get_all_ths_concept()
     # 同步向上3次
     while max_concept_code <= max_concept_code_limit:
         try:
@@ -76,16 +79,10 @@ def sync_ths_concept_new_index_from_app():
                 diff_one_df = pd.DataFrame(new_concept_one, index=[1])
                 mongodb_util.save_mongo(diff_one_df, db_name_constant.THS_CONCEPT_LIST)
                 # 新增概念信息处理
-                handle_new_concept_msg(concept_code, concept_name, url)
-
-                new_concept_symbol_detail_df = ths_concept_detail_api.get_ths_concept_detail(concept_code, concept_name)
-                if data_frame_util.is_empty(new_concept_symbol_detail_df):
-                    continue
-                new_concept_symbol_detail_df.loc[:, 'way'] = 'index_sync'
-                ths_concept_sync_common_api.save_ths_concept_detail(new_concept_symbol_detail_df,
-                                                                    concept_name,
-                                                                    str_day,
-                                                                    str_now_time, concept_code)
+                ths_concept_sync_common_api.push_msg_to_we_chat_and_redis(concept_code, concept_name,
+                                                                          url)
+                #    同步概念详情到db
+                ths_concept_detail_api.sync_ths_concept_detail_to_db(concept_code, concept_name)
                 # 更新ths概念统计信息
                 ths_concept_clean_api.update_ths_concept_info()
 
@@ -96,7 +93,7 @@ def sync_ths_concept_new_index_from_app():
 
 
 '''
-同步新概念 by ths detail
+同步新概念 by ths detail 通过详情判断
 '''
 
 
@@ -142,7 +139,8 @@ def sync_ths_concept_new_index_from_detail():
                 diff_one_df = pd.DataFrame(new_concept_one, index=[1])
                 mongodb_util.save_mongo(diff_one_df, db_name_constant.THS_CONCEPT_LIST)
                 # 新增概念信息处理
-                handle_new_concept_msg(concept_code, concept_name, url)
+                ths_concept_sync_common_api.push_msg_to_we_chat_and_redis(concept_code, concept_name,
+                                                                          url)
 
                 new_concept_symbol_detail_df.loc[:, 'way'] = 'index_sync'
                 ths_concept_sync_common_api.save_ths_concept_detail(new_concept_symbol_detail_df,
@@ -150,21 +148,16 @@ def sync_ths_concept_new_index_from_detail():
                                                                     str_day,
                                                                     str_now_time,
                                                                     concept_code)
-                # 更新ths概念统计信息
-                ths_concept_clean_api.update_ths_concept_info()
 
                 logger.info("新增同花顺新概念:{}", concept_name)
 
         except BaseException as e:
             logger.error("同步新增概念代码:{},信息异常:{}", max_concept_code, e)
-
-
-# 新增消息处理
-def handle_new_concept_msg(concept_code, concept_name, url):
-    # 推送新概念信息到微信
-    ths_concept_sync_common_api.push_msg_to_we_chat_web(concept_code, concept_name,
-                                                        url)
+    # 更新ths概念统计信息
+    ths_concept_clean_api.update_ths_concept_info()
+    # 项目之前推送消息
+    redis_msg_push_service.send_redis_msg(redis_msg_constant.THS_NEW_CONCEPT_ADD_MSG)
 
 
 if __name__ == '__main__':
-    sync_ths_concept_new_index_from_detail()
+    sync_ths_concept_new_index()

mns_scheduler/concept/ths/update_concept_info/sync_one_concept_all_symbols_api.py

@@ -5,36 +5,24 @@ file_path = os.path.abspath(__file__)
 end = file_path.index('mns') + 17
 project_path = file_path[0:end]
 sys.path.append(project_path)
-
-import time
 import datetime
-from mns_common.db.MongodbUtil import MongodbUtil
-import mns_scheduler.concept.ths.common.ths_concept_sync_common_api as ths_concept_sync_common_api
-
-mongodb_util = MongodbUtil('27017')
+import mns_scheduler.concept.ths.detaill.ths_concept_detail_api as ths_concept_detail_api
+import mns_common.component.concept.ths_concept_common_service_api as ths_concept_common_service_api
+from loguru import logger
 
 
 # 通过概念指数同步所有概念下的股票组成
 
 # 同步概念下所有股票组成
 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 = ths_concept_common_service_api.get_all_ths_concept()
     new_concept_list = new_concept_list.sort_values(by=['symbol'], ascending=False)
-    if new_concept_list.shape[0] > 0:
-        for one_concept in new_concept_list.itertuples():
-            now_date_time = datetime.datetime.now()
-            str_day = now_date_time.strftime('%Y-%m-%d')
-            str_now_time = now_date_time.strftime('%Y-%m-%d %H:%M:%S')
-            new_concept_symbol_df = ths_concept_sync_common_api.get_concept_detail_info_web(one_concept.symbol)
 
-            if new_concept_symbol_df is None or new_concept_symbol_df.shape[0] == 0:
-                time.sleep(10)
-                continue
-            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)
+    for one_concept in new_concept_list.itertuples():
+        try:
+            ths_concept_detail_api.sync_ths_concept_detail_to_db(one_concept.symbol, one_concept.name)
+        except BaseException as e:
+            logger.error("同步概念下所有股票组成异常:{},{}，｛｝", one_concept.symbol, one_concept.name, e)
 
 
 if __name__ == '__main__':

mns_scheduler/concept/ths/update_concept_info/sync_one_symbol_all_concepts_api.py

@@ -1,6 +1,5 @@
 import os
 import sys
-import pandas as pd
 import mns_common.api.ths.concept.web.ths_concept_detail_web as ths_concept_detail_web
 import mns_common.api.em.east_money_stock_api as east_money_stock_api
 import mns_common.component.common_service_fun_api as common_service_fun_api
@@ -13,6 +12,9 @@ import mns_scheduler.concept.ths.common.ths_concept_sync_common_api as ths_conce
 import threading
 import mns_scheduler.concept.ths.common.ths_concept_update_common_api as ths_concept_update_common_api
 import mns_common.utils.date_handle_util as date_handle_util
+import mns_common.constant.db_name_constant as db_name_constant
+import mns_scheduler.common.redis.redis_msg_push_service as redis_msg_push_service
+import mns_common.constant.redis_msg_constant as redis_msg_constant
 
 file_path = os.path.abspath(__file__)
 end = file_path.index('mns') + 17
@@ -21,16 +23,16 @@ sys.path.append(project_path)
 mongodb_util = MongodbUtil('27017')
 # 分页大小
 MAX_PAGE_NUMBER = 2500
-# 获取单只股票新增概念
 
-db_name = 'ths_stock_concept_detail_app'
+
+# 获取单只股票新增概念
 
 
 def create_index():
-    mongodb_util.create_index(db_name, [("symbol", 1)])
-    mongodb_util.create_index(db_name, [("str_day", 1)])
-    mongodb_util.create_index(db_name, [("title", 1)])
-    mongodb_util.create_index(db_name, [("str_now_date", 1)])
+    mongodb_util.create_index(db_name_constant.THS_STOCK_CONCEPT_DETAIL_APP, [("symbol", 1)])
+    mongodb_util.create_index(db_name_constant.THS_STOCK_CONCEPT_DETAIL_APP, [("str_day", 1)])
+    mongodb_util.create_index(db_name_constant.THS_STOCK_CONCEPT_DETAIL_APP, [("title", 1)])
+    mongodb_util.create_index(db_name_constant.THS_STOCK_CONCEPT_DETAIL_APP, [("str_now_date", 1)])
 
 
 # 同步新概念到详情表中
@@ -52,6 +54,8 @@ def sync_new_concept_to_ths_detail(symbol_add_new_concept_df, str_day, str_now_t
 
         except BaseException as e:
             logger.error("转换同花顺概念异常:{},{}", new_concept_one, e)
+    # 项目之前推送消息
+    redis_msg_push_service.send_redis_msg(redis_msg_constant.THS_NEW_CONCEPT_ADD_MSG)
 
 
 # 保存数据到对比
@@ -60,7 +64,7 @@ def save_data_to_db(ths_concept_df):
     if data_frame_util.is_empty(ths_concept_df):
         return
     json_data = ths_concept_df.to_dict(orient='records')
-    mongodb_util.save_mongo_json(json_data, db_name)
+    mongodb_util.save_mongo_json(json_data, db_name_constant.THS_STOCK_CONCEPT_DETAIL_APP)
 
 
 # 对比数据库和接口概念详情的差值

mns_scheduler/risk/self/wei_pan_stock_api.py

@@ -6,7 +6,7 @@ end = file_path.index('mns') + 16
 project_path = file_path[0:end]
 sys.path.append(project_path)
 
-import mns_scheduler.concept.common.detaill.ths_concept_detail_api as ths_concept_detail_api
+import mns_scheduler.concept.ths.detaill.ths_concept_detail_api as ths_concept_detail_api
 import mns_common.component.self_choose.black_list_service_api as black_list_service_api
 from datetime import datetime
 from loguru import logger

mns_scheduler/zz_task/data_sync_task.py

@@ -437,7 +437,7 @@ blockingScheduler.add_job(update_best_choose_plate_relation, 'cron', hour='09,18
 blockingScheduler.add_job(sync_kpl_best_his_quotes, 'cron', hour='18,22', minute='25')
 
 # 更新开盘啦指数关系
-blockingScheduler.add_job(sync_position, 'cron', hour='0,08', minute='10')
+blockingScheduler.add_job(sync_position, 'cron', hour='0,09', minute='10')
 
 # 同步高风险股票
 blockingScheduler.add_job(sync_high_risk_stocks, 'cron', hour='0,09,12,16', minute='20')

{mns_scheduler-1.1.3.6.dist-info → mns_scheduler-1.1.4.0.dist-info}/METADATA

@@ -1,4 +1,4 @@
 Metadata-Version: 2.1
 Name: mns-scheduler
-Version: 1.1.3.6
+Version: 1.1.4.0
 

{mns_scheduler-1.1.3.6.dist-info → mns_scheduler-1.1.4.0.dist-info}/RECORD

@@ -1,23 +1,14 @@
 mns_scheduler/__init__.py,sha256=Tyvi_iQlv3jz59EdH67Mycnt9CSixcWPQoJwu55bOq0,165
-mns_scheduler/backup/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
-mns_scheduler/backup/data/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
-mns_scheduler/backup/data/collection_move.py,sha256=WZN6-312jBbWrNqXCSk-0yTQ60ajUUWAqr2exVfotKU,2005
-mns_scheduler/backup/data/sync_data_to_local.py,sha256=o_kEcBoG8-CjLS7f_cXUBMo_z5MHn2z1WYnaobNDW90,1737
-mns_scheduler/backup/data/sync_remote_by_str_day.py,sha256=uEi-8j5gqRvWoJwIJGAr1Dc7UCmpXAh7q1IMS-Z88Fw,1220
-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_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
-mns_scheduler/backup/ths/sync_ths_new_concept_by_web_api.py,sha256=dLd2V67AFnE9xf5H8YGyaJ0j7z8FhtTemFVGOuOeHJ4,4087
 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/common/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
+mns_scheduler/common/redis/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
+mns_scheduler/common/redis/redis_msg_push_service.py,sha256=uJxiwc5SVQnAX7Pc_w7tgXBK_H2SP1LhjgdL2QZQnm8,472
 mns_scheduler/company_info/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
 mns_scheduler/company_info/base/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
 mns_scheduler/company_info/base/sync_company_base_info_api.py,sha256=NRuwc5oJF9Ngt932OrnG76oP22OmkjbGgcWKgWplafg,19106
 mns_scheduler/company_info/clean/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
-mns_scheduler/company_info/clean/company_info_clean_api.py,sha256=Pn2cRt3oRH-VRkHMZdsp-nJTFWrD5VSVRoH_uI_8-j0,4861
+mns_scheduler/company_info/clean/company_info_clean_api.py,sha256=n3kxsqihPjKJvGDkAjMYqB_U2EPemOi1Yjez5yOYJeo,4858
 mns_scheduler/company_info/constant/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
 mns_scheduler/company_info/constant/company_constant_data.py,sha256=XIM81fA4PNalVJNBYXiMddkcW012fFtofoPGYy2VtD0,16001
 mns_scheduler/company_info/de_list_stock/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
@@ -27,19 +18,18 @@ mns_scheduler/company_info/remark/company_remark_info_sync.py,sha256=hzQ8uBK4-od
 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
-mns_scheduler/concept/clean/ths_concept_clean_api.py,sha256=42sbd8VqJeOKxJuxLVsU9YFK_YUSePTGrK2AWbabhA0,5964
-mns_scheduler/concept/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mns_scheduler/concept/common/detaill/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mns_scheduler/concept/common/detaill/ths_concept_detail_api.py,sha256=Au_l7SVcp4kRaR2vo1FP3BmYHeRI9fkOk_sTwzpRYw4,9435
+mns_scheduler/concept/clean/ths_concept_clean_api.py,sha256=wxdT5Eb3awHW9HuFlgSe8-C6sC6TNaDYozr8VvNdYe0,5953
 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=CDo5d2dA36a99bS4vxg2ZRdSc-l_NwPSzmkxjAWLyFY,8146
+mns_scheduler/concept/ths/common/ths_concept_sync_common_api.py,sha256=nvPo4EW7nsULLoZhRF5E5a6Qm4svd6EScWUsB0MmDa0,8416
 mns_scheduler/concept/ths/common/ths_concept_update_common_api.py,sha256=4BQT3A9t-nDIyCpILgRZF7ZOgK1oabp-gJl5nyWvKWc,4418
+mns_scheduler/concept/ths/detaill/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mns_scheduler/concept/ths/detaill/ths_concept_detail_api.py,sha256=qPJllFhy9BSM4LOCAbQ5MLhpOvP3oNxlwzhgvHFKsn4,10784
 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/sync_new_index/sync_ths_concept_new_index_api.py,sha256=vNe9Wt0yTiPLj0svA-2H4Pd94P9yr1kNM0EJmaw85uE,7621
 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=wlsr70rcS-uAH6b8NXPbA-wG37saeIQ0FIg8vSSTXQA,1920
-mns_scheduler/concept/ths/update_concept_info/sync_one_symbol_all_concepts_api.py,sha256=HVqDSBruORebtiliKps2swJo_GNg_8mqT0r9cZX6sj8,8839
+mns_scheduler/concept/ths/update_concept_info/sync_one_concept_all_symbols_api.py,sha256=wwuLfjj9AnFcHP-oQPC5AhpwgZ8IsPiNUh-Z6swcngA,1380
+mns_scheduler/concept/ths/update_concept_info/sync_one_symbol_all_concepts_api.py,sha256=nwDsH3wD_EXf4HHtwEsj0HFezGdIe0MPB-r6l8WOjY8,9305
 mns_scheduler/db/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
 mns_scheduler/db/col_move_service.py,sha256=-d3JUCjWyaGKBhyUSkqwpCgZtHkIy1JOasgpxmH74zg,4057
 mns_scheduler/db/db_status.py,sha256=e5eW5ZSm5J7tHvmxxhFmFdbZb2_oB_SAcdcFqc4KDmw,733
@@ -102,7 +92,7 @@ mns_scheduler/risk/financial/stock_equity_mortgage_check_api.py,sha256=SQ7dieSCO
 mns_scheduler/risk/major_violations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mns_scheduler/risk/major_violations/register_and_investigate_stock_sync_api.py,sha256=_xPQxT6OS7J7_PtA7hbfCmMS7VzpZTWoZUOXzwoesUs,5672
 mns_scheduler/risk/self/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mns_scheduler/risk/self/wei_pan_stock_api.py,sha256=osU3XrPZXDzPdtVCq601ZlSTZUqIhGxoXsowWgPAM4w,1902
+mns_scheduler/risk/self/wei_pan_stock_api.py,sha256=5ebrjFqK49j_yEMffFBCumMeBzq_rmtsA4--lL5mhZs,1899
 mns_scheduler/risk/test/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
 mns_scheduler/risk/test/fix_blask_list.py,sha256=jjLhhIWH1L4CgNp2jQ_HAHbC3wVgeX1TzhqC--_D2MI,1249
 mns_scheduler/risk/transactions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -137,8 +127,8 @@ mns_scheduler/zt/zt_pool/__init__.py,sha256=Tyvi_iQlv3jz59EdH67Mycnt9CSixcWPQoJw
 mns_scheduler/zt/zt_pool/em_zt_pool_sync_api.py,sha256=x3-NCugHoY5IuX2s1UOUMl8DZsi9nrtMbEGzxWqJj3c,7642
 mns_scheduler/zt/zt_pool/ths_zt_pool_sync_api.py,sha256=LJVGqJyLn04oC-Xp59RVE1IOz7lx6ao78bw9l67sKBM,10382
 mns_scheduler/zz_task/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
-mns_scheduler/zz_task/data_sync_task.py,sha256=EexJz4F5WtyZ5N7qG3U6IzHHQwnvN-EqQEUxcTyRRyk,19069
-mns_scheduler-1.1.3.6.dist-info/METADATA,sha256=opxAG3nIDFb9cCSSwfu74O337LqTVNM3majHT4m9AP8,64
-mns_scheduler-1.1.3.6.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-mns_scheduler-1.1.3.6.dist-info/top_level.txt,sha256=PXQDFBGR1pWmsUbH5yiLAh71P5HZODTRED0zJ8CCgOc,14
-mns_scheduler-1.1.3.6.dist-info/RECORD,,
+mns_scheduler/zz_task/data_sync_task.py,sha256=KI7I5R4RFZ67KSzXJiObnIrsKecvvvMQpCFNMX1qHJQ,19069
+mns_scheduler-1.1.4.0.dist-info/METADATA,sha256=yPwQkWkKLxLHIzzyZIWpcotteXG5QNZAF-7y25ISL3k,64
+mns_scheduler-1.1.4.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+mns_scheduler-1.1.4.0.dist-info/top_level.txt,sha256=PXQDFBGR1pWmsUbH5yiLAh71P5HZODTRED0zJ8CCgOc,14
+mns_scheduler-1.1.4.0.dist-info/RECORD,,