mns-scheduler 1.1.3.9__py3-none-any.whl → 1.1.4.1__py3-none-any.whl

mns_scheduler/common/redis/redis_msg_push_service.py

@@ -15,4 +15,4 @@ r = redis.Redis(host='localhost', port=6379, db=0)
 # 发送消息
 def send_redis_msg(message):
     # 将消息推送到队列中
-    r.publish(redis_msg_constant.THS_NEW_CONCEPT_ADD, message)
+    r.publish(redis_msg_constant.REDIS_MSG_TOPIC, message)

mns_scheduler/concept/ths/common/ths_concept_sync_common_api.py

@@ -20,6 +20,7 @@ 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
 
 
 # 推送消息
@@ -29,7 +30,7 @@ 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_push_service.send_redis_msg(redis_msg_constant.THS_NEW_CONCEPT_ADD_MSG)
 
     # 更新ths概念信息
     ths_concept_clean_api.update_ths_concept_info()

mns_scheduler/concept/ths/detaill/ths_concept_detail_api.py

@@ -20,6 +20,8 @@ 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):
     real_time_quotes_all_stocks = east_money_stock_api.get_real_time_quotes_all_stocks()
@@ -211,7 +213,7 @@ 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_push_service.send_redis_msg(redis_msg_constant.THS_NEW_CONCEPT_ADD_MSG)
 
 
 if __name__ == '__main__':

mns_scheduler/concept/ths/sync_new_index/sync_ths_concept_new_index_api.py

@@ -17,6 +17,7 @@ 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.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
@@ -155,7 +156,7 @@ def sync_ths_concept_new_index_from_detail():
     # 更新ths概念统计信息
     ths_concept_clean_api.update_ths_concept_info()
     # 项目之前推送消息
-    redis_msg_push_service.send_redis_msg("新增同花顺概念")
+    redis_msg_push_service.send_redis_msg(redis_msg_constant.THS_NEW_CONCEPT_ADD_MSG)
 
 
 if __name__ == '__main__':

mns_scheduler/concept/ths/update_concept_info/sync_one_symbol_all_concepts_api.py

@@ -14,6 +14,7 @@ import mns_scheduler.concept.ths.common.ths_concept_update_common_api as ths_con
 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
@@ -54,7 +55,7 @@ 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_push_service.send_redis_msg(redis_msg_constant.THS_NEW_CONCEPT_ADD_MSG)
 
 
 # 保存数据到对比

mns_scheduler/hk/hk_company_info_sync_service_api.py

@@ -9,11 +9,13 @@ 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')
-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'
 
 
+# 获取陆股通的列表
+@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={
@@ -24,9 +26,19 @@ def get_hk_ggt_component():
     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():
-    hk_real_time_df = east_money_stock_hk_api.hk_real_time_quotes(COOKIE)
+    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",

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

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

{mns_scheduler-1.1.3.9.dist-info → mns_scheduler-1.1.4.1.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=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=LypT8Sl91xGcO1bF9o3utThk_SUtotuD-UEfgFjCww8,476
+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
@@ -21,15 +21,15 @@ mns_scheduler/concept/clean/kpl_concept_clean_api.py,sha256=xxIIgrXLI6xLf10t4unJ
 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=xreSNZDdooI0do9RQLTKqrQ85JgbNRhQzaNCI9SgKns,8328
+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=OdtLnF4St15-4vYck_5qj4k5KMSTFbAaAbtWP5kvqLk,10694
+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=4vzKeQ2WfDOZlADgPSWsFHcqAIQAoRtUpWmsNCrJRnw,7533
+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=wwuLfjj9AnFcHP-oQPC5AhpwgZ8IsPiNUh-Z6swcngA,1380
-mns_scheduler/concept/ths/update_concept_info/sync_one_symbol_all_concepts_api.py,sha256=83I6UDL9IDUrIozXyuLcFjilQFEk3tAWWxwn1SBcMgk,9217
+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
@@ -44,7 +44,7 @@ mns_scheduler/finance/em_financial_profit_sync_service_api.py,sha256=7gnrn6OyMU4
 mns_scheduler/finance/finance_common_api.py,sha256=e72-c6xcFaS4Z9wq9Yx2_HZ7PdStMeP6s4O61yeTKmc,2471
 mns_scheduler/finance/sync_financial_report_service_api.py,sha256=YSSVt5R1EqYbW8C3JH4ng2iq7UkQynAMA1ye6G4iecw,5086
 mns_scheduler/hk/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
-mns_scheduler/hk/hk_company_info_sync_service_api.py,sha256=JEfIl_up36b1UpDxfPhosP6_i2Lo17Ma_GHLytoMjWI,3661
+mns_scheduler/hk/hk_company_info_sync_service_api.py,sha256=S5h55Igzumlzfikc0Dez47aL_pD2JkYoZVqVvjeUg2E,2257
 mns_scheduler/irm/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
 mns_scheduler/irm/stock_irm_cninfo_service.py,sha256=oZUmC9h3jANUmvv_vrURcclPm2rA0A1rIn-T2PlTAtw,9660
 mns_scheduler/irm/api/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
@@ -98,7 +98,7 @@ mns_scheduler/risk/test/fix_blask_list.py,sha256=jjLhhIWH1L4CgNp2jQ_HAHbC3wVgeX1
 mns_scheduler/risk/transactions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mns_scheduler/risk/transactions/transactions_check_api.py,sha256=_VOiUyIPyTGbcrbuxzJnp1KiLdKBJsRS584f-jqHXA0,6682
 mns_scheduler/self_choose/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
-mns_scheduler/self_choose/ths_self_choose_service.py,sha256=9_D0evHT9TtGR45Hu4ApK3aoTUKb4nyIYfggqJ7C3bM,3814
+mns_scheduler/self_choose/ths_self_choose_service.py,sha256=DrhbOXoIE3K9lJcKrMl58u2GOTLSPmRqFn7hLHIr-3Y,4735
 mns_scheduler/trade/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
 mns_scheduler/trade/auto_ipo_buy_api.py,sha256=jVe5ZiXwzkDy_j_4X4rUamSzJpmzhV16lNKwbeWgpQw,386
 mns_scheduler/trade/auto_sell_service_api.py,sha256=b-4xmW6W6cd6dMuLPD7ZJu3tUtchMcUG-p7wOMm_RRY,4640
@@ -127,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=KI7I5R4RFZ67KSzXJiObnIrsKecvvvMQpCFNMX1qHJQ,19069
-mns_scheduler-1.1.3.9.dist-info/METADATA,sha256=B7k2ga2WhdPCcL4LZ8i8OMtzSTdNhLdpyl0RsdXC9oc,64
-mns_scheduler-1.1.3.9.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-mns_scheduler-1.1.3.9.dist-info/top_level.txt,sha256=PXQDFBGR1pWmsUbH5yiLAh71P5HZODTRED0zJ8CCgOc,14
-mns_scheduler-1.1.3.9.dist-info/RECORD,,
+mns_scheduler/zz_task/data_sync_task.py,sha256=tCecqpP2nSI3LybF5eKj1XH5xUADKKS_ByCguDi5lJY,19079
+mns_scheduler-1.1.4.1.dist-info/METADATA,sha256=G8HwvPBhYrLkEEUekZsEg96SoeUmdzGc0NKKMMrvo0E,64
+mns_scheduler-1.1.4.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+mns_scheduler-1.1.4.1.dist-info/top_level.txt,sha256=PXQDFBGR1pWmsUbH5yiLAh71P5HZODTRED0zJ8CCgOc,14
+mns_scheduler-1.1.4.1.dist-info/RECORD,,