mns-scheduler 1.1.4.0__tar.gz → 1.1.4.2__tar.gz

{mns_scheduler-1.1.4.0 → mns_scheduler-1.1.4.2}/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: mns-scheduler
-Version: 1.1.4.0
+Version: 1.1.4.2

{mns_scheduler-1.1.4.0 → mns_scheduler-1.1.4.2}/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.0 → mns_scheduler-1.1.4.2}/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.0 → mns_scheduler-1.1.4.2}/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.0 → mns_scheduler-1.1.4.2}/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.2/mns_scheduler/hk/hk_company_info_sync_service_api.py

@@ -0,0 +1,71 @@
+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 mns_common.api.em.east_money_stock_hk_api as east_money_stock_hk_api
+import akshare as ak
+import mns_common.constant.db_name_constant as db_name_constant
+from mns_common.db.MongodbUtil import MongodbUtil
+from functools import lru_cache
+
+mongodb_util = MongodbUtil('27017')
+
+
+# 获取陆股通的列表
+@lru_cache(maxsize=None)
+def get_hk_ggt_component():
+    stock_hk_ggt_components_em_df = ak.stock_hk_ggt_components_em()
+    stock_hk_ggt_components_em_df = stock_hk_ggt_components_em_df.rename(columns={
+        "序号": "index",
+        "代码": "symbol",
+        "名称": "name"
+    })
+    return stock_hk_ggt_components_em_df
+
+
+# 获取em cookie
+@lru_cache(maxsize=None)
+def get_em_cookie():
+    query = {"type": "em_cookie"}
+    stock_account_info = mongodb_util.find_query_data(db_name_constant.STOCK_ACCOUNT_INFO, query)
+    cookie = list(stock_account_info['cookie'])[0]
+    return cookie
+
+
+# https://quote.eastmoney.com/center/gridlist.html#hk_stocks
+def sync_hk_company_info():
+    cookie = get_em_cookie()
+    hk_real_time_df = east_money_stock_hk_api.hk_real_time_quotes(cookie)
+
+    hk_real_time_df = hk_real_time_df[[
+        "symbol",
+        "name",
+        "chg",
+        "total_mv",
+        "flow_mv",
+        "list_date",
+        "industry",
+        "amount",
+        "now_price"
+    ]]
+    # 排除基金
+    hk_real_time_df = hk_real_time_df.loc[hk_real_time_df['total_mv'] != '-']
+
+    stock_hk_ggt_components_em_df = get_hk_ggt_component()
+    stock_hk_ggt_components_symbol_list = list(stock_hk_ggt_components_em_df['symbol'])
+    hk_real_time_df['hk_ggt'] = False
+    hk_real_time_df.loc[hk_real_time_df['symbol'].isin(stock_hk_ggt_components_symbol_list), 'hk_ggt'] = True
+    hk_real_time_df.loc[hk_real_time_df['industry'] == '-', 'industry'] = '其他'
+
+    hk_real_time_df['_id'] = hk_real_time_df['symbol']
+
+    hk_real_time_df.fillna(0, inplace=True)
+
+    mongodb_util.save_mongo(hk_real_time_df, db_name_constant.COMPANY_INFO_HK)
+
+
+if __name__ == '__main__':
+    sync_hk_company_info()

{mns_scheduler-1.1.4.0 → mns_scheduler-1.1.4.2}/mns_scheduler/self_choose/ths_self_choose_service.py

@@ -14,6 +14,8 @@ import mns_common.component.trade_date.trade_date_common_service_api as trade_da
 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
+
 mongodb_util = MongodbUtil('27017')
 
 # 固定的选择
@@ -35,6 +37,7 @@ fixed_optional_list = ['USDCNH', 'XAUUSD',
                        'HS2083',
                        ]
 
+
 @lru_cache()
 def get_ths_cookie():
     query = {"type": "ths_cookie"}
@@ -58,6 +61,22 @@ def delete_all_self_choose_stocks():
 
 
 def add_self_choose_local():
+    ths_cookie = get_ths_cookie()
+    query_plate = {'self_type': self_choose_constant.SELF_CHOOSE_THS_CONCEPT}
+    self_choose_plate_df = mongodb_util.find_query_data(db_name_constant.SELF_CHOOSE_PLATE, query_plate)
+    # 自选同花顺概念
+    if data_frame_util.is_not_empty(self_choose_plate_df):
+        for stock_one in self_choose_plate_df.itertuples():
+            ths_self_choose_api.add_stock_to_account(str(stock_one.self_code), ths_cookie)
+
+    self_choose_symbol_df = mongodb_util.find_all_data(db_name_constant.SELF_CHOOSE_STOCK)
+    if data_frame_util.is_not_empty(self_choose_symbol_df):
+        for stock_one in self_choose_symbol_df.itertuples():
+            ths_self_choose_api.add_stock_to_account(stock_one.symbol, ths_cookie)
+
+
+# 添加最近交易股票
+def add_trade_stocks():
     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)
@@ -83,6 +102,7 @@ def add_continue_boards_zt_stocks():
 # 自选股操作 删除当天自选股 增加新的连板股票  添加固定选择自选
 def self_choose_stock_handle():
     delete_all_self_choose_stocks()
+    add_trade_stocks()
     add_self_choose_local()
     add_continue_boards_zt_stocks()
     add_fixed_optional()

{mns_scheduler-1.1.4.0 → mns_scheduler-1.1.4.2}/mns_scheduler/zz_task/data_sync_task.py

@@ -433,10 +433,10 @@ 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')
 
-# 更新开盘啦指数关系
+# 更新开盘啦指数历史指数
 blockingScheduler.add_job(sync_kpl_best_his_quotes, 'cron', hour='18,22', minute='25')
 
-# 更新开盘啦指数关系
+# 获取同花顺持仓
 blockingScheduler.add_job(sync_position, 'cron', hour='0,09', minute='10')
 
 # 同步高风险股票
@@ -453,10 +453,10 @@ blockingScheduler.add_job(trader_client_auto_login, 'cron', hour='08,12', minute
 # 同步公司备注信息
 blockingScheduler.add_job(sync_company_remark_info, 'cron', hour='22', minute='30')
 # 自选股操作
-blockingScheduler.add_job(self_choose_stock_task, 'cron', hour='17', minute='30')
+blockingScheduler.add_job(self_choose_stock_task, 'cron', hour='17,22', minute='30')
 
 print('定时任务启动成功')
 blockingScheduler.start()
 #
 # if __name__ == '__main__':
-#     col_data_move()
+#     sync_daily_data_info()

{mns_scheduler-1.1.4.0 → mns_scheduler-1.1.4.2}/mns_scheduler.egg-info/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: mns-scheduler
-Version: 1.1.4.0
+Version: 1.1.4.2

{mns_scheduler-1.1.4.0 → mns_scheduler-1.1.4.2}/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.0 → mns_scheduler-1.1.4.2}/setup.py

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

mns_scheduler-1.1.4.0/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.0/mns_scheduler/hk/hk_company_info_sync_service_api.py

@@ -1,59 +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 mns_common.api.em.east_money_stock_hk_api as east_money_stock_hk_api
-import akshare as ak
-import mns_common.constant.db_name_constant as db_name_constant
-from mns_common.db.MongodbUtil import MongodbUtil
-
-mongodb_util = MongodbUtil('27017')
-COOKIE = 'qgqp_b_id=1e0d79428176ed54bef8434efdc0e8c3; mtp=1; ct=QVRY_s8Tiag1WfK2tSW2n03qpsX-PD8aH_rIjKVooawX8K33UVnpIofK088lD1lguWlE_OEIpQwn3PJWFPhHvSvyvYr4Zka3l4vxtZfH1Uikjtyy9z1H4Swo0rQzMKXncVzBXiOo5TjE-Dy9fcoG3ZF7UVdQ35jp_cFwzOlpK5Y; ut=FobyicMgeV51lVMr4ZJXvn-72bp0oeSOvtzifFY_U7kBFtR6og4Usd-VtBM5XBBvHq0lvd9xXkvpIqWro9EDKmv6cbKOQGyawUSMcKVP57isZCaM7lWQ6jWXajvTfvV4mIR-W_MZNK8VY0lL9W4qNMniJ6PBn_gkJsSAJCadmsyI9cxmjx--gR4m54pdF_nie_y4iWHys83cmWR2R7Bt1KKqB25OmkfCQTJJqIf7QsqangVGMUHwMC39Z9QhrfCFHKVNrlqS503O6b9GitQnXtvUdJhCmomu; pi=4253366368931142%3Bp4253366368931142%3B%E8%82%A1%E5%8F%8B9x56I87727%3BYNigLZRW%2FzMdGgVDOJbwReDWnTPHl51dB0gQLiwaCf1XY98mlJYx6eJbsoYr5Nie%2BX1L%2BzaMsec99KkX%2BT29Ds1arfST7sIBXxjUQ3dp11IPUnXy64PaBFRTHzMRWnCFJvvhc%2FAI41rXSGXolC8YMxI%2BvyPS%2BuErwgOVjC5vvsIiKeO7TLyKkhqqQJPX%2F7RWC5Sf3QLh%3Bdwjn4Xho10%2FKjqOgTWs%2FJF4%2FkdKzeuBwM8sz9aLvJovejAkCAyGMyGYA6AE67Xk2Ki7x8zdfBifF2DG%2Fvf2%2BXAYN8ZVISSEWTIXh32Z5MxEacK4JBTkqyiD93e1vFBOFQ82BqaiVmntUq0V6FrTUHGeh1gG5Sg%3D%3D; uidal=4253366368931142%e8%82%a1%e5%8f%8b9x56I87727; sid=170711377; vtpst=|; quote_lt=1; websitepoptg_api_time=1715777390466; emshistory=%5B%22%E8%BD%AC%E5%80%BA%E6%A0%87%22%2C%22%E8%BD%AC%E5%80%BA%E6%A0%87%E7%9A%84%22%5D; st_si=00364513876913; st_asi=delete; HAList=ty-116-00700-%u817E%u8BAF%u63A7%u80A1%2Cty-1-688695-%u4E2D%u521B%u80A1%u4EFD%2Cty-1-600849-%u4E0A%u836F%u8F6C%u6362%2Cty-1-603361-%u6D59%u6C5F%u56FD%u7965%2Cty-1-603555-ST%u8D35%u4EBA%2Cty-0-000627-%u5929%u8302%u96C6%u56E2%2Cty-0-002470-%u91D1%u6B63%u5927%2Cty-0-832876-%u6167%u4E3A%u667A%u80FD%2Cty-0-300059-%u4E1C%u65B9%u8D22%u5BCC%2Cty-107-CWB-%u53EF%u8F6C%u503AETF-SPDR; st_pvi=26930719093675; st_sp=2024-04-28%2017%3A27%3A05; st_inirUrl=https%3A%2F%2Fcn.bing.com%2F; st_sn=23; st_psi=20240517111108288-113200301321-2767127768'
-
-
-def get_hk_ggt_component():
-    stock_hk_ggt_components_em_df = ak.stock_hk_ggt_components_em()
-    stock_hk_ggt_components_em_df = stock_hk_ggt_components_em_df.rename(columns={
-        "序号": "index",
-        "代码": "symbol",
-        "名称": "name"
-    })
-    return stock_hk_ggt_components_em_df
-
-
-# https://quote.eastmoney.com/center/gridlist.html#hk_stocks
-def sync_hk_company_info():
-    hk_real_time_df = east_money_stock_hk_api.hk_real_time_quotes(COOKIE)
-
-    hk_real_time_df = hk_real_time_df[[
-        "symbol",
-        "name",
-        "chg",
-        "total_mv",
-        "flow_mv",
-        "list_date",
-        "industry",
-        "amount",
-        "now_price"
-    ]]
-    # 排除基金
-    hk_real_time_df = hk_real_time_df.loc[hk_real_time_df['total_mv'] != '-']
-
-    stock_hk_ggt_components_em_df = get_hk_ggt_component()
-    stock_hk_ggt_components_symbol_list = list(stock_hk_ggt_components_em_df['symbol'])
-    hk_real_time_df['hk_ggt'] = False
-    hk_real_time_df.loc[hk_real_time_df['symbol'].isin(stock_hk_ggt_components_symbol_list), 'hk_ggt'] = True
-    hk_real_time_df.loc[hk_real_time_df['industry'] == '-', 'industry'] = '其他'
-
-    hk_real_time_df['_id'] = hk_real_time_df['symbol']
-
-    hk_real_time_df.fillna(0, inplace=True)
-
-    mongodb_util.save_mongo(hk_real_time_df, db_name_constant.COMPANY_INFO_HK)
-
-
-if __name__ == '__main__':
-    sync_hk_company_info()

mns_scheduler-1.1.4.0/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.0/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)