mns-scheduler 1.2.5.5__tar.gz → 1.2.5.7__tar.gz

{mns_scheduler-1.2.5.5 → mns_scheduler-1.2.5.7}/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: mns-scheduler
-Version: 1.2.5.5
+Version: 1.2.5.7

{mns_scheduler-1.2.5.5 → mns_scheduler-1.2.5.7}/mns_scheduler/risk/financial/annual_report_audit_check_api.py

@@ -9,6 +9,7 @@ import mns_common.component.self_choose.black_list_service_api as black_list_ser
 from mns_common.db.MongodbUtil import MongodbUtil
 from datetime import datetime
 from mns_common.constant.black_list_classify_enum import BlackClassify
+import mns_common.constant.db_name_constant as db_name_constant
 
 # 年报审计意见check
 mongodb_util = MongodbUtil('27017')
@@ -25,11 +26,12 @@ def annual_report_audit_check(new_report_df, period_time):
     notice_date = list(new_report_one_df['NOTICE_DATE'])[0]
     now_date = datetime.now()
     str_day = now_date.strftime('%Y-%m-%d')
-    str_now_date = now_date.strftime('%Y-%m-%d %H:%M:%S')
-
+    query = {'symbol': symbol, 'level_code': BlackClassify.AUDIT_PROBLEM.up_level_code}
+    mongodb_util.remove_data(query, db_name_constant.SELF_BLACK_STOCK)
     # 年报有问题
     if opinion_type != OPINION_TYPE:
         id_key = symbol + "_" + period_time + "_" + BlackClassify.AUDIT_PROBLEM.level_code
+
         black_list_service_api.save_black_stock(id_key,
                                                 symbol,
                                                 name,

{mns_scheduler-1.2.5.5 → mns_scheduler-1.2.5.7}/mns_scheduler/risk/financial/net_assets_check_api.py

@@ -31,14 +31,17 @@ def net_assets_check(report_type, new_report_df, period_time):
         name = list(new_report_one_df['SECURITY_NAME_ABBR'])[0]
         now_date = datetime.now()
         str_day = now_date.strftime('%Y-%m-%d')
-        str_now_date = now_date.strftime('%Y-%m-%d %H:%M:%S')
         id_key = symbol + "_" + period_time + "_" + BlackClassify.FINANCIAL_PROBLEM_DEBT.level_code
         notice_date = list(new_report_one_df['NOTICE_DATE'])[0]
         query_company = {'_id': symbol, 'industry': {'$in': EXCLUDE_INDUSTRY}}
+        query = {'symbol': symbol, 'level_code': BlackClassify.FINANCIAL_PROBLEM_DEBT.up_level_code}
+        mongodb_util.remove_data(query, db_name_constant.SELF_BLACK_STOCK)
+
         if mongodb_util.exist_data_query(db_name_constant.COMPANY_INFO, query_company):
             return None
 
-        if liability_ratio >= MAX_LIABILITY_RATIO:
+        if liability_ratio >= MAX_LIABILITY_RATIO and net_asset < MIN_NET_ASSET:
+
             black_list_service_api.save_black_stock(id_key,
                                                     symbol,
                                                     name,
@@ -54,19 +57,19 @@ def net_assets_check(report_type, new_report_df, period_time):
                                                     BlackClassify.FINANCIAL_PROBLEM_DEBT.up_level_name,
                                                     BlackClassify.FINANCIAL_PROBLEM_DEBT.level_code,
                                                     BlackClassify.FINANCIAL_PROBLEM_DEBT.level_name)
-        if net_asset < MIN_NET_ASSET:
-            black_list_service_api.save_black_stock(id_key,
-                                                    symbol,
-                                                    name,
-                                                    str_day,
-                                                    notice_date,
-                                                    '净资产低:' + "[" + "负债比:" + str(
-                                                        liability_ratio) + "]" + "," + "净资产:"
-                                                    + str(round(net_asset / common_service_fun_api.HUNDRED_MILLION,
-                                                                0)) + "亿",
-                                                    '净资产低:' + "[" + str(liability_ratio) + "]",
-                                                    '',
-                                                    BlackClassify.FINANCIAL_PROBLEM_DEBT.up_level_code,
-                                                    BlackClassify.FINANCIAL_PROBLEM_DEBT.up_level_name,
-                                                    BlackClassify.FINANCIAL_PROBLEM_DEBT.level_code,
-                                                    BlackClassify.FINANCIAL_PROBLEM_DEBT.level_name)
+        # if net_asset < MIN_NET_ASSET:
+        #     black_list_service_api.save_black_stock(id_key,
+        #                                             symbol,
+        #                                             name,
+        #                                             str_day,
+        #                                             notice_date,
+        #                                             '净资产低:' + "[" + "负债比:" + str(
+        #                                                 liability_ratio) + "]" + "," + "净资产:"
+        #                                             + str(round(net_asset / common_service_fun_api.HUNDRED_MILLION,
+        #                                                         0)) + "亿",
+        #                                             '净资产低:' + "[" + str(liability_ratio) + "]",
+        #                                             '',
+        #                                             BlackClassify.FINANCIAL_PROBLEM_DEBT.up_level_code,
+        #                                             BlackClassify.FINANCIAL_PROBLEM_DEBT.up_level_name,
+        #                                             BlackClassify.FINANCIAL_PROBLEM_DEBT.level_code,
+        #                                             BlackClassify.FINANCIAL_PROBLEM_DEBT.level_name)

{mns_scheduler-1.2.5.5 → mns_scheduler-1.2.5.7}/mns_scheduler/risk/financial/profit_income_check_api.py

@@ -5,7 +5,9 @@ import mns_common.constant.db_name_constant as db_name_constant
 import mns_common.component.self_choose.black_list_service_api as black_list_service_api
 import mns_common.component.common_service_fun_api as common_service_fun_api
 from mns_common.constant.black_list_classify_enum import BlackClassify
+from mns_common.db.MongodbUtil import MongodbUtil
 
+mongodb_util = MongodbUtil('27017')
 file_path = os.path.abspath(__file__)
 end = file_path.index('mns') + 16
 project_path = file_path[0:end]
@@ -50,6 +52,10 @@ def profit_income_check(new_report_df, period_time, report_type):
             # 最小利润收入
         min_profit = min(total_profit, net_profit, operate_profit,
                          continued_profit, parent_profit, deduct_parent_profit)
+
+        query = {'symbol': symbol, 'level_code': BlackClassify.FINANCIAL_PROBLEM_PROFIT.up_level_code}
+        mongodb_util.remove_data(query, db_name_constant.SELF_BLACK_STOCK)
+
         if min_profit < 0:
 
             classification = common_service_fun_api.classify_symbol_one(symbol)

{mns_scheduler-1.2.5.5 → mns_scheduler-1.2.5.7}/mns_scheduler/risk/test/fix_blask_list.py

@@ -7,10 +7,8 @@ project_path = file_path[0:end]
 sys.path.append(project_path)
 
 import mns_common.constant.db_name_constant as db_name_constant
-
-from mns_common.db.MongodbUtil import MongodbUtil
-
 import mns_scheduler.risk.financial_report_risk_check_api as financial_report_risk_check_api
+from mns_common.db.MongodbUtil import MongodbUtil
 
 mongodb_util = MongodbUtil('27017')
 
@@ -18,7 +16,7 @@ mongodb_util = MongodbUtil('27017')
 def fix_profit_black_list():
     period_time = "2023-12-31 00:00:00"
     period = 4
-    report_type_list = [db_name_constant.EM_STOCK_PROFIT, db_name_constant.EM_STOCK_ASSET_LIABILITY]
+    report_type_list = [db_name_constant.EM_STOCK_ASSET_LIABILITY, db_name_constant.EM_STOCK_PROFIT]
     for report_type in report_type_list:
         query = {'REPORT_DATE': period_time}
         em_stock_profit_df_list = mongodb_util.find_query_data(report_type, query)

{mns_scheduler-1.2.5.5 → mns_scheduler-1.2.5.7}/mns_scheduler/self_choose/ths_self_choose_service.py

@@ -100,11 +100,17 @@ def add_trade_stocks():
     str_day = now_date.strftime('%Y-%m-%d')
     last_trade_day = trade_date_common_service_api.get_last_trade_day(str_day)
     query = {"$and": [{"str_day": {"$gte": last_trade_day}}, {"str_day": {"$lte": str_day}}]}
-    trade_stocks_df = mongodb_util.find_query_data(db_name_constant.POSITION_STOCK, query)
-    ths_cookie = get_ths_cookie()
+
+    position_stock_df = mongodb_util.find_query_data(db_name_constant.POSITION_STOCK, query)
+    if data_frame_util.is_not_empty(position_stock_df):
+        stock_list = set(position_stock_df['symbol'])
+    trade_stocks_df = mongodb_util.find_query_data(db_name_constant.BUY_STOCK_NAME, query)
     if data_frame_util.is_not_empty(trade_stocks_df):
-        for stock_one in trade_stocks_df.itertuples():
-            ths_self_choose_api.add_stock_to_account(stock_one.symbol, ths_cookie)
+        stock_list = stock_list.union(set(trade_stocks_df['symbol']))
+    ths_cookie = get_ths_cookie()
+    if len(stock_list) > 0:
+        for symbol in stock_list:
+            ths_self_choose_api.add_stock_to_account(symbol, ths_cookie)
 
 
 # 添加连板到自选

{mns_scheduler-1.2.5.5 → mns_scheduler-1.2.5.7}/mns_scheduler.egg-info/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: mns-scheduler
-Version: 1.2.5.5
+Version: 1.2.5.7

{mns_scheduler-1.2.5.5 → mns_scheduler-1.2.5.7}/setup.py

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