mns-scheduler 1.0.6.8__py3-none-any.whl → 1.0.7.1__py3-none-any.whl

mns_scheduler/k_line/clean/k_line_info_clean_impl.py

@@ -6,21 +6,13 @@ end = file_path.index('mns') + 17
 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
+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')
-# 排除最近10天有三个连板的股票
-EXCLUDE_DAYS = 10
-
-MAX_CONTINUE_BOARDS = 3
 
 
 # 日线 周线 月线 成交量  筹码信息
@@ -32,491 +24,10 @@ def calculate_k_line_info(str_day, symbol, diff_days):
                  '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
-
-
-def init_day_line_data(k_line_info, stock_qfq_daily):
-    daily_num = stock_qfq_daily.shape[0]
-    if daily_num == 0:
-        k_line_info['max_chg_daily01'] = 0
-        k_line_info['daily01'] = 0
-        k_line_info['daily02'] = 0
-        k_line_info['daily03'] = 0
-        k_line_info['daily04'] = 0
-        k_line_info['daily05'] = 0
-    elif daily_num == 1:
-        k_line_info['max_chg_daily01'] = stock_qfq_daily.iloc[0].max_chg
-        k_line_info['daily01'] = stock_qfq_daily.iloc[0].chg
-        k_line_info['daily02'] = 0
-        k_line_info['daily03'] = 0
-        k_line_info['daily04'] = 0
-        k_line_info['daily05'] = 0
-    elif daily_num == 2:
-        k_line_info['max_chg_daily01'] = stock_qfq_daily.iloc[0].max_chg
-        k_line_info['daily01'] = stock_qfq_daily.iloc[0].chg
-        k_line_info['daily02'] = stock_qfq_daily.iloc[1].chg
-        k_line_info['daily03'] = 0
-        k_line_info['daily04'] = 0
-        k_line_info['daily05'] = 0
-    elif daily_num == 3:
-        k_line_info['max_chg_daily01'] = stock_qfq_daily.iloc[0].max_chg
-        k_line_info['daily01'] = stock_qfq_daily.iloc[0].chg
-        k_line_info['daily02'] = stock_qfq_daily.iloc[1].chg
-        k_line_info['daily03'] = stock_qfq_daily.iloc[2].chg
-        k_line_info['daily04'] = 0
-        k_line_info['daily05'] = 0
-    elif daily_num == 4:
-        k_line_info['max_chg_daily01'] = stock_qfq_daily.iloc[0].max_chg
-        k_line_info['daily01'] = stock_qfq_daily.iloc[0].chg
-        k_line_info['daily02'] = stock_qfq_daily.iloc[1].chg
-        k_line_info['daily03'] = stock_qfq_daily.iloc[2].chg
-        k_line_info['daily04'] = stock_qfq_daily.iloc[3].chg
-        k_line_info['daily05'] = 0
-    elif daily_num >= 5:
-        k_line_info['max_chg_daily01'] = stock_qfq_daily.iloc[0].max_chg
-        k_line_info['daily01'] = stock_qfq_daily.iloc[0].chg
-        k_line_info['daily02'] = stock_qfq_daily.iloc[1].chg
-        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
-
-    return k_line_info
-
-
-# 计算30天最大涨幅
-def calculate_30_day_max_chg(stock_qfq_daily, k_line_info):
-    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:
-        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
-        return k_line_info
-
-    stock_qfq_daily_30['date_time'] = pd.to_datetime(stock_qfq_daily_30['date'])
-    # 找出最高点和最低点的行
-    max_row = stock_qfq_daily_30[stock_qfq_daily_30['high'] == stock_qfq_daily_30['high'].max()]
-    min_row = stock_qfq_daily_30[stock_qfq_daily_30['low'] == stock_qfq_daily_30['low'].min()]
-
-    # 获取最高点和最低点的值以及对应的日期
-    max_high = max_row['high'].values[0]
-    min_low = min_row['low'].values[0]
-    date_of_max_high = max_row['date_time'].values[0]
-    date_of_min_low = min_row['date_time'].values[0]
-    max_chg_30 = round((max_high - min_low) * 100 / min_low, 2)
-    if date_of_max_high < date_of_min_low:
-        max_chg_30 = -max_chg_30
-    k_line_info['max_chg_30'] = max_chg_30
-    return k_line_info
-
-
-# 计算平均值
-def calculate_exchange_avg_param(stock_qfq_daily):
-    stock_qfq_daily = stock_qfq_daily.sort_values(by=['date'], ascending=True)
-
-    # exchange
-    # 计算每个日期的前10天的均值
-    stock_qfq_daily['exchange_mean'] = round(
-        stock_qfq_daily['exchange'].rolling(window=10, min_periods=1).mean(), 2)
-
-    # stock_qfq_daily['exchange_mean_ewm'] = round(
-    #     stock_qfq_daily['exchange'].ewm(span=10).mean(), 2)
-
-    stock_qfq_daily['exchange_mean_yesterday'] = stock_qfq_daily['exchange_mean']
-
-    # 昨日平均值 向当前移位
-    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)
-
-    # pct_chg
-
-    # 计算每个日期的前10天的均值
-    stock_qfq_daily['pct_chg_mean'] = round(stock_qfq_daily['pct_chg'].rolling(window=10, min_periods=1).mean(),
-                                            2)
-
-    stock_qfq_daily['pct_chg_mean_yesterday'] = stock_qfq_daily['pct_chg_mean']
-
-    stock_qfq_daily['pct_chg_mean_yesterday'] = stock_qfq_daily['pct_chg_mean_yesterday'].shift(1)
-
-    stock_qfq_daily['pct_chg_difference'] = round(
-        stock_qfq_daily['pct_chg'] - stock_qfq_daily['pct_chg_mean_yesterday'],
-        2)
-
-    # 计算五日均线
-
-    stock_qfq_daily['avg_five'] = round(stock_qfq_daily['close'].rolling(window=5, min_periods=1).mean(),
-                                        2)
-    # 计算十日均线
-    stock_qfq_daily['avg_ten'] = round(stock_qfq_daily['close'].rolling(window=10, min_periods=1).mean(),
-                                       2)
-    # 计算二十日均线
-    stock_qfq_daily['avg_twenty'] = round(stock_qfq_daily['close'].rolling(window=20, min_periods=1).mean(),
-                                          2)
-
-    # 计算三十日均线
-    stock_qfq_daily['avg_thirty'] = round(stock_qfq_daily['close'].rolling(window=30, min_periods=1).mean(),
-                                          2)
-
-    # 计算六十日均线
-    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)
-
-    stock_qfq_daily['close_difference_ten'] = round(
-        100 * (stock_qfq_daily['close'] - stock_qfq_daily['avg_ten']) / stock_qfq_daily['close'],
-        2)
-
-    stock_qfq_daily['close_difference_twenty'] = round(
-        100 * (stock_qfq_daily['close'] - stock_qfq_daily['avg_twenty']) / stock_qfq_daily['close'],
-        2)
-
-    stock_qfq_daily['close_difference_thirty'] = round(
-        100 * (stock_qfq_daily['close'] - stock_qfq_daily['avg_thirty']) / stock_qfq_daily['close'],
-        2)
-
-    stock_qfq_daily['close_difference_sixty'] = round(
-        100 * (stock_qfq_daily['close'] - stock_qfq_daily['avg_sixty']) / stock_qfq_daily['close'],
-        2)
-
-    stock_qfq_daily = stock_qfq_daily[[
-        "symbol",
-        "name",
-        "industry",
-        "chg",
-        "max_chg",
-        "pct_chg",
-        "pct_chg_mean",
-        "exchange",
-        "exchange_mean",
-        "exchange_mean_yesterday",
-        "exchange_difference",
-        'exchange_chg_percent',
-        "pct_chg_mean_yesterday",
-        "pct_chg_difference",
-        "close_difference_five",
-        "close_difference_ten",
-        "close_difference_twenty",
-        "close_difference_thirty",
-        "close_difference_sixty",
-        "amount_level",
-        "flow_mv",
-        "flow_mv_sp",
-        "volume",
-        "amount",
-        "change",
-        "last_price",
-        "open",
-        "close",
-        "high",
-        "low",
-        "avg_five",
-        "avg_ten",
-        "avg_twenty",
-        'avg_thirty',
-        'avg_sixty',
-        "classification",
-        "_id",
-        "date"
-    ]]
-    stock_qfq_daily = stock_qfq_daily.sort_values(by=['date'], ascending=False)
-    stock_qfq_daily = stock_qfq_daily.fillna(0)
-
-    return stock_qfq_daily
-
-
-def set_history_list(stock_qfq_daily_one, stock_qfq_daily):
-    stock_qfq_daily = stock_qfq_daily[[
-        "date",
-        "exchange",
-        "exchange_mean",
-        "exchange_mean_yesterday",
-        "exchange_difference",
-        "exchange_chg_percent",
-        "pct_chg_mean_yesterday",
-        "pct_chg_difference",
-        "pct_chg",
-        "pct_chg_mean",
-        "max_chg",
-        "chg",
-        "amount_level",
-        "close_difference_five",
-        "close_difference_ten",
-        "close_difference_twenty",
-        "close_difference_thirty",
-        'open',
-        'close',
-        'high',
-        'low'
-    ]]
-    # 删除index 转str
-    stock_qfq_daily_one.loc[:, 'history_data'] = stock_qfq_daily.to_string(index=False)
-
-    daily_num = stock_qfq_daily.shape[0]
-    std_amount_ten = 0
-    mean_amount_ten = 0
-    std_amount_thirty = 0
-    mean_amount_thirty = 0
-    std_amount_sixty = 0
-    mean_amount_sixty = 0
-
-    if daily_num >= 10:
-        stock_qfq_daily_ten = stock_qfq_daily.iloc[0:10]
-        # 计算 amount 的标准差
-        std_amount_ten = round(stock_qfq_daily_ten['amount_level'].std(), 2)
-        # 计算 amount 的平均值
-        mean_amount_ten = round(stock_qfq_daily_ten['amount_level'].mean(), 2)
-
-    if daily_num >= 30:
-        stock_qfq_daily_thirty = stock_qfq_daily.iloc[0:30]
-        # 计算 amount 的标准差
-        std_amount_thirty = round(stock_qfq_daily_thirty['amount_level'].std(), 2)
-        # 计算 amount 的平均值
-        mean_amount_thirty = round(stock_qfq_daily_thirty['amount_level'].mean(), 2)
-    if daily_num >= 60:
-        std_amount_sixty = round(stock_qfq_daily['amount_level'].std(), 2)
-        # 计算 amount 的平均值
-        mean_amount_sixty = round(stock_qfq_daily['amount_level'].mean(), 2)
-
-    # text = list(stock_qfq_daily_one['history_data'])[0]
-    # history_data_df = pd.read_csv(StringIO(text), delim_whitespace=True)
-
-    stock_qfq_daily_one.loc[:, 'std_amount_ten'] = std_amount_ten
-    stock_qfq_daily_one.loc[:, 'mean_amount_ten'] = mean_amount_ten
-    stock_qfq_daily_one.loc[:, 'std_amount_thirty'] = std_amount_thirty
-    stock_qfq_daily_one.loc[:, 'mean_amount_thirty'] = mean_amount_thirty
-    stock_qfq_daily_one.loc[:, 'std_amount_sixty'] = std_amount_sixty
-    stock_qfq_daily_one.loc[:, 'mean_amount_sixty'] = mean_amount_sixty
-
-    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):
-    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']
-    k_line_info['exchange_last'] = stock_qfq_daily_one['exchange']
-    k_line_info['exchange_mean_last'] = stock_qfq_daily_one['exchange_mean']
-    k_line_info['exchange_mean_last_02'] = stock_qfq_daily_one['exchange_mean_yesterday']
-    k_line_info['exchange_difference_last'] = stock_qfq_daily_one['exchange_difference']
-    k_line_info['exchange_chg_percent_last'] = stock_qfq_daily_one['exchange_chg_percent']
-    k_line_info['pct_chg_mean_last'] = stock_qfq_daily_one['pct_chg_mean_yesterday']
-    k_line_info['pct_chg_difference_last'] = stock_qfq_daily_one['pct_chg_difference']
-
-    k_line_info['close_difference_five_last'] = stock_qfq_daily_one['close_difference_five']
-    k_line_info['close_difference_ten_last'] = stock_qfq_daily_one['close_difference_ten']
-    k_line_info['close_difference_twenty_last'] = stock_qfq_daily_one['close_difference_twenty']
-    k_line_info['close_difference_thirty_last'] = stock_qfq_daily_one['close_difference_thirty']
-    k_line_info['close_difference_sixty_last'] = stock_qfq_daily_one['close_difference_sixty']
-
-    k_line_info['pct_chg_last'] = stock_qfq_daily_one['pct_chg']
-    k_line_info['pct_chg_mean_last'] = stock_qfq_daily_one['pct_chg_mean']
-    k_line_info['max_chg_last'] = stock_qfq_daily_one['max_chg']
-    k_line_info['chg_last'] = stock_qfq_daily_one['chg']
-    k_line_info['open_last'] = stock_qfq_daily_one['open']
-    k_line_info['close_last'] = stock_qfq_daily_one['close']
-    k_line_info['high_last'] = stock_qfq_daily_one['high']
-    k_line_info['low_last'] = stock_qfq_daily_one['low']
-    k_line_info['avg_five_last'] = stock_qfq_daily_one['avg_five']
-    k_line_info['avg_ten_last'] = stock_qfq_daily_one['avg_ten']
-    k_line_info['avg_twenty_last'] = stock_qfq_daily_one['avg_twenty']
-    k_line_info['avg_thirty_last'] = stock_qfq_daily_one['avg_thirty']
-    k_line_info['avg_sixty_last'] = stock_qfq_daily_one['avg_sixty']
-
-    k_line_info['std_amount_ten'] = stock_qfq_daily_one['std_amount_ten']
-    k_line_info['mean_amount_ten'] = stock_qfq_daily_one['mean_amount_ten']
-    k_line_info['std_amount_thirty'] = stock_qfq_daily_one['std_amount_thirty']
-    k_line_info['mean_amount_thirty'] = stock_qfq_daily_one['mean_amount_thirty']
-    k_line_info['std_amount_sixty'] = stock_qfq_daily_one['std_amount_sixty']
-    k_line_info['mean_amount_sixty'] = stock_qfq_daily_one['mean_amount_sixty']
-    k_line_info['k_line_pattern'] = stock_qfq_daily_one['k_line_pattern']
-    k_line_info['history_data'] = stock_qfq_daily_one['history_data']
-
+    # 处理周线 月线
+    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
-
-
-# 计算开盘涨幅
-def calculate_open_chg(stock_qfq_daily, k_line_info):
-    # 新股
-    if stock_qfq_daily.shape[0] == 1:
-        k_line_info['open_chg_last'] = k_line_info['daily01']
-    else:
-        # 获取前一个交易日的收盘价格
-        k_line_info['before_close'] = round(
-            k_line_info['close_last'] / (1 + k_line_info['daily01'] * 0.01), 2)
-        k_line_info['open_chg_last'] = round((k_line_info['open_last'] / k_line_info['before_close'] - 1) * 100, 2)
-    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

mns_scheduler/k_line/clean/{k_line_info_clean_service.py → 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/k_line/clean/week_month/__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/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