mns-scheduler 1.3.2.0__py3-none-any.whl → 1.3.2.4__py3-none-any.whl

mns_scheduler/company_info/em_stock_info/sync_em_stock_info_sync.py

@@ -13,7 +13,7 @@ import mns_common.api.em.real_time.east_money_stock_a_v2_api as east_money_stock
 import mns_common.api.em.real_time.east_money_debt_api as east_money_debt_api
 import mns_common.api.em.real_time.east_money_etf_api as east_money_etf_api
 import mns_common.api.em.real_time.east_money_stock_hk_api as east_money_stock_hk_api
-import mns_common.constant.db_name_constant as db_name_constant
+import mns_common.constant.extra_income_db_name as extra_income_db_name
 import mns_common.component.cookie.cookie_info_service as cookie_info_service
 
 import mns_common.api.em.real_time.east_money_stock_us_api as east_money_stock_us_api
@@ -30,14 +30,14 @@ def sync_all_em_stock_info():
     try:
         em_a_stock_info_df = east_money_stock_a_v2_api.get_all_real_time_quotes(proxies)
         em_a_stock_info_df['_id'] = em_a_stock_info_df['symbol']
-        mongodb_util.save_mongo(em_a_stock_info_df, db_name_constant.EM_A_STOCK_INFO)
+        mongodb_util.save_mongo(em_a_stock_info_df, extra_income_db_name.EM_A_STOCK_INFO)
     except BaseException as e:
         logger.error("同步东方财富A股信息异常:{}", e)
 
     try:
         em_etf_info = east_money_etf_api.get_etf_real_time_quotes(proxies)
         em_etf_info['_id'] = em_etf_info['symbol']
-        mongodb_util.save_mongo(em_etf_info, db_name_constant.EM_ETF_INFO)
+        mongodb_util.save_mongo(em_etf_info, extra_income_db_name.EM_ETF_INFO)
     except BaseException as e:
         logger.error("同步东方财富ETF信息异常:{}", e)
 
@@ -45,7 +45,7 @@ def sync_all_em_stock_info():
         em_kzz_info = east_money_debt_api.get_debt_real_time_quotes(proxies)
 
         em_kzz_info['_id'] = em_kzz_info['symbol']
-        mongodb_util.save_mongo(em_kzz_info, db_name_constant.EM_KZZ_INFO)
+        mongodb_util.save_mongo(em_kzz_info, extra_income_db_name.EM_KZZ_INFO)
     except BaseException as e:
         logger.error("同步东方财富可转债信息异常:{}", e)
 
@@ -53,7 +53,7 @@ def sync_all_em_stock_info():
     try:
         em_hk_stock_info = east_money_stock_hk_api.get_hk_real_time_quotes(em_cookie, proxies)
         em_hk_stock_info['_id'] = em_hk_stock_info['symbol']
-        mongodb_util.save_mongo(em_hk_stock_info, db_name_constant.EM_HK_STOCK_INFO)
+        mongodb_util.save_mongo(em_hk_stock_info, extra_income_db_name.EM_HK_STOCK_INFO)
     except BaseException as e:
         logger.error("同步东方财富港股信息异常:{}", e)
 
@@ -61,7 +61,12 @@ def sync_all_em_stock_info():
         em_cookie = cookie_info_service.get_em_cookie()
         em_us_stock_info = east_money_stock_us_api.get_us_stock_real_time_quotes(em_cookie, proxies)
         em_us_stock_info['_id'] = em_us_stock_info['symbol']
-        mongodb_util.save_mongo(em_us_stock_info, db_name_constant.EM_US_STOCK_INFO)
+        mongodb_util.save_mongo(em_us_stock_info, extra_income_db_name.EM_US_STOCK_INFO)
+        em_us_etf_info = em_us_stock_info.loc[(em_us_stock_info['amount'] != 0) & (em_us_stock_info['total_mv'] == 0)]
+        em_us_etf_info = em_us_etf_info.loc[em_us_etf_info['amount'] > 10000000]
+        em_us_etf_info = em_us_etf_info.sort_values(by=['amount'], ascending=False)
+        mongodb_util.save_mongo(em_us_etf_info, extra_income_db_name.EM_US_ETF_INFO)
+
     except BaseException as e:
         logger.error("同步东方财富美股信息异常:{}", e)
     logger.info("同步东方财富a,etf,kzz,us,hk,信息完成")

mns_scheduler/trade/sync_position_api.py

@@ -21,8 +21,8 @@ def sync_position():
     now_date = datetime.datetime.now()
     str_day = now_date.strftime('%Y-%m-%d')
     query_exist = {'str_day': str_day}
-    # if mongodb_util.exist_data_query(db_name_constant.POSITION_STOCK, query_exist):
-    #     return None
+    if mongodb_util.exist_data_query(db_name_constant.POSITION_STOCK, query_exist):
+        return None
     position_list = deal_service_api.get_position('easy_trader')
     position_df = pd.DataFrame(position_list)
     position_df = position_df.rename(columns={"明细": "detail",

{mns_scheduler-1.3.2.0.dist-info → mns_scheduler-1.3.2.4.dist-info}/METADATA

@@ -1,4 +1,4 @@
 Metadata-Version: 2.1
 Name: mns-scheduler
-Version: 1.3.2.0
+Version: 1.3.2.4
 

{mns_scheduler-1.3.2.0.dist-info → mns_scheduler-1.3.2.4.dist-info}/RECORD

@@ -14,7 +14,7 @@ mns_scheduler/company_info/constant/company_constant_data.py,sha256=0qhRXLASsQlY
 mns_scheduler/company_info/de_list_stock/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
 mns_scheduler/company_info/de_list_stock/de_list_stock_service.py,sha256=QNtKc1ZI6xHjupcxbOBN7fBhi6oAGtL7X1TQZVzfpnk,1993
 mns_scheduler/company_info/em_stock_info/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
-mns_scheduler/company_info/em_stock_info/sync_em_stock_info_sync.py,sha256=hf4Qw618J7SnMJ0qMl6yEcub37oyvCj9oY3u-0nqNWY,3477
+mns_scheduler/company_info/em_stock_info/sync_em_stock_info_sync.py,sha256=Jx69ED0ixOIC5k8vwF4mRVJ9IYUIgGxEf6MJPFvoNH4,3880
 mns_scheduler/company_info/remark/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
 mns_scheduler/company_info/remark/company_remark_info_sync.py,sha256=L8wC8LU7-GYZb1TyKLjODJURROOEO4izZBxnWEM7Ahc,2334
 mns_scheduler/concept/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
@@ -122,7 +122,7 @@ mns_scheduler/self_choose/ths_self_choose_service.py,sha256=Px26bmA91lbnov91uytZ
 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=A2RB3WFxVHqbNPaPvhIgO-3uaicFZVmBKUy2TsfMU90,4624
-mns_scheduler/trade/sync_position_api.py,sha256=ooIsuxPUBWIia-8W_Zx_JEbYULODAFi0tchPKqQCfnE,2752
+mns_scheduler/trade/sync_position_api.py,sha256=eGJAL1WoP_WwDloKQqeUXZUqtQv8G6VlODe8EDhmgMY,2748
 mns_scheduler/trade/auto_login/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
 mns_scheduler/trade/auto_login/trader_auto_service.py,sha256=1cvKwbfAKmjG312aHLvMXVFs59y8Sg6WnDEWqS_nyMs,686
 mns_scheduler/trade/balance/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
@@ -158,7 +158,7 @@ mns_scheduler/zt/zt_pool/ths_zt_pool_sync_api.py,sha256=u0IvwPuI2hnjTOrwwe8EhBAM
 mns_scheduler/zt/zt_pool/update_null_zt_reason_api.py,sha256=caW-MuF0RFLavJZafeLDYQ29-GxwGsmr5YVrN4lost8,2135
 mns_scheduler/zz_task/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
 mns_scheduler/zz_task/data_sync_task.py,sha256=Obr_9PizkU4BGTq00WjZHV8xAWTXPUKpopn5yBzTAWM,23126
-mns_scheduler-1.3.2.0.dist-info/METADATA,sha256=F_AQa8TAQjA960L6mfFmbyan5KgnGyGF_gmcAbvKw2Q,64
-mns_scheduler-1.3.2.0.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-mns_scheduler-1.3.2.0.dist-info/top_level.txt,sha256=PXQDFBGR1pWmsUbH5yiLAh71P5HZODTRED0zJ8CCgOc,14
-mns_scheduler-1.3.2.0.dist-info/RECORD,,
+mns_scheduler-1.3.2.4.dist-info/METADATA,sha256=LG5wTtzEITHbO6oO1TgFhtmhWP5KvbNThBb6Q0vrbl4,64
+mns_scheduler-1.3.2.4.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+mns_scheduler-1.3.2.4.dist-info/top_level.txt,sha256=PXQDFBGR1pWmsUbH5yiLAh71P5HZODTRED0zJ8CCgOc,14
+mns_scheduler-1.3.2.4.dist-info/RECORD,,