mns-scheduler 1.1.4.1__tar.gz → 1.1.4.3__tar.gz

{mns_scheduler-1.1.4.1 → mns_scheduler-1.1.4.3}/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: mns-scheduler
-Version: 1.1.4.1
+Version: 1.1.4.3

{mns_scheduler-1.1.4.1 → mns_scheduler-1.1.4.3}/mns_scheduler/company_info/base/sync_company_base_info_api.py

@@ -113,7 +113,7 @@ def sync_company_base_info(symbol_list):
     # 将日期数值转换为日期时间格式
     east_money_stock_info['list_date_01'] = pd.to_datetime(east_money_stock_info['list_date'], format='%Y%m%d')
 
-    # 开票啦实时数据
+    # 开盘啦实时数据
     kpl_real_time_quotes = kpl_real_time_quotes_api.get_kpl_real_time_quotes()
 
     if symbol_list is not None:

{mns_scheduler-1.1.4.1 → mns_scheduler-1.1.4.3}/mns_scheduler/concept/ths/common/ths_concept_sync_common_api.py

@@ -18,9 +18,9 @@ import mns_common.component.concept.ths_concept_common_service_api as ths_concep
 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
+import mns_common.component.redis_msg.redis_msg_publish_service as redis_msg_publish_service
 
 
 # 推送消息
@@ -30,7 +30,8 @@ def push_msg_to_we_chat_and_redis(concept_code, concept_name, url):
     # 推送到微信
     push_msg_api.push_msg_to_wechat(title, msg)
     # 项目之前推送消息
-    redis_msg_push_service.send_redis_msg(redis_msg_constant.THS_NEW_CONCEPT_ADD_MSG)
+    redis_msg_publish_service.send_redis_msg(redis_msg_constant.THS_CONCEPT_MSG_TOPIC,
+                                             redis_msg_constant.THS_NEW_CONCEPT_ADD_MSG)
 
     # 更新ths概念信息
     ths_concept_clean_api.update_ths_concept_info()

{mns_scheduler-1.1.4.1 → mns_scheduler-1.1.4.3}/mns_scheduler/concept/ths/detaill/ths_concept_detail_api.py

@@ -19,7 +19,7 @@ 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.component.redis_msg.redis_msg_publish_service as redis_msg_publish_service
 import mns_common.constant.redis_msg_constant as redis_msg_constant
 
 
@@ -213,7 +213,8 @@ def sync_ths_concept_detail_to_db(concept_code, concept_name):
                                                         str_now_time, concept_code)
 
     # 项目之前推送消息
-    redis_msg_push_service.send_redis_msg(redis_msg_constant.THS_NEW_CONCEPT_ADD_MSG)
+    redis_msg_publish_service.send_redis_msg(redis_msg_constant.THS_CONCEPT_MSG_TOPIC,
+                                             redis_msg_constant.THS_NEW_CONCEPT_ADD_MSG)
 
 
 if __name__ == '__main__':

{mns_scheduler-1.1.4.1 → mns_scheduler-1.1.4.3}/mns_scheduler/concept/ths/sync_new_index/sync_ths_concept_new_index_api.py

@@ -16,7 +16,7 @@ import mns_scheduler.concept.clean.ths_concept_clean_api as ths_concept_clean_ap
 import pandas as pd
 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.component.redis_msg.redis_msg_publish_service as redis_msg_publish_service
 import mns_common.constant.redis_msg_constant as redis_msg_constant
 
 mongodb_util = MongodbUtil('27017')
@@ -155,8 +155,9 @@ def sync_ths_concept_new_index_from_detail():
             logger.error("同步新增概念代码:{},信息异常:{}", max_concept_code, e)
     # 更新ths概念统计信息
     ths_concept_clean_api.update_ths_concept_info()
-    # 项目之前推送消息
-    redis_msg_push_service.send_redis_msg(redis_msg_constant.THS_NEW_CONCEPT_ADD_MSG)
+    # 项目之间推送消息
+    redis_msg_publish_service.send_redis_msg(redis_msg_constant.THS_CONCEPT_MSG_TOPIC,
+                                             redis_msg_constant.THS_NEW_CONCEPT_ADD_MSG)
 
 
 if __name__ == '__main__':

{mns_scheduler-1.1.4.1 → mns_scheduler-1.1.4.3}/mns_scheduler/concept/ths/update_concept_info/sync_one_symbol_all_concepts_api.py

@@ -13,7 +13,7 @@ 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.component.redis_msg.redis_msg_publish_service as redis_msg_publish_service
 import mns_common.constant.redis_msg_constant as redis_msg_constant
 
 file_path = os.path.abspath(__file__)
@@ -54,8 +54,9 @@ 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)
+    # 项目之间推送消息
+    redis_msg_publish_service.send_redis_msg(redis_msg_constant.THS_CONCEPT_MSG_TOPIC,
+                                             redis_msg_constant.THS_NEW_CONCEPT_ADD_MSG)
 
 
 # 保存数据到对比

{mns_scheduler-1.1.4.1 → mns_scheduler-1.1.4.3}/mns_scheduler/kpl/selection/total/sync_kpl_best_total_sync_api.py

@@ -22,7 +22,7 @@ mongodb_util = MongodbUtil('27017')
 MAX_PAGE_NUMBER = 10
 
 
-# 同步开票啦精选概念股票组成
+# 同步开盘啦精选概念股票组成
 def sync_best_choose_symbol_detail(first_index_df, page_number):
     for stock_one in first_index_df.itertuples():
         try:
@@ -76,13 +76,13 @@ def sync_all_plate_info():
     # 更新一级和二级之间的关联关系
     # 找出新增精选指数
     sync_best_choose_first_index.sync_best_choose_index()
-    logger.info("同步开票啦精选概念指数完成")
+    logger.info("同步开盘啦精选概念指数完成")
     # 同步精选概念股票组成
     multi_thread_sync_kpl_best_choose_detail()
-    logger.info("同步开票啦精选概念股票组成完成")
-    # 更新开票啦空名字名称
+    logger.info("同步开盘啦精选概念股票组成完成")
+    # 更新开盘啦空名字名称
     update_null_name()
-    logger.info("更新开票啦空名字名称")
+    logger.info("更新开盘啦空名字名称")
 
 
 # 更新一二级关系

{mns_scheduler-1.1.4.1 → mns_scheduler-1.1.4.3}/mns_scheduler/self_choose/ths_self_choose_service.py

@@ -15,6 +15,7 @@ from datetime import datetime
 import mns_common.utils.data_frame_util as data_frame_util
 from functools import lru_cache
 import mns_common.constant.self_choose_constant as self_choose_constant
+import mns_common.component.trade_date.trade_date_common_service_api as trade_date_common_service_api
 
 mongodb_util = MongodbUtil('27017')
 
@@ -91,7 +92,13 @@ def add_trade_stocks():
 # 添加连板到自选
 def add_continue_boards_zt_stocks():
     ths_cookie = get_ths_cookie()
-    ths_stock_zt_pool_df = ths_stock_zt_pool_api.get_zt_reason(None)
+    now_date = datetime.now()
+    str_day = now_date.strftime('%Y-%m-%d')
+    if trade_date_common_service_api.is_trade_day(str_day):
+        ths_stock_zt_pool_df = ths_stock_zt_pool_api.get_zt_reason(None)
+    else:
+        str_day = trade_date_common_service_api.get_last_trade_day(str_day)
+        ths_stock_zt_pool_df = ths_stock_zt_pool_api.get_zt_reason(str_day)
     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)
     ths_stock_zt_pool_df = ths_stock_zt_pool_df.sort_values(by=['connected_boards_numbers'], ascending=False)

{mns_scheduler-1.1.4.1 → mns_scheduler-1.1.4.3}/mns_scheduler.egg-info/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: mns-scheduler
-Version: 1.1.4.1
+Version: 1.1.4.3

{mns_scheduler-1.1.4.1 → mns_scheduler-1.1.4.3}/mns_scheduler.egg-info/SOURCES.txt

@@ -7,9 +7,6 @@ mns_scheduler.egg-info/dependency_links.txt
 mns_scheduler.egg-info/top_level.txt
 mns_scheduler/big_deal/__init__.py
 mns_scheduler/big_deal/ths_big_deal_sync.py
-mns_scheduler/common/__init__.py
-mns_scheduler/common/redis/__init__.py
-mns_scheduler/common/redis/redis_msg_push_service.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-1.1.4.1 → mns_scheduler-1.1.4.3}/setup.py

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

mns_scheduler-1.1.4.1/mns_scheduler/common/redis/redis_msg_push_service.py

@@ -1,18 +0,0 @@
-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-1.1.4.1/mns_scheduler/self_choose/__init__.py

@@ -1,7 +0,0 @@
-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)

mns_scheduler-1.1.4.1/mns_scheduler/zt/script/__init__.py

@@ -1,7 +0,0 @@
-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)