mns-scheduler 1.1.3.5__py3-none-any.whl → 1.1.3.9__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.THS_NEW_CONCEPT_ADD, 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,26 @@ 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
 
-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("新增同花顺概念")
+
+    # 更新ths概念信息
+    ths_concept_clean_api.update_ths_concept_info()
 
 
 # 保存新概念信息到数据库
@@ -50,18 +44,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 +161,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,7 +16,10 @@ 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
 
 def get_ths_concept_detail(concept_code, concept_name):
     real_time_quotes_all_stocks = east_money_stock_api.get_real_time_quotes_all_stocks()
@@ -55,6 +58,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 +194,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("新增同花顺概念")
+
+
 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,12 @@ 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
 
 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 +30,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 +78,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 +92,7 @@ def sync_ths_concept_new_index_from_app():
 
 
 '''
-同步新概念 by ths detail
+同步新概念 by ths detail 通过详情判断
 '''
 
 
@@ -142,7 +138,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 +147,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("新增同花顺概念")
 
 
 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,8 @@ 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
 
 file_path = os.path.abspath(__file__)
 end = file_path.index('mns') + 17
@@ -21,16 +22,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 +53,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("新增同花顺概念")
 
 
 # 保存数据到对比
@@ -60,7 +63,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/self_choose/ths_self_choose_service.py

@@ -10,7 +10,10 @@ import mns_common.constant.db_name_constant as db_name_constant
 from mns_common.db.MongodbUtil import MongodbUtil
 import mns_common.api.ths.zt.ths_stock_zt_pool_api as ths_stock_zt_pool_api
 import mns_common.component.common_service_fun_api as common_service_fun_api
-
+import mns_common.component.trade_date.trade_date_common_service_api as trade_date_common_service_api
+from datetime import datetime
+import mns_common.utils.data_frame_util as data_frame_util
+from functools import lru_cache
 mongodb_util = MongodbUtil('27017')
 
 # 固定的选择
@@ -20,6 +23,7 @@ fixed_optional_list = ['USDCNH', 'XAUUSD',
                        '885736', '881124', '886078',
                        '881145', '886073', '881160', '885730',
                        '886076', '883418', '881169', '885530',
+                       '510300', '512100',
                        'CN0Y',
                        '1B0888',
                        '1A0001',
@@ -31,30 +35,43 @@ fixed_optional_list = ['USDCNH', 'XAUUSD',
                        'HS2083',
                        ]
 
-
-def add_fixed_optional():
+@lru_cache()
+def get_ths_cookie():
     query = {"type": "ths_cookie"}
     stock_account_info = mongodb_util.find_query_data(db_name_constant.STOCK_ACCOUNT_INFO, query)
     ths_cookie = list(stock_account_info['cookie'])[0]
+    return ths_cookie
+
+
+def add_fixed_optional():
+    ths_cookie = get_ths_cookie()
     for symbol in fixed_optional_list:
         ths_self_choose_api.add_stock_to_account(symbol, ths_cookie)
 
 
 def delete_all_self_choose_stocks():
-    query = {"type": "ths_cookie"}
-    stock_account_info = mongodb_util.find_query_data(db_name_constant.STOCK_ACCOUNT_INFO, query)
-    ths_cookie = list(stock_account_info['cookie'])[0]
+    ths_cookie = get_ths_cookie()
     all_self_choose_stock_list = ths_self_choose_api.get_all_self_choose_stock_list(ths_cookie)
     for stock_one in all_self_choose_stock_list.itertuples():
         symbol = stock_one.code
         ths_self_choose_api.del_stock_from_account(symbol, ths_cookie)
 
 
+def add_self_choose_local():
+    now_date = datetime.now()
+    str_day = now_date.strftime('%Y-%m-%d')
+    last_trade_day = trade_date_common_service_api.get_last_trade_day(str_day)
+    query = {"$and": [{"str_day": {"$gte": last_trade_day}}, {"str_day": {"$lte": str_day}}]}
+    trade_stocks_df = mongodb_util.find_query_data(db_name_constant.BUY_STOCK_NAME, query)
+    ths_cookie = get_ths_cookie()
+    if data_frame_util.is_not_empty(trade_stocks_df):
+        for stock_one in trade_stocks_df.itertuples():
+            ths_self_choose_api.add_stock_to_account(stock_one.symbol, ths_cookie)
+
+
 # 添加连板到自选
 def add_continue_boards_zt_stocks():
-    query = {"type": "ths_cookie"}
-    stock_account_info = mongodb_util.find_query_data(db_name_constant.STOCK_ACCOUNT_INFO, query)
-    ths_cookie = list(stock_account_info['cookie'])[0]
+    ths_cookie = get_ths_cookie()
     ths_stock_zt_pool_df = ths_stock_zt_pool_api.get_zt_reason(None)
     ths_stock_zt_pool_df = ths_stock_zt_pool_df.loc[ths_stock_zt_pool_df['connected_boards_numbers'] > 1]
     ths_stock_zt_pool_df = common_service_fun_api.exclude_st_symbol(ths_stock_zt_pool_df)
@@ -66,6 +83,7 @@ def add_continue_boards_zt_stocks():
 # 自选股操作 删除当天自选股 增加新的连板股票  添加固定选择自选
 def self_choose_stock_handle():
     delete_all_self_choose_stocks()
+    add_self_choose_local()
     add_continue_boards_zt_stocks()
     add_fixed_optional()
 

mns_scheduler/zt/zt_pool/ths_zt_pool_sync_api.py

@@ -227,22 +227,22 @@ def save_ths_zt_pool(ths_zt_pool_df, str_day):
 
 
 if __name__ == '__main__':
-    trade_date = '2015-05-28'
-    zt_df = ths_zt_pool(trade_date, None)
-    save_ths_zt_pool(zt_df, trade_date)
-    while True:
-        query = {"$and": [{'_id': {"$gte": '2013-07-04'}}, {'_id': {"$lte": '2015-05-05'}}]}
-
-        trade_date_list = mongodb_util.find_query_data('trade_date_list', query)
-        trade_date_list = trade_date_list.sort_values(by=['trade_date'], ascending=False)
-        for trade_one in trade_date_list.itertuples():
-            try:
-                trade_date = trade_one.trade_date
-                zt_df = ths_zt_pool(trade_date, None)
-
-                # zt_df = mongodb_util.find_query_data(db_name_constant.THS_ZT_POOL, query={"str_day": trade_date})
-                save_ths_zt_pool(zt_df, trade_date)
-                logger.info("同步到日期:{}", trade_date)
-                time.sleep(2)
-            except BaseException as e:
-                logger.warning("同步涨停到日期:{},{}", trade_one.trade_date, e)
+    # trade_date = '2024-08-01'
+    # zt_df = ths_zt_pool(trade_date, None)
+    # save_ths_zt_pool(zt_df, trade_date)
+
+    query = {"$and": [{'_id': {"$gte": '2013-07-04'}}, {'_id': {"$lte": '2015-04-30'}}]}
+    # query = {"$and": [{'_id': {"$gte": '2024-07-24'}}, {'_id': {"$lte": '2024-08-01'}}]}
+    trade_date_list = mongodb_util.find_query_data('trade_date_list', query)
+    trade_date_list = trade_date_list.sort_values(by=['trade_date'], ascending=False)
+    for trade_one in trade_date_list.itertuples():
+        try:
+            trade_date = trade_one.trade_date
+            zt_df = ths_zt_pool(trade_date, None)
+
+            # zt_df = mongodb_util.find_query_data(db_name_constant.THS_ZT_POOL, query={"str_day": trade_date})
+            save_ths_zt_pool(zt_df, trade_date)
+            logger.info("同步到日期:{}", trade_date)
+            time.sleep(2)
+        except BaseException as e:
+            logger.warning("同步涨停到日期:{},{}", trade_one.trade_date, e)

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.5.dist-info → mns_scheduler-1.1.3.9.dist-info}/METADATA

@@ -1,4 +1,4 @@
 Metadata-Version: 2.1
 Name: mns-scheduler
-Version: 1.1.3.5
+Version: 1.1.3.9