mns-common 1.2.6.2__tar.gz → 1.2.6.3__tar.gz

{mns_common-1.2.6.2 → mns_common-1.2.6.3}/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: mns_common
-Version: 1.2.6.2
+Version: 1.2.6.3

{mns_common-1.2.6.2 → mns_common-1.2.6.3}/mns_common/api/ths/concept/app/ths_concept_index_app.py

@@ -12,8 +12,8 @@ import requests
 import pandas as pd
 
 '''
-begin_time:开始时间
-end_time:结束时间
+begin_time:开始时间  只能是交易时间
+end_time: 结束时间 只能是交易时间
 page_size:分页大小
 type: 类型 1:行业 2 概念  3 风格 4 地域
 地址:https://eq.10jqka.com.cn/webpage/sector-retrospect/home.html#/
@@ -147,28 +147,34 @@ def get_new_concept_from_app_search(symbol: str = "886019"):
         return None
 
 
-from datetime import datetime
+from mns_common.db.MongodbUtil import MongodbUtil
 
+mongodb_util = MongodbUtil('27017')
 if __name__ == '__main__':
-
-    while True:
-        now_date = datetime.now()
-        str_day = now_date.strftime('%Y%m%d')
-        hour = now_date.hour
-        minute = now_date.minute
-        second = now_date.second
-        second = 0
-        if hour < 10:
-            hour = '0' + str(hour)
-        if minute < 10:
-            minute = '0' + str(minute)
-        if second < 10:
-            second = '0' + str(second)
-
-        end_time = str_day + str(hour) + str(minute) + str(second)
-        end_time = str(end_time)
-
-        result_df_test = get_ths_concept_his_info('20240617093000', end_time, 500, 2)
-        print(result_df_test)
-    search_result = get_new_concept_from_app_search('886078')
-    print(search_result)
+    end_time_test = '20241009093000'
+    result_df_test = get_ths_concept_his_info('20241009093000', end_time_test, 500, 2)
+    result_df_test['_id'] = result_df_test['block_code']
+    mongodb_util.save_mongo(result_df_test, 'ths_concept_info')
+    print(result_df_test)
+
+    # while True:
+    #     now_date = datetime.now()
+    #     str_day = now_date.strftime('%Y%m%d')
+    #     hour = now_date.hour
+    #     minute = now_date.minute
+    #     second = now_date.second
+    #     second = 0
+    #     if hour < 10:
+    #         hour = '0' + str(hour)
+    #     if minute < 10:
+    #         minute = '0' + str(minute)
+    #     if second < 10:
+    #         second = '0' + str(second)
+    #
+    #     end_time_test = str_day + str(hour) + str(minute) + str(second)
+    #     end_time_test = str(end_time_test)
+    #
+    #     result_df_test = get_ths_concept_his_info('20241008093000', end_time_test, 500, 2)
+    #     print(result_df_test)
+    # search_result = get_new_concept_from_app_search('886078')
+    # print(search_result)

{mns_common-1.2.6.2 → mns_common-1.2.6.3}/mns_common/api/ths/zt/ths_stock_zt_pool_v2_api.py

@@ -54,11 +54,11 @@ mongodb_util = MongodbUtil('27017')
 
 # 缓存key
 THS_NOW_ZT_POOL = 'ths_now_zt_pool'
-# 缓存过期时间
+# 缓存过期时间 一分钟
 CACHE_TIME_OUT_TIME = 60
 
 
-# 频繁调用容易被封
+# 频繁调用容易被封  设置缓存
 def get_ths_stock_zt_reason_with_cache(str_day):
     stock_zt_reason = cache_service.get_cache(THS_NOW_ZT_POOL)
     if data_frame_util.is_empty(stock_zt_reason):
@@ -79,7 +79,7 @@ def get_zt_reason(str_day):
     zt_df = ths_wen_cai_api.wen_cai_api(key_word, 'stock')
     if data_frame_util.is_empty(zt_df):
         return None
-    zt_df.fillna('', inplace=True)
+    zt_df.fillna('0', inplace=True)
     no_slash_day = date_handle_util.no_slash_date(str_day)
     no_slash_day = "[" + no_slash_day + "]"
     zt_df = zt_df.rename(columns={
@@ -114,7 +114,6 @@ def get_zt_reason(str_day):
         del zt_df['flow_mv']
     zt_df['zt_flag'] = True
     zt_df['str_day'] = str_day
-    zt_df = zt_df.fillna('')
     # 渣渣有重复的数据
     zt_df.drop_duplicates('symbol', keep='last', inplace=True)
     return zt_df
@@ -188,7 +187,7 @@ def get_real_time_zt_info():
     real_time_df_zt = common_service_fun_api.total_mv_classification(real_time_df_zt)
     real_time_df_zt = common_service_fun_api.symbol_amount_simple(real_time_df_zt)
     real_time_df_zt = common_service_fun_api.exclude_new_stock(real_time_df_zt)
-    real_time_df_zt.fillna(0, inplace=True)
+    real_time_df_zt.fillna('0', inplace=True)
     real_time_df_zt['chg'] = real_time_df_zt['chg'].astype(float)
     real_time_df_zt['chg'] = round(
         real_time_df_zt['chg'], 2)
@@ -305,20 +304,15 @@ def merge_zt_reason(now_zt_pool_df, str_day, last_trade_zt):
     zt_reason_na = zt_reason_na.set_index(['symbol'], drop=False)
     zt_reason_na = pd.merge(zt_reason_na, last_trade_zt_copy, how='outer',
                             left_index=True, right_index=True)
-    zt_reason_na['zt_reason'] = zt_reason_na['zt_reason'].fillna('未有')
-
+    zt_reason_na['zt_reason'] = zt_reason_na['zt_reason'].fillna('0')
     # 删除昨日涨停 今日未涨停的
     zt_reason_na.dropna(subset=['symbol'], inplace=True)
-
     result = pd.concat([zt_reason_na,
                         zt_reason_not_na])
-
     result.dropna(subset=['symbol'], inplace=True)
     result.drop_duplicates('symbol', keep='last', inplace=True)
-
-    result['zt_reason'] = result['zt_reason'].replace({0: '其他',
-                                                       '': '其他',
-                                                       '0': '其他', })
+    result['zt_reason'] = result['zt_reason'].replace({0: '0',
+                                                       '': '0'})
 
     return result
 
@@ -372,13 +366,14 @@ def zt_reason_group(zt_pool_df):
 
 
 if __name__ == '__main__':
-    str_day_test = '2024-09-30'
+    str_day_test = '2024-10-09'
+
+    # 东财涨停池
     em_now_zt_pool_test = stock_zt_pool_api.stock_em_zt_pool_df(date_handle_util.no_slash_date(str_day_test))
+    # 同花顺涨停
     ths_zt_pool_df = get_zt_reason(str_day_test)
 
-    em_now_zt_pool_test.loc[~(em_now_zt_pool_test['symbol'].isin(ths_zt_pool_df['symbol']))]
+    miss_zt_df = em_now_zt_pool_test.loc[~(em_now_zt_pool_test['symbol'].isin(ths_zt_pool_df['symbol']))]
+    pass
+
 
-    while True:
-        result_zt_df_test = get_now_zt_pool_with_reason(str_day_test)
-        zt_reason_group(result_zt_df_test)
-        logger.info(1)

{mns_common-1.2.6.2 → mns_common-1.2.6.3}/mns_common.egg-info/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: mns_common
-Version: 1.2.6.2
+Version: 1.2.6.3

{mns_common-1.2.6.2 → mns_common-1.2.6.3}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='mns_common',
-    version='1.2.6.2',
+    version='1.2.6.3',
     # packages=["mns_common", "mns_common.api",
     #           "mns_common.api.akshare",
     #           "mns_common.api.em",