mns-scheduler 1.0.6.9__tar.gz → 1.0.7.2__tar.gz

{mns-scheduler-1.0.6.9 → mns-scheduler-1.0.7.2}/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: mns-scheduler
-Version: 1.0.6.9
+Version: 1.0.7.2

{mns-scheduler-1.0.6.9 → mns-scheduler-1.0.7.2}/mns_scheduler/company_info/company_info_sync_api.py

@@ -130,7 +130,6 @@ def get_east_money_stock_info():
                                                  'amount',
                                                  'concept']]
 
-    all_real_time_quotes = common_service_fun_api.exclude_b_symbol(all_real_time_quotes)
     return all_real_time_quotes
 
 
@@ -515,6 +514,6 @@ if __name__ == '__main__':
     # 300293
     # sync_company_base_info(None)
     # new_company_info_update()
-    sync_company_base_info(None)
+    sync_company_base_info(['920002'])
     fix_company_industry(None)
     # group_by_industry()

{mns-scheduler-1.0.6.9 → mns-scheduler-1.0.7.2}/mns_scheduler/concept/ths/update_concept_info/sync_one_symbol_all_concepts_api.py

@@ -38,8 +38,8 @@ def create_index():
 def sync_new_concept_to_ths_detail(symbol_add_new_concept_df, str_day, str_now_time):
     for new_concept_one in symbol_add_new_concept_df.itertuples():
         try:
-            concept_code = new_concept_one.concept_code
-            query = {'web_concept_code': int(concept_code)}
+            web_concept_code = new_concept_one.concept_code
+            query = {'web_concept_code': int(web_concept_code)}
             ths_concept_list = mongodb_util.find_query_data('ths_concept_list', query)
             if data_frame_util.is_empty(ths_concept_list):
                 logger.error("无此同花顺概念:{}", new_concept_one.title)
@@ -95,7 +95,8 @@ def update_symbol_new_concept(symbol_df, page_number):
             now_date = datetime.now()
             # 开盘交易前不同步 资源开销过大
             if date_handle_util.is_close_time(now_date):
-                ths_concept_update_common_api.update_ths_concept_choose_reason(symbol_ths_concept_all_df, stock_one.symbol)
+                ths_concept_update_common_api.update_ths_concept_choose_reason(symbol_ths_concept_all_df,
+                                                                               stock_one.symbol)
 
             str_day = now_date.strftime('%Y-%m-%d')
             str_now_date = now_date.strftime('%Y-%m-%d %H:%M:%S')

mns-scheduler-1.0.6.9/mns_scheduler/k_line/clean/k_line_info_clean_impl.py → mns-scheduler-1.0.7.2/mns_scheduler/k_line/clean/daily/daily_k_line_clean_common_service.py

@@ -2,176 +2,17 @@ import sys
 import os
 
 file_path = os.path.abspath(__file__)
-end = file_path.index('mns') + 17
+end = file_path.index('mns') + 16
 project_path = file_path[0:end]
 sys.path.append(project_path)
-
-import mns_common.utils.data_frame_util as data_frame_util
 import pandas as pd
-from mns_common.db.MongodbUtil import MongodbUtil
-import mns_common.utils.date_handle_util as date_handle_util
 import mns_common.component.k_line.patterns.k_line_patterns_service_api as k_line_patterns_service
-import mns_common.component.k_line.clean.sh_small_normal_zt_k_line_check_api as sh_small_normal_zt_k_line_check_api
-import mns_common.component.classify.symbol_classify_api as symbol_classify_api
-import mns_common.component.k_line.common.k_line_common_service_api as k_line_common_service_api
-import mns_scheduler.k_line.clean.recent_hot_stocks_clean_service as recent_hot_stocks_clean_service
-
-mongodb_util = MongodbUtil('27017')
-# 排除最近10天有三个连板的股票
-EXCLUDE_DAYS = 10
-
-MAX_CONTINUE_BOARDS = 3
-
-
-# 日线 周线 月线 成交量  筹码信息
-def calculate_k_line_info(str_day, symbol, diff_days):
-    k_line_info = pd.DataFrame([[
-        str_day,
-        symbol, diff_days]],
-        columns=['str_day',
-                 'symbol',
-                 'diff_days'
-                 ])
-    k_line_info = handle_month_line(k_line_info, str_day, symbol)
-    k_line_info = handle_week_line(k_line_info, str_day, symbol)
-    k_line_info = handle_day_line(k_line_info, str_day, symbol)
-    return k_line_info
-
-
-# 处理月线
-def handle_month_line(k_line_info, str_day, symbol):
-    month_begin_day = str_day[0:7] + '-01'
-    query = {"symbol": symbol,
-             'date': {"$lt": date_handle_util.no_slash_date(month_begin_day)}}
-    stock_hfq_monthly = mongodb_util.descend_query(query, 'stock_qfq_monthly', 'date', 2)
-    month_num = stock_hfq_monthly.shape[0]
-    k_line_info['month_num'] = month_num
-    if month_num > 0:
-        k_line_info['sum_month'] = round(sum(stock_hfq_monthly['chg']), 2)
-    else:
-        k_line_info['sum_month'] = 0
-
-    if month_num == 0:
-        k_line_info['month01'] = 0
-        k_line_info['month02'] = 0
-        k_line_info['month01_date'] = '19890729'
-        k_line_info['month02_date'] = '19890729'
-    elif month_num == 1:
-        k_line_info['month01'] = stock_hfq_monthly.iloc[0].chg
-        k_line_info['month02'] = 0
-        k_line_info['month01_date'] = stock_hfq_monthly.iloc[0].date
-        k_line_info['month02_date'] = '19890729'
-    elif month_num == 2:
-        k_line_info['month01'] = stock_hfq_monthly.iloc[0].chg
-        k_line_info['month02'] = stock_hfq_monthly.iloc[1].chg
-        k_line_info['month01_date'] = stock_hfq_monthly.iloc[0].date
-        k_line_info['month02_date'] = stock_hfq_monthly.iloc[1].date
-
-    return k_line_info
-
-
-# 处理周线
-def handle_week_line(k_line_info, str_day, symbol):
-    month_begin_day = str_day[0:7] + '-01'
-    query = {"symbol": symbol,
-             '$and': [{'date': {"$gte": date_handle_util.no_slash_date(month_begin_day)}},
-                      {'date': {"$lt": date_handle_util.no_slash_date(str_day)}}]}
-    stock_hfq_weekly = mongodb_util.find_query_data('stock_qfq_weekly', query)
-    week_num = stock_hfq_weekly.shape[0]
-    if week_num > 0:
-        stock_hfq_weekly = stock_hfq_weekly.sort_values(by=['date'], ascending=False)
-        k_line_info['sum_week'] = round(sum(stock_hfq_weekly['chg']), 2)
-    else:
-        k_line_info['sum_week'] = 0
-    k_line_info['week_num'] = week_num
-    if week_num == 1:
-        k_line_info['week01'] = stock_hfq_weekly.iloc[0].chg
-        k_line_info['week02'] = 0
-        k_line_info['week03'] = 0
-        k_line_info['week04'] = 0
-    elif week_num == 2:
-        k_line_info['week01'] = stock_hfq_weekly.iloc[0].chg
-        k_line_info['week02'] = stock_hfq_weekly.iloc[1].chg
-        k_line_info['week03'] = 0
-        k_line_info['week04'] = 0
-    elif week_num == 3:
-        k_line_info['week01'] = stock_hfq_weekly.iloc[0].chg
-        k_line_info['week02'] = stock_hfq_weekly.iloc[1].chg
-        k_line_info['week03'] = stock_hfq_weekly.iloc[2].chg
-        k_line_info['week04'] = 0
-    elif week_num >= 4:
-        k_line_info['week01'] = stock_hfq_weekly.iloc[0].chg
-        k_line_info['week02'] = stock_hfq_weekly.iloc[1].chg
-        k_line_info['week03'] = stock_hfq_weekly.iloc[2].chg
-        k_line_info['week04'] = stock_hfq_weekly.iloc[3].chg
-    elif week_num == 0:
-        k_line_info['week01'] = 0
-        k_line_info['week02'] = 0
-        k_line_info['week03'] = 0
-        k_line_info['week04'] = 0
-        k_line_info['week_last_day'] = month_begin_day
-        k_line_info['sum_week'] = 0
-        return k_line_info
-    stock_hfq_weekly = stock_hfq_weekly.sort_values(by=['date'], ascending=False)
-    stock_hfq_weekly_last = stock_hfq_weekly.iloc[0:1]
-    k_line_info['week_last_day'] = list(stock_hfq_weekly_last['date'])[0]
-
-    return k_line_info
-
-
-# 处理日线
-def handle_day_line(k_line_info, str_day, symbol):
-    deal_days = k_line_common_service_api.get_deal_days(str_day, symbol)
-
-    # 取五天刚好包含一周 todo 选择60天的历史记录
-    # 当天没有k线数据时 进行同步
-    query = {"symbol": symbol, 'date': {"$lt": date_handle_util.no_slash_date(str_day)}}
-    stock_qfq_daily = mongodb_util.descend_query(query, 'stock_qfq_daily', 'date', 60)
-    if stock_qfq_daily.shape[0] == 0:
-        return k_line_info
-    k_line_info = init_day_line_data(k_line_info, stock_qfq_daily)
-    k_line_info = calculate_30_day_max_chg(stock_qfq_daily, k_line_info)
-
-    stock_qfq_daily = calculate_exchange_avg_param(stock_qfq_daily)
-    stock_qfq_daily_one = stock_qfq_daily.iloc[0:1]
-    stock_qfq_daily_one = set_k_line_patterns(stock_qfq_daily_one.copy())
-    stock_qfq_daily_one = set_history_list(stock_qfq_daily_one.copy(), stock_qfq_daily.copy())
-    k_line_info = k_line_field_fix(k_line_info.copy(), stock_qfq_daily_one.copy())
-
-    k_line_info.loc[:, 'deal_days'] = deal_days
-
-    k_line_info.loc[k_line_info['deal_days'] > 5, 'sum_five_chg'] = k_line_info['daily01'] \
-                                                                    + k_line_info['daily02'] \
-                                                                    + k_line_info['daily03'] \
-                                                                    + k_line_info['daily04'] \
-                                                                    + k_line_info['daily05']
-    k_line_info.loc[k_line_info['deal_days'] <= 5, 'sum_five_chg'] = 0
 
-    # 计算开盘涨幅
-    k_line_info = calculate_open_chg(stock_qfq_daily, k_line_info)
-    # 排除最近有三板以上的股票
-    k_line_info = check_recent_zt_stock(str_day, k_line_info)
-    # 计算 昨日最高点到开盘涨幅差值 and   # 昨日最高点到当日收盘涨幅之间的差值
-    k_line_info = calculate_chg_diff_value(k_line_info)
-
-    recent_hot_stocks_clean_service.calculate_recent_hot_stocks(stock_qfq_daily, symbol, str_day)
-
-    return k_line_info
-
-
-# 计算涨幅差值
-def calculate_chg_diff_value(result):
-    # 昨日最高点到开盘涨幅差值
-    result['diff_chg_from_open_last'] = round(
-        result['max_chg_last'] - result['open_chg_last'], 2)
-
-    # 昨日最高点到当日收盘涨幅之间的差值
-    result['diff_chg_high_last'] = round(
-        result['max_chg_last'] - result['chg_last'], 2)
-
-    return result
+# 计算五日线之和交易天数最小值
+MIN_DEAL_DAYS = 6
 
 
+# 初始化数据
 def init_day_line_data(k_line_info, stock_qfq_daily):
     daily_num = stock_qfq_daily.shape[0]
     if daily_num == 0:
@@ -216,20 +57,67 @@ def init_day_line_data(k_line_info, stock_qfq_daily):
         k_line_info['daily03'] = stock_qfq_daily.iloc[2].chg
         k_line_info['daily04'] = stock_qfq_daily.iloc[3].chg
         k_line_info['daily05'] = stock_qfq_daily.iloc[4].chg
+    k_line_info.loc[:, 'exclude'] = False
+    # 30日最大涨幅
+    k_line_info.loc[:, 'amount_level_last'] = 0
+    k_line_info.loc[:, 'exchange_last'] = 0
+    k_line_info.loc[:, 'exchange_mean_last'] = 0
+    k_line_info.loc[:, 'exchange_mean_last_02'] = 0
+    k_line_info.loc[:, 'exchange_difference_last'] = 0
+    k_line_info.loc[:, 'exchange_chg_percent_last'] = 0
+    k_line_info.loc[:, 'pct_chg_mean_last'] = 0
+    k_line_info.loc[:, 'pct_chg_difference_last'] = 0
+    k_line_info.loc[:, 'close_difference_five_last'] = 0
+    k_line_info.loc[:, 'close_difference_ten_last'] = 0
+    k_line_info.loc[:, 'close_difference_twenty_last'] = 0
+    k_line_info.loc[:, 'close_difference_thirty_last'] = 0
+    k_line_info.loc[:, 'close_difference_sixty_last'] = 0
+    k_line_info.loc[:, 'pct_chg_last'] = 0
+    k_line_info.loc[:, 'max_chg_last'] = 0
+    k_line_info.loc[:, 'chg_last'] = 0
+    k_line_info.loc[:, 'close_last'] = 0
+    k_line_info.loc[:, 'high_last'] = 0
+    k_line_info.loc[:, 'low_last'] = 0
+
+    k_line_info.loc[:, 'avg_five_last'] = 0
+    k_line_info.loc[:, 'avg_ten_last'] = 0
+    k_line_info.loc[:, 'avg_twenty_last'] = 0
+    k_line_info.loc[:, 'avg_thirty_last'] = 0
+    k_line_info.loc[:, 'avg_sixty_last'] = 0
+
+    k_line_info.loc[:, 'std_amount_ten'] = 0
+    k_line_info.loc[:, 'mean_amount_ten'] = 0
+    k_line_info.loc[:, 'std_amount_thirty'] = 0
+    k_line_info.loc[:, 'mean_amount_thirty'] = 0
+
+    k_line_info.loc[:, 'std_amount_sixty'] = 0
+    k_line_info.loc[:, 'mean_amount_sixty'] = 0
+
+    k_line_info.loc[:, 'sum_five_chg'] = 0
+
+    k_line_info.loc[:, 'open_chg_last'] = 0
+
+    k_line_info.loc[:, 'before_close'] = 0
+
+    k_line_info.loc[:, 'diff_max_chg_from_open_last'] = 0
+
+    k_line_info.loc[:, 'diff_max_chg_from_close_last'] = 0
+
+    k_line_info.loc[:, 'diff_close_from_open_last'] = 0
 
     return k_line_info
 
 
 # 计算30天最大涨幅
 def calculate_30_day_max_chg(stock_qfq_daily, k_line_info):
+    # 取30天的交易k线
     stock_qfq_daily_30 = stock_qfq_daily.iloc[0:29]
 
     deal_days = stock_qfq_daily_30.shape[0]
 
-    if stock_qfq_daily_30.shape[0] < 30:
+    if deal_days < 30:
         stock_qfq_daily_30 = stock_qfq_daily_30[0: deal_days - 1]
-    if stock_qfq_daily_30.shape[0] == 0:
-        k_line_info['max_chg_30'] = 0
+    if deal_days == 0:
         return k_line_info
 
     stock_qfq_daily_30['date_time'] = pd.to_datetime(stock_qfq_daily_30['date'])
@@ -249,12 +137,11 @@ def calculate_30_day_max_chg(stock_qfq_daily, k_line_info):
     return k_line_info
 
 
-# 计算平均值
-def calculate_exchange_avg_param(stock_qfq_daily):
+# 计算换手平均值 k线 5 10 20 30 60均线
+def calculate_exchange_and_k_line_avg_param(stock_qfq_daily):
     stock_qfq_daily = stock_qfq_daily.sort_values(by=['date'], ascending=True)
 
-    # exchange
-    # 计算每个日期的前10天的均值
+    # 计算每个日期前10天的换手均值
     stock_qfq_daily['exchange_mean'] = round(
         stock_qfq_daily['exchange'].rolling(window=10, min_periods=1).mean(), 2)
 
@@ -266,9 +153,11 @@ def calculate_exchange_avg_param(stock_qfq_daily):
     # 昨日平均值 向当前移位
     stock_qfq_daily['exchange_mean_yesterday'] = stock_qfq_daily['exchange_mean_yesterday'].shift(1)
 
+    # 今天换手相对于[昨日平均十日换手]的差值
     stock_qfq_daily['exchange_difference'] = round(
         stock_qfq_daily['exchange'] - stock_qfq_daily['exchange_mean_yesterday'], 2)
 
+    # 今天换手相对于[昨日平均十日换手]的倍数
     stock_qfq_daily['exchange_chg_percent'] = round(
         stock_qfq_daily['exchange'] / stock_qfq_daily['exchange_mean_yesterday'], 2)
 
@@ -305,7 +194,7 @@ def calculate_exchange_avg_param(stock_qfq_daily):
     stock_qfq_daily['avg_sixty'] = round(stock_qfq_daily['close'].rolling(window=60, min_periods=1).mean(),
                                          2)
 
-    # 与均线差值
+    # 收盘价格与均线差值
     stock_qfq_daily['close_difference_five'] = round(
         100 * (stock_qfq_daily['close'] - stock_qfq_daily['avg_five']) / stock_qfq_daily['close'],
         2)
@@ -372,6 +261,21 @@ def calculate_exchange_avg_param(stock_qfq_daily):
     return stock_qfq_daily
 
 
+# 设置当天k线形态 下一个交易日判断当前交易日k线形态
+def set_k_line_patterns(stock_qfq_daily_one):
+    open = list(stock_qfq_daily_one['open'])[0]
+    close = list(stock_qfq_daily_one['close'])[0]
+    high = list(stock_qfq_daily_one['high'])[0]
+    low = list(stock_qfq_daily_one['low'])[0]
+    max_chg = list(stock_qfq_daily_one['max_chg'])[0]
+    chg = list(stock_qfq_daily_one['chg'])[0]
+
+    k_line_pattern = k_line_patterns_service.k_line_patterns_classify(open, close, high, low, max_chg, chg)
+    stock_qfq_daily_one.loc[:, 'k_line_pattern'] = k_line_pattern.value
+    return stock_qfq_daily_one
+
+
+# 设置历史k线列表
 def set_history_list(stock_qfq_daily_one, stock_qfq_daily):
     stock_qfq_daily = stock_qfq_daily[[
         "date",
@@ -409,9 +313,9 @@ def set_history_list(stock_qfq_daily_one, stock_qfq_daily):
 
     if daily_num >= 10:
         stock_qfq_daily_ten = stock_qfq_daily.iloc[0:10]
-        # 计算 amount 的标准差
+        # 计算 10日 amount 的标准差
         std_amount_ten = round(stock_qfq_daily_ten['amount_level'].std(), 2)
-        # 计算 amount 的平均值
+        # 计算 10日amount 的平均值
         mean_amount_ten = round(stock_qfq_daily_ten['amount_level'].mean(), 2)
 
     if daily_num >= 30:
@@ -438,22 +342,8 @@ def set_history_list(stock_qfq_daily_one, stock_qfq_daily):
     return stock_qfq_daily_one
 
 
-# k线形态
-def set_k_line_patterns(stock_qfq_daily_one):
-    open = list(stock_qfq_daily_one['open'])[0]
-    close = list(stock_qfq_daily_one['close'])[0]
-    high = list(stock_qfq_daily_one['high'])[0]
-    low = list(stock_qfq_daily_one['low'])[0]
-    max_chg = list(stock_qfq_daily_one['max_chg'])[0]
-    chg = list(stock_qfq_daily_one['chg'])[0]
-
-    k_line_pattern = k_line_patterns_service.k_line_patterns_classify(open, close, high, low, max_chg, chg)
-    stock_qfq_daily_one.loc[:, 'k_line_pattern'] = k_line_pattern.value
-    return stock_qfq_daily_one
-
-
-# 字段选择
-def k_line_field_fix(k_line_info, stock_qfq_daily_one):
+# 修改字段名称
+def k_line_field_fix_name(k_line_info, stock_qfq_daily_one):
     k_line_info['classification'] = stock_qfq_daily_one['classification']
     k_line_info['amount_level_last'] = stock_qfq_daily_one['amount_level']
     k_line_info['name'] = stock_qfq_daily_one['name']
@@ -497,7 +387,21 @@ def k_line_field_fix(k_line_info, stock_qfq_daily_one):
     return k_line_info
 
 
-# 计算开盘涨幅
+# 设置五日k线和
+def set_sum_five_chg(k_line_info, deal_days):
+    k_line_info.loc[:, 'deal_days'] = deal_days
+    # 排除上市第一天的k线
+    k_line_info.loc[k_line_info['deal_days'] >= MIN_DEAL_DAYS, 'sum_five_chg'] = k_line_info['daily01'] \
+                                                                                 + k_line_info['daily02'] \
+                                                                                 + k_line_info['daily03'] \
+                                                                                 + k_line_info['daily04'] \
+                                                                                 + k_line_info['daily05']
+    k_line_info.loc[k_line_info['deal_days'] < MIN_DEAL_DAYS, 'sum_five_chg'] = 0
+
+    return k_line_info
+
+
+# 计算当前交易日开盘时的涨幅
 def calculate_open_chg(stock_qfq_daily, k_line_info):
     # 新股
     if stock_qfq_daily.shape[0] == 1:
@@ -510,13 +414,21 @@ def calculate_open_chg(stock_qfq_daily, k_line_info):
     return k_line_info
 
 
-# 排除最近10个交易日有三板以上的股票
-def check_recent_zt_stock(str_day, k_line_info):
-    k_line_info.loc[:, 'exclude'] = False
-    k_line_info = symbol_classify_api.set_stock_type(k_line_info)
-    k_line_info_sh = symbol_classify_api.choose_sh_symbol(k_line_info)
-    if data_frame_util.is_empty(k_line_info_sh):
-        return k_line_info
-    else:
-        k_line_info_sh = sh_small_normal_zt_k_line_check_api.recent_day_zt_check(k_line_info_sh.copy())
-        return k_line_info_sh
+# 计算涨幅差值
+# 昨日最高点到开盘涨幅差值
+# 昨日最高点到当日收盘涨幅之间的差值
+# 昨日收盘到当日开盘涨幅之间的差值
+def calculate_chg_diff_value(result):
+    # 昨日最高点到开盘涨幅差值
+    result['diff_max_chg_from_open_last'] = round(
+        result['max_chg_last'] - result['open_chg_last'], 2)
+
+    # 昨日最高点到当日收盘涨幅之间的差值
+    result['diff_max_chg_from_close_last'] = round(
+        result['max_chg_last'] - result['chg_last'], 2)
+
+    # 昨日最高点到当日收盘涨幅之间的差值
+    result['diff_close_from_open_last'] = round(
+        result['chg_last'] - result['open_chg_last'], 2)
+
+    return result

mns-scheduler-1.0.7.2/mns_scheduler/k_line/clean/daily/daily_k_line_service.py

@@ -0,0 +1,109 @@
+import sys
+import os
+
+file_path = os.path.abspath(__file__)
+end = file_path.index('mns') + 16
+project_path = file_path[0:end]
+sys.path.append(project_path)
+from mns_common.db.MongodbUtil import MongodbUtil
+import mns_common.utils.date_handle_util as date_handle_util
+import mns_scheduler.k_line.hot_stocks.recent_hot_stocks_clean_service as recent_hot_stocks_clean_service
+import mns_scheduler.k_line.clean.daily.daily_k_line_clean_common_service as daily_k_line_clean_common_service
+from mns_common.component.classify.symbol_classify_param import stock_type_classify_param
+
+mongodb_util = MongodbUtil('27017')
+# 普通股日线查询数据 60
+NORMAL_DAILY_K_LINE_NUMBER = 60
+
+
+def handle_day_line(k_line_info, str_day, symbol, deal_days):
+    sub_stock_new_max_deal_days = stock_type_classify_param['sub_stock_new_max_deal_days']
+    if deal_days > sub_stock_new_max_deal_days:
+        return handle_day_line_normal(k_line_info, str_day, symbol, deal_days)
+
+    else:
+        # 交易日小于100天的
+        return handle_day_line_sub_new(k_line_info, str_day, symbol, deal_days)
+
+    # 处理日线
+
+
+def handle_day_line_sub_new(k_line_info, str_day, symbol, deal_days):
+    k_line_info['deal_days'] = deal_days
+    query = {"symbol": symbol, 'date': {"$lt": date_handle_util.no_slash_date(str_day)}}
+    stock_qfq_daily = mongodb_util.descend_query(query, 'stock_qfq_daily', 'date', deal_days)
+    # 初始化数据
+    k_line_info = daily_k_line_clean_common_service.init_day_line_data(k_line_info, stock_qfq_daily)
+    if stock_qfq_daily.shape[0] == 0:
+        return k_line_info
+
+    # 当前交易日k线信息
+    stock_qfq_daily_one = stock_qfq_daily.iloc[0:1]
+    # 设置当天k线形态 下一个交易日判断当前交易日k线形态
+    stock_qfq_daily_one = daily_k_line_clean_common_service.set_k_line_patterns(stock_qfq_daily_one.copy())
+    # 设置历史k线列表
+    stock_qfq_daily_one = daily_k_line_clean_common_service.set_history_list(stock_qfq_daily_one.copy(),
+                                                                             stock_qfq_daily.copy())
+    # 修改字段名称
+    k_line_info = daily_k_line_clean_common_service.k_line_field_fix_name(k_line_info.copy(),
+                                                                          stock_qfq_daily_one.copy())
+    if stock_qfq_daily.shape[0] == 1:
+        # 上市第二天的股票
+        return k_line_info
+    # 排除上市第一天的股票
+    stock_qfq_daily = stock_qfq_daily.iloc[0:deal_days - 1]
+    # 计算换手平均值 k线 5 10 20 30 60均线
+    stock_qfq_daily = daily_k_line_clean_common_service.calculate_exchange_and_k_line_avg_param(stock_qfq_daily)
+    # 设置五日k线和
+    k_line_info = daily_k_line_clean_common_service.set_sum_five_chg(k_line_info, deal_days)
+    # 计算当前交易日开盘时的涨幅
+    k_line_info = daily_k_line_clean_common_service.calculate_open_chg(stock_qfq_daily, k_line_info)
+    # 计算 昨日最高点到开盘涨幅差值 and   # 昨日最高点到当日收盘涨幅之间的差值 and  # 昨日收盘到当日开盘涨幅之间的差值
+    k_line_info = daily_k_line_clean_common_service.calculate_chg_diff_value(k_line_info)
+    # 排除最近有三板以上的股票 todo
+    # 计算最近热门大涨的股票
+    recent_hot_stocks_clean_service.calculate_recent_hot_stocks(stock_qfq_daily, symbol, str_day)
+    return k_line_info
+
+
+def handle_day_line_normal(k_line_info, str_day, symbol, deal_days):
+    # 取五天刚好包含一周 todo 选择60天的历史记录
+
+    query = {"symbol": symbol, 'date': {"$lt": date_handle_util.no_slash_date(str_day)}}
+    stock_qfq_daily = mongodb_util.descend_query(query, 'stock_qfq_daily', 'date', NORMAL_DAILY_K_LINE_NUMBER)
+    if stock_qfq_daily.shape[0] == 0:
+        return k_line_info
+    # 初始化数据
+    k_line_info = daily_k_line_clean_common_service.init_day_line_data(k_line_info, stock_qfq_daily)
+    # 计算30天最大涨幅
+    k_line_info = daily_k_line_clean_common_service.calculate_30_day_max_chg(stock_qfq_daily, k_line_info)
+    # 计算换手平均值 k线 5 10 20 30 60均线
+    stock_qfq_daily = daily_k_line_clean_common_service.calculate_exchange_and_k_line_avg_param(stock_qfq_daily)
+    # 当前交易日k线信息
+    stock_qfq_daily_one = stock_qfq_daily.iloc[0:1]
+    # 设置当天k线形态 下一个交易日判断当前交易日k线形态
+    stock_qfq_daily_one = daily_k_line_clean_common_service.set_k_line_patterns(stock_qfq_daily_one.copy())
+    # 设置历史k线列表
+    stock_qfq_daily_one = daily_k_line_clean_common_service.set_history_list(stock_qfq_daily_one.copy(),
+                                                                             stock_qfq_daily.copy())
+    # 修改字段名称
+    k_line_info = daily_k_line_clean_common_service.k_line_field_fix_name(k_line_info.copy(),
+                                                                          stock_qfq_daily_one.copy())
+    # 设置五日k线和
+    k_line_info = daily_k_line_clean_common_service.set_sum_five_chg(k_line_info, deal_days)
+    # 计算当前交易日开盘时的涨幅
+    k_line_info = daily_k_line_clean_common_service.calculate_open_chg(stock_qfq_daily, k_line_info)
+    # 计算 昨日最高点到开盘涨幅差值 and   # 昨日最高点到当日收盘涨幅之间的差值 and  # 昨日收盘到当日开盘涨幅之间的差值
+    k_line_info = daily_k_line_clean_common_service.calculate_chg_diff_value(k_line_info)
+
+    # 排除最近有三板以上的股票 todo
+    # 计算最近热门大涨的股票
+    recent_hot_stocks_clean_service.calculate_recent_hot_stocks(stock_qfq_daily, symbol, str_day)
+
+    return k_line_info
+
+# if __name__ == '__main__':
+#     query1 = {"symbol": '301596', 'date': {"$lte": date_handle_util.no_slash_date('2024-05-31')}}
+#     stock_qfq_daily_301596 = mongodb_util.descend_query(query1, 'stock_qfq_daily', 'date', 15)
+#     stock_qfq_daily_301596.shape[0]
+#     stock_qfq_daily1 = stock_qfq_daily_301596.iloc[0:14]

mns-scheduler-1.0.7.2/mns_scheduler/k_line/clean/k_line_info_clean_impl.py

@@ -0,0 +1,33 @@
+import sys
+import os
+
+file_path = os.path.abspath(__file__)
+end = file_path.index('mns') + 17
+project_path = file_path[0:end]
+sys.path.append(project_path)
+
+import pandas as pd
+from mns_common.db.MongodbUtil import MongodbUtil
+import mns_common.component.k_line.common.k_line_common_service_api as k_line_common_service_api
+import mns_scheduler.k_line.clean.week_month.normal_week_month_k_line_service as week_month_k_line_service
+import mns_scheduler.k_line.clean.daily.daily_k_line_service as daily_k_line_service
+
+mongodb_util = MongodbUtil('27017')
+
+
+# 日线 周线 月线 成交量  筹码信息
+def calculate_k_line_info(str_day, symbol, diff_days):
+    k_line_info = pd.DataFrame([[
+        str_day,
+        symbol, diff_days]],
+        columns=['str_day',
+                 'symbol',
+                 'diff_days'
+                 ])
+    # 交易天数
+    deal_days = k_line_common_service_api.get_deal_days(str_day, symbol)
+    # 处理周线 月线
+    k_line_info = week_month_k_line_service.handle_month_week_line(k_line_info, str_day, symbol, deal_days)
+    # 处理日线
+    k_line_info = daily_k_line_service.handle_day_line(k_line_info, str_day, symbol, deal_days)
+    return k_line_info

mns-scheduler-1.0.6.9/mns_scheduler/k_line/clean/k_line_info_clean_service.py → mns-scheduler-1.0.7.2/mns_scheduler/k_line/clean/k_line_info_clean_task.py

@@ -18,6 +18,7 @@ import mns_scheduler.k_line.sync.daily_week_month_line_sync as daily_week_month_
 import mns_scheduler.k_line.clean.k_line_info_clean_impl as k_line_info_clean_impl
 import mns_common.utils.data_frame_util as data_frame_util
 import mns_common.component.company.company_common_service_api as company_common_service_api
+
 K_LINE_CLEAN_DB_NAME = 'k_line_clean_fail_name'
 
 # 定义一个全局锁，用于保护 result 变量的访问
@@ -36,6 +37,7 @@ def sync_k_line_info_task(str_day):
     last_trade_day = trade_date_common_service_api.get_last_trade_day(str_day)
     query = {'date': date_handle_util.no_slash_date(last_trade_day)}
     count = mongodb_util.count(query, 'stock_qfq_daily')
+    # 当天没有k线数据时 进行同步
     if count == 0:
         daily_week_month_line_sync_api.sync_all_daily_data('daily', 'qfq', 'stock_qfq_daily', str_day,
                                                            None)
@@ -90,7 +92,10 @@ def handle_fail_data(str_day, real_time_quotes_now):
 
 # 多线程同步任务
 def multi_threaded_k_line_sync(str_day):
+    # 退市代码
+    de_list_company_symbols = company_common_service_api.get_de_list_company()
     real_time_quotes_now = east_money_stock_api.get_real_time_quotes_all_stocks()
+    real_time_quotes_now = real_time_quotes_now.loc[~(real_time_quotes_now['symbol'].isin(de_list_company_symbols))]
 
     # 将list_date列中的所有NaN值设置为99990909
     real_time_quotes_now['list_date'].fillna(20990909.0, inplace=True)
@@ -184,6 +189,6 @@ def clean_history_data():
 
 
 if __name__ == '__main__':
-    sync_k_line_info("2024-05-24", None)
+    sync_k_line_info("2024-06-03", None)
     # clean_history_data()
     # sync_k_line_info("2023-12-22")

mns-scheduler-1.0.7.2/mns_scheduler/k_line/clean/week_month/normal_week_month_k_line_service.py

@@ -0,0 +1,117 @@
+import sys
+import os
+
+file_path = os.path.abspath(__file__)
+end = file_path.index('mns') + 16
+project_path = file_path[0:end]
+sys.path.append(project_path)
+from mns_common.db.MongodbUtil import MongodbUtil
+import mns_common.utils.date_handle_util as date_handle_util
+from mns_common.component.classify.symbol_classify_param import stock_type_classify_param
+
+mongodb_util = MongodbUtil('27017')
+
+
+# 处理月线 周线 todo 暂时简单计算周线之和
+def handle_month_week_line(k_line_info, str_day, symbol, deal_days):
+    sub_stock_new_max_deal_days = stock_type_classify_param['sub_stock_new_max_deal_days']
+    if deal_days > sub_stock_new_max_deal_days:
+        k_line_info = handle_month_line(k_line_info, str_day, symbol)
+        k_line_info = handle_week_line(k_line_info, str_day, symbol)
+    else:
+        k_line_info['week01'] = 0
+        k_line_info['week02'] = 0
+        k_line_info['week03'] = 0
+        k_line_info['week04'] = 0
+        k_line_info['sum_week'] = 0
+        k_line_info['week_num'] = 0
+        k_line_info['week_last_day'] = '19890729'
+
+        k_line_info['sum_month'] = 0
+        k_line_info['month_num'] = 0
+        k_line_info['month01'] = 0
+        k_line_info['month02'] = 0
+        k_line_info['month01_date'] = '19890729'
+        k_line_info['month02_date'] = '19890729'
+    return k_line_info
+
+
+# 处理月线
+def handle_month_line(k_line_info, str_day, symbol):
+    month_begin_day = str_day[0:7] + '-01'
+    query = {"symbol": symbol,
+             'date': {"$lt": date_handle_util.no_slash_date(month_begin_day)}}
+    stock_hfq_monthly = mongodb_util.descend_query(query, 'stock_qfq_monthly', 'date', 2)
+    month_num = stock_hfq_monthly.shape[0]
+    k_line_info['month_num'] = month_num
+    if month_num > 0:
+        k_line_info['sum_month'] = round(sum(stock_hfq_monthly['chg']), 2)
+    else:
+        k_line_info['sum_month'] = 0
+
+    if month_num == 0:
+        k_line_info['month01'] = 0
+        k_line_info['month02'] = 0
+        k_line_info['month01_date'] = '19890729'
+        k_line_info['month02_date'] = '19890729'
+    elif month_num == 1:
+        k_line_info['month01'] = stock_hfq_monthly.iloc[0].chg
+        k_line_info['month02'] = 0
+        k_line_info['month01_date'] = stock_hfq_monthly.iloc[0].date
+        k_line_info['month02_date'] = '19890729'
+    elif month_num == 2:
+        k_line_info['month01'] = stock_hfq_monthly.iloc[0].chg
+        k_line_info['month02'] = stock_hfq_monthly.iloc[1].chg
+        k_line_info['month01_date'] = stock_hfq_monthly.iloc[0].date
+        k_line_info['month02_date'] = stock_hfq_monthly.iloc[1].date
+
+    return k_line_info
+
+
+# 处理周线
+def handle_week_line(k_line_info, str_day, symbol):
+    month_begin_day = str_day[0:7] + '-01'
+    query = {"symbol": symbol,
+             '$and': [{'date': {"$gte": date_handle_util.no_slash_date(month_begin_day)}},
+                      {'date': {"$lt": date_handle_util.no_slash_date(str_day)}}]}
+    stock_hfq_weekly = mongodb_util.find_query_data('stock_qfq_weekly', query)
+    week_num = stock_hfq_weekly.shape[0]
+    if week_num > 0:
+        stock_hfq_weekly = stock_hfq_weekly.sort_values(by=['date'], ascending=False)
+        k_line_info['sum_week'] = round(sum(stock_hfq_weekly['chg']), 2)
+    else:
+        k_line_info['sum_week'] = 0
+    k_line_info['week_num'] = week_num
+    if week_num == 1:
+        k_line_info['week01'] = stock_hfq_weekly.iloc[0].chg
+        k_line_info['week02'] = 0
+        k_line_info['week03'] = 0
+        k_line_info['week04'] = 0
+    elif week_num == 2:
+        k_line_info['week01'] = stock_hfq_weekly.iloc[0].chg
+        k_line_info['week02'] = stock_hfq_weekly.iloc[1].chg
+        k_line_info['week03'] = 0
+        k_line_info['week04'] = 0
+    elif week_num == 3:
+        k_line_info['week01'] = stock_hfq_weekly.iloc[0].chg
+        k_line_info['week02'] = stock_hfq_weekly.iloc[1].chg
+        k_line_info['week03'] = stock_hfq_weekly.iloc[2].chg
+        k_line_info['week04'] = 0
+    elif week_num >= 4:
+        k_line_info['week01'] = stock_hfq_weekly.iloc[0].chg
+        k_line_info['week02'] = stock_hfq_weekly.iloc[1].chg
+        k_line_info['week03'] = stock_hfq_weekly.iloc[2].chg
+        k_line_info['week04'] = stock_hfq_weekly.iloc[3].chg
+    elif week_num == 0:
+        k_line_info['week01'] = 0
+        k_line_info['week02'] = 0
+        k_line_info['week03'] = 0
+        k_line_info['week04'] = 0
+        k_line_info['week_last_day'] = month_begin_day
+        k_line_info['sum_week'] = 0
+        return k_line_info
+    stock_hfq_weekly = stock_hfq_weekly.sort_values(by=['date'], ascending=False)
+    stock_hfq_weekly_last = stock_hfq_weekly.iloc[0:1]
+    k_line_info['week_last_day'] = list(stock_hfq_weekly_last['date'])[0]
+
+    return k_line_info

mns-scheduler-1.0.7.2/mns_scheduler/k_line/clean/week_month/sub_new_week_month_k_line_service.py

@@ -0,0 +1,47 @@
+import sys
+import os
+
+file_path = os.path.abspath(__file__)
+end = file_path.index('mns') + 16
+project_path = file_path[0:end]
+sys.path.append(project_path)
+
+# 每月最大交易天数
+MAX_TRADE_DAYS_PER_MONTH = 23
+# 每周最大交易天数
+MAX_TRADE_DAYS_PER_MONTH = 5
+
+
+def handle_month_week_line(k_line_info, stock_qfq_daily, deal_days):
+    if 1 < deal_days < MAX_TRADE_DAYS_PER_MONTH:
+        month_01 = round(sum(stock_qfq_daily['chg']), 2)
+        k_line_info['sum_month'] = month_01
+        k_line_info['month_num'] = 1
+        k_line_info['month01'] = month_01
+    elif (deal_days >= MAX_TRADE_DAYS_PER_MONTH) \
+            and (deal_days < MAX_TRADE_DAYS_PER_MONTH * 2):
+        stock_qfq_daily_month_01 = stock_qfq_daily.iloc[0:MAX_TRADE_DAYS_PER_MONTH]
+        month_01 = round(sum(stock_qfq_daily_month_01['chg']), 2)
+        stock_qfq_daily_month_02 = stock_qfq_daily.iloc[MAX_TRADE_DAYS_PER_MONTH + 1, deal_days - 1]
+        month_02 = round(sum(stock_qfq_daily_month_02['chg']), 2)
+        k_line_info['sum_month'] = round(month_01 + month_02, 2)
+        k_line_info['month_num'] = 2
+        k_line_info['month01'] = month_01
+        k_line_info['month_02'] = month_02
+    elif deal_days >= MAX_TRADE_DAYS_PER_MONTH * 2:
+        stock_qfq_daily_month_01 = stock_qfq_daily.iloc[0:MAX_TRADE_DAYS_PER_MONTH]
+        month_01 = round(sum(stock_qfq_daily_month_01['chg']), 2)
+        stock_qfq_daily_month_02 = stock_qfq_daily.iloc[MAX_TRADE_DAYS_PER_MONTH + 1, MAX_TRADE_DAYS_PER_MONTH * 2]
+        month_02 = round(sum(stock_qfq_daily_month_02['chg']), 2)
+
+        stock_qfq_daily_week_sum = stock_qfq_daily.iloc[MAX_TRADE_DAYS_PER_MONTH * 2 + 1, deal_days - 1]
+
+        week_sum = round(sum(stock_qfq_daily_week_sum['chg']), 2)
+
+        k_line_info['sum_month'] = round(month_01 + month_02, 2)
+        k_line_info['month_num'] = 2
+        k_line_info['month01'] = month_01
+        k_line_info['month_02'] = month_02
+
+        k_line_info['week_num'] = week_sum
+    return k_line_info

mns-scheduler-1.0.7.2/mns_scheduler/k_line/hot_stocks/__init__.py

@@ -0,0 +1,7 @@
+import sys
+import os
+
+file_path = os.path.abspath(__file__)
+end = file_path.index('mns') + 16
+project_path = file_path[0:end]
+sys.path.append(project_path)

mns-scheduler-1.0.7.2/mns_scheduler/lhb/__init__.py

@@ -0,0 +1,7 @@
+import sys
+import os
+
+file_path = os.path.abspath(__file__)
+end = file_path.index('mns') + 16
+project_path = file_path[0:end]
+sys.path.append(project_path)

mns-scheduler-1.0.7.2/mns_scheduler/risk/__init__.py

@@ -0,0 +1,7 @@
+import sys
+import os
+
+file_path = os.path.abspath(__file__)
+end = file_path.index('mns') + 16
+project_path = file_path[0:end]
+sys.path.append(project_path)

{mns-scheduler-1.0.6.9 → mns-scheduler-1.0.7.2}/mns_scheduler/zz_task/data_sync_task.py

@@ -24,7 +24,7 @@ import mns_scheduler.zt.export_open_data_to_excel as export_open_data_to_excel_a
 import mns_scheduler.zt.zt_five_boards_sync_api as zt_five_boards_sync_api
 import mns_scheduler.zt.zt_pool_sync_api as zt_pool_sync_api
 import mns_scheduler.zt.today_high_chg_pool_sync_api as today_high_chg_pool_sync_api
-import mns_scheduler.k_line.clean.k_line_info_clean_service as k_line_info_clean_service
+import mns_scheduler.k_line.clean.k_line_info_clean_task as k_line_info_clean_service
 import mns_scheduler.concept.clean.ths_concept_clean_api as ths_concept_choose_api
 import mns_common.api.em.east_money_stock_gdfx_free_top_10_api as east_money_stock_gdfx_free_top_10_api
 import \

{mns-scheduler-1.0.6.9 → mns-scheduler-1.0.7.2}/mns_scheduler.egg-info/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: mns-scheduler
-Version: 1.0.6.9
+Version: 1.0.7.2

{mns-scheduler-1.0.6.9 → mns-scheduler-1.0.7.2}/mns_scheduler.egg-info/SOURCES.txt

@@ -57,8 +57,15 @@ mns_scheduler/irm/api/sz_stock_sns_sse_info_api.py
 mns_scheduler/k_line/__init__.py
 mns_scheduler/k_line/clean/__init__.py
 mns_scheduler/k_line/clean/k_line_info_clean_impl.py
-mns_scheduler/k_line/clean/k_line_info_clean_service.py
-mns_scheduler/k_line/clean/recent_hot_stocks_clean_service.py
+mns_scheduler/k_line/clean/k_line_info_clean_task.py
+mns_scheduler/k_line/clean/daily/__init__.py
+mns_scheduler/k_line/clean/daily/daily_k_line_clean_common_service.py
+mns_scheduler/k_line/clean/daily/daily_k_line_service.py
+mns_scheduler/k_line/clean/week_month/__init__.py
+mns_scheduler/k_line/clean/week_month/normal_week_month_k_line_service.py
+mns_scheduler/k_line/clean/week_month/sub_new_week_month_k_line_service.py
+mns_scheduler/k_line/hot_stocks/__init__.py
+mns_scheduler/k_line/hot_stocks/recent_hot_stocks_clean_service.py
 mns_scheduler/k_line/sync/__init__.py
 mns_scheduler/k_line/sync/daily_week_month_line_sync.py
 mns_scheduler/kpl/__init__.py

{mns-scheduler-1.0.6.9 → mns-scheduler-1.0.7.2}/setup.py

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