mns-scheduler 1.4.0.1__py3-none-any.whl → 1.4.0.3__py3-none-any.whl

mns_scheduler/company_info/base/sync_company_base_info_api.py

@@ -37,25 +37,89 @@ result = []
 # 计算实际流通比例
 def calculate_circulation_ratio(symbol):
     query = {"symbol": symbol}
-    stock_gdfx_free_top_10 = mongodb_util.descend_query(query, 'stock_gdfx_free_top_10', "period", 10)
-    if stock_gdfx_free_top_10.shape[0] == 0:
+    stock_gdfx_free_top_1 = mongodb_util.descend_query(query, 'stock_gdfx_free_top_10', "period", 1)
+    if stock_gdfx_free_top_1.shape[0] == 0:
         mv_circulation_ratio = 1
     else:
+        period_time = list(stock_gdfx_free_top_1['period'])[0]
+
+        query_free = {'symbol': symbol, 'period': period_time}
+        stock_gdfx_free_top_10 = mongodb_util.find_query_data('stock_gdfx_free_top_10', query_free)
+
+        stock_gdfx_free_top_10['shares_number_str'] = stock_gdfx_free_top_10['shares_number'].astype(str)
+
+        stock_gdfx_free_top_10['id_key'] = stock_gdfx_free_top_10['symbol'] + '_' + stock_gdfx_free_top_10[
+            'period'] + '_' + stock_gdfx_free_top_10.shares_number_str
+
+        stock_gdfx_free_top_10.drop_duplicates('id_key', keep='last', inplace=True)
+
         # 排除香港结算公司 大于5%减持不用发公告  香港中央结算    HKSCC
         stock_gdfx_free_top_10['is_hk'] = stock_gdfx_free_top_10['shareholder_name'].apply(
             lambda shareholder_name: "HK" if shareholder_name.startswith('香港中央结算') or shareholder_name.startswith(
                 'HKSCC') else "A")
 
-        # 持股大于5%      # 排除香港结算公司 大于5%减持不用发公告  香港中央结算    HKSCC
-        stock_gdfx_free_top_10 = stock_gdfx_free_top_10.loc[
+        # 持股大于5% 减持需要发公告
+        # 排除香港结算公司不发公共 小于5%减持不用发公告
+        # 香港中央结算    HKSCC
+        stock_free_top_greater_than_5 = stock_gdfx_free_top_10.loc[
             (stock_gdfx_free_top_10['circulation_ratio'] >= 5) & (stock_gdfx_free_top_10['is_hk'] == 'A')]
 
-        circulation_ratio = sum(stock_gdfx_free_top_10['circulation_ratio'])
+        stock_free_qfii = stock_gdfx_free_top_10.loc[stock_gdfx_free_top_10['shareholder_nature'] == 'QFII']
+
+        # qfii 数量
+        qfii_number = stock_free_qfii.shape[0]
+        # qfii 类型
+        qfii_type = set_qfii_type(qfii_number, stock_free_qfii.copy())
+
+        circulation_ratio = sum(stock_free_top_greater_than_5['circulation_ratio'])
         mv_circulation_ratio = round((100 - circulation_ratio) / 100, 2)
         # 防止错误数据
         if mv_circulation_ratio < 0:
             mv_circulation_ratio = 1
-    return mv_circulation_ratio
+
+    result_dict = {
+        'mv_circulation_ratio': mv_circulation_ratio,
+        'qfii_type': qfii_type,
+        'qfii_number': qfii_number
+
+    }
+    return result_dict
+
+
+def set_qfii_type(qfii_number, stock_free_qfii):
+    if qfii_number > 0:
+        stock_free_qfii['new_change'] = stock_free_qfii['change']
+        stock_free_qfii.loc[stock_free_qfii['change_ratio'] == 0, 'new_change'] = 0
+        stock_free_qfii.loc[stock_free_qfii['change'] == '新进', 'new_change'] = \
+            stock_free_qfii['shares_number']
+        stock_free_qfii['new_change'] = stock_free_qfii['new_change'].astype(float)
+
+        stock_free_qfii_new_in = stock_free_qfii.loc[stock_free_qfii['change'] == '新进']
+        if data_frame_util.is_not_empty(stock_free_qfii_new_in):
+            qfii_type = 1
+            return qfii_type
+
+        stock_free_qfii_add = stock_free_qfii.loc[
+            (~stock_free_qfii['change'].isin(['不变', '新进'])) & (stock_free_qfii['new_change'] > 0)]
+
+        if data_frame_util.is_not_empty(stock_free_qfii_add):
+            qfii_type = 2
+            return qfii_type
+
+        stock_free_qfii_not_change = stock_free_qfii.loc[stock_free_qfii['change'] == '不变']
+
+        if data_frame_util.is_not_empty(stock_free_qfii_not_change):
+            qfii_type = 3
+            return qfii_type
+
+        stock_free_qfii_reduce = stock_free_qfii.loc[
+            (~stock_free_qfii['change'].isin(['不变', '新进'])) & (stock_free_qfii['new_change'] < 0)]
+
+        if data_frame_util.is_not_empty(stock_free_qfii_reduce):
+            qfii_type = 4
+            return qfii_type
+    else:
+        return 0
 
 
 def get_east_money_stock_info():
@@ -201,7 +265,11 @@ def single_thread_sync_company_info(east_money_stock_info,
             company_info_type['total_mv_sp'] = company_one.total_mv_sp
             company_info_type['flow_mv_level'] = company_one.flow_mv_level
             company_info_type['classification'] = company_one.classification
-            company_info_type['mv_circulation_ratio'] = calculate_circulation_ratio(company_one.symbol)
+
+            result_dict = calculate_circulation_ratio(company_one.symbol)
+            company_info_type['mv_circulation_ratio'] = result_dict['mv_circulation_ratio']
+            company_info_type['qfii_type'] = result_dict['qfii_type']
+            company_info_type['qfii_number'] = result_dict['qfii_number']
             # 获取同花顺最新概念
             company_info_type = ths_concept_common_service_api.set_ths_concept(company_one.symbol, company_info_type)
             now_date = datetime.now()

mns_scheduler/company_info/constant/company_constant_data.py

@@ -443,6 +443,8 @@ def filed_sort(company_info):
         "final_controller_name",
         "final_controller_rate",
         "mv_circulation_ratio",
+        'qfii_type',
+        'qfii_number',
         "flow_mv_sp",
         "total_mv_sp",
         "now_price",

{mns_scheduler-1.4.0.1.dist-info → mns_scheduler-1.4.0.3.dist-info}/METADATA

@@ -1,4 +1,4 @@
 Metadata-Version: 2.1
 Name: mns-scheduler
-Version: 1.4.0.1
+Version: 1.4.0.3
 

{mns_scheduler-1.4.0.1.dist-info → mns_scheduler-1.4.0.3.dist-info}/RECORD

@@ -3,13 +3,13 @@ mns_scheduler/company_info/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlI
 mns_scheduler/company_info/announce/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
 mns_scheduler/company_info/announce/company_announce_sync_service.py,sha256=q8zYOZJmRin_QU2uPk52wngNdgnZooabnfrnqzqFIrM,3055
 mns_scheduler/company_info/base/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
-mns_scheduler/company_info/base/sync_company_base_info_api.py,sha256=SIBQqUbAZXGCfAoYq78McvIZ6vrttlCfAlqhZl23z9U,21050
+mns_scheduler/company_info/base/sync_company_base_info_api.py,sha256=-UTK-Xspu5clBFsBl7k-ZPd9HT-w8EGL974lZaoSLkc,23856
 mns_scheduler/company_info/base/sync_company_hold_info_api.py,sha256=ep9CthkoL_NNqkZgAeAdZqaf7_LNFDCrZonUjrT7w5o,1587
 mns_scheduler/company_info/base/sync_company_product_area_industry.py,sha256=g1g3NvJFteKMKkovoLrfL5MZovFnj_K4uWdB9EVzviY,7529
 mns_scheduler/company_info/clean/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
 mns_scheduler/company_info/clean/company_info_clean_api.py,sha256=P_-Nms6S1nVyqVOFKDT-Cq1RvriZV4IMz9eZCDF5Ovk,6104
 mns_scheduler/company_info/constant/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
-mns_scheduler/company_info/constant/company_constant_data.py,sha256=0qhRXLASsQlYnJe_vy5HCwNQZWz-hmJslbr9VuBnmGY,22486
+mns_scheduler/company_info/constant/company_constant_data.py,sha256=xrwnQqKqkJBHBGbEj7Ad9wz52lYXrxelfCQCDWm6ICM,22532
 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
@@ -165,7 +165,7 @@ mns_scheduler/zz_task/data_sync_task.py,sha256=V17cYsn_NxmbJoPG_AFcqrps1XzQF-wMP
 mns_scheduler/zz_task/compensation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mns_scheduler/zz_task/compensation/compensate_task.py,sha256=Dyo66NcSnXZ-Cne4_v77BBb27SemAiuGXRLnvQ26X0E,6464
 mns_scheduler/zz_task/compensation/compensate_task_one_day.py,sha256=ize69Ocy1k5rf8Xckk1izcEJ361HBtWH1zoJrScBS28,5751
-mns_scheduler-1.4.0.1.dist-info/METADATA,sha256=9uKri1xUWZkXxrsQaNja41gAm2ftqY7BayI-g8DlRNE,64
-mns_scheduler-1.4.0.1.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-mns_scheduler-1.4.0.1.dist-info/top_level.txt,sha256=PXQDFBGR1pWmsUbH5yiLAh71P5HZODTRED0zJ8CCgOc,14
-mns_scheduler-1.4.0.1.dist-info/RECORD,,
+mns_scheduler-1.4.0.3.dist-info/METADATA,sha256=HyQ0FUwK6AL0w6H4K8t1vGxR2Rb-YSfMtxIk8tnWwqk,64
+mns_scheduler-1.4.0.3.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+mns_scheduler-1.4.0.3.dist-info/top_level.txt,sha256=PXQDFBGR1pWmsUbH5yiLAh71P5HZODTRED0zJ8CCgOc,14
+mns_scheduler-1.4.0.3.dist-info/RECORD,,