mns-scheduler 1.3.2.4__tar.gz → 1.3.2.6__tar.gz

{mns-scheduler-1.3.2.4 → mns-scheduler-1.3.2.6}/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: mns-scheduler
-Version: 1.3.2.4
+Version: 1.3.2.6

mns-scheduler-1.3.2.6/mns_scheduler/k_line/common/__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.3.2.6/mns_scheduler/k_line/common/k_line_common_api.py

@@ -0,0 +1,144 @@
+import sys
+import os
+
+import pandas as pd
+
+file_path = os.path.abspath(__file__)
+end = file_path.index('mns') + 16
+project_path = file_path[0:end]
+sys.path.append(project_path)
+import mns_common.api.akshare.k_line_api as k_line_api
+import mns_common.utils.date_handle_util as date_handle_util
+import mns_common.api.xueqiu.xue_qiu_k_line_api as xue_qiu_k_line_api
+import mns_common.component.cookie.cookie_info_service as cookie_info_service
+import mns_common.component.common_service_fun_api as common_service_fun_api
+from datetime import datetime, timedelta
+from mns_common.component.exception.ExceptionMonitor import exception_counter
+import mns_common.api.msg.push_msg_api as push_msg_api
+import numpy as np
+import mns_common.utils.data_frame_util as data_frame_util
+from loguru import logger
+
+source_type = 'xue_qiu'
+# source_type = 'em'
+error_no = 1
+
+
+# 自定义报警处理函数
+def custom_alert(current: int, threshold: int):
+    push_msg_api.push_msg_to_wechat('获取k线数据异常', "当前次数:" + str(current) + "阈值:" + str(threshold))
+
+
+def get_k_line_common_adapter(symbol, period, hq, end_date):
+    global error_no
+    df = pd.DataFrame()
+    try:
+        if source_type == 'em':
+            df = get_em_k_line_api(symbol, period, hq, end_date)
+        elif source_type == 'xue_qiu':
+            df = get_xueqiu_k_line_api(symbol, period, hq, end_date)
+        if data_frame_util.is_empty(df):
+            error_no = error_no + 1
+    except BaseException as e:
+        logger.error("获取k线异常:{}", e)
+        error_no = error_no + 1
+    if error_no == 1000:
+        push_msg_api.push_msg_to_wechat('获取k线数据异常', "当前次数:" + str(error_no))
+    return df
+
+
+# 应用带参数的装饰器
+# @exception_counter(
+#     threshold=1500,
+#     alert_handler=custom_alert,
+#     auto_reset=False
+# )
+def get_em_k_line_api(symbol, period, hq, end_date):
+    # 检查symbol是否以'6'开头
+    if symbol.startswith('6'):
+        symbol_a = '1.' + symbol
+    else:
+        symbol_a = '0.' + symbol
+    stock_hfq_df = k_line_api.stock_zh_a_hist(symbol=symbol_a,
+                                              period=period,
+                                              start_date=date_handle_util.no_slash_date('1990-12-19'),
+                                              end_date=date_handle_util.no_slash_date(end_date),
+                                              adjust=hq)
+
+    stock_hfq_df.rename(columns={"日期": "date", "开盘": "open",
+                                 "收盘": "close", "最高": "high",
+                                 "最低": "low", "成交量": "volume",
+                                 "成交额": "amount", "振幅": "pct_chg",
+                                 "涨跌幅": "chg", "涨跌额": "change",
+                                 "换手率": "exchange"}, inplace=True)
+    stock_hfq_df['symbol'] = symbol
+    stock_hfq_df['_id'] = symbol + '-' + stock_hfq_df['date']
+    return stock_hfq_df
+
+
+# period : year  quarter  month  week  day
+# hq: qfq:before ,hfq:after, bfq:normal
+
+def get_xueqiu_k_line_api(symbol, period, hq, end_date):
+    if hq == 'qfq':
+        adjust = 'before'
+    elif hq == 'hfq':
+        adjust = 'after'
+    else:
+        adjust = 'normal'
+
+    period_time = 'day'
+    if period == 'daily':
+        period_time = 'day'
+    elif period == 'weekly':
+        period_time = 'week'
+    elif period == 'monthly':
+        period_time = 'month'
+
+    cookie = cookie_info_service.get_xue_qiu_cookie()
+    symbol_pre_fix = common_service_fun_api.add_pre_prefix_one(symbol)
+    dt = datetime.strptime(end_date, '%Y-%m-%d')
+    dt += timedelta(days=1)
+    timestamp = str(int(dt.timestamp() * 1000))  # 转换为毫秒
+    stock_k_line_df = xue_qiu_k_line_api.get_xue_qiu_k_line(symbol_pre_fix, period_time,
+                                                            cookie, timestamp, adjust)
+
+    stock_k_line_df['pct_chg'] = round(abs(stock_k_line_df['high'] - stock_k_line_df['low'] / stock_k_line_df['high']),
+                                       2)
+    stock_k_line_df.rename(columns={"chg": "change",
+                                    "percent": "chg",
+                                    "str_day": "date",
+                                    "market_capital": "flow_mv",
+                                    "turnoverrate": "exchange"}, inplace=True)
+    stock_k_line_df = stock_k_line_df[[
+        "date",
+        "open",
+        "close",
+        "high",
+        "low",
+        "volume",
+        "amount",
+        "pct_chg",
+        "chg",
+        "change",
+        "exchange"
+    ]]
+    stock_k_line_df['symbol'] = symbol
+    stock_k_line_df['date'] = stock_k_line_df['date'].str.replace('-', '')
+    stock_k_line_df['_id'] = symbol + '-' + stock_k_line_df['date']
+    stock_k_line_df['last_price'] = round(((stock_k_line_df['close']) / (1 + stock_k_line_df['chg'] / 100)), 2)
+    stock_k_line_df['max_chg'] = round(
+        ((stock_k_line_df['high'] - stock_k_line_df['last_price']) / stock_k_line_df['last_price']) * 100, 2)
+    stock_k_line_df['amount_level'] = round((stock_k_line_df['amount'] / common_service_fun_api.HUNDRED_MILLION), 2)
+    stock_k_line_df['flow_mv'] = round(stock_k_line_df['amount'] * 100 / stock_k_line_df['exchange'], 2)
+    stock_k_line_df['flow_mv_sp'] = round(stock_k_line_df['flow_mv'] / common_service_fun_api.HUNDRED_MILLION, 2)
+
+    stock_k_line_df.replace([np.inf, -np.inf], 0, inplace=True)
+    stock_k_line_df.fillna(0, inplace=True)
+    return stock_k_line_df
+
+
+if __name__ == '__main__':
+    while True:
+        test_df = get_k_line_common_adapter('000001', 'day', 'qfq', '2025-05-25')
+        print(test_df)

{mns-scheduler-1.3.2.4 → mns-scheduler-1.3.2.6}/mns_scheduler/k_line/month_week_daily/bfq_k_line_sync.py

@@ -9,44 +9,24 @@ sys.path.append(project_path)
 from loguru import logger
 import mns_common.component.em.em_stock_info_api as em_stock_info_api
 from mns_common.db.MongodbUtil import MongodbUtil
-import mns_common.utils.date_handle_util as date_handle_util
 import mns_common.component.common_service_fun_api as common_service_fun_api
-import mns_common.api.akshare.k_line_api as k_line_api
+import mns_scheduler.k_line.common.k_line_common_api as k_line_common_api
 import mns_common.component.company.company_common_service_new_api as company_common_service_new_api
 
+
+
 mongodb_util = MongodbUtil('27017')
 
 
 def sync_bfq_k_line_data(period='daily',
                          hq='hfq',
                          hq_col='stock_hfq_daily',
-                         end_date='22220101',
+                         end_date='2222-01-01',
                          symbol=None):
-    # 检查symbol是否以'6'开头
-    if symbol.startswith('6'):
-        symbol_a = '1.' + symbol
-    else:
-        symbol_a = '0.' + symbol
-    stock_hfq_df = k_line_api.stock_zh_a_hist(symbol=symbol_a, period=period,
-                                              start_date=date_handle_util.no_slash_date('1990-12-19'),
-                                              end_date=date_handle_util.no_slash_date(end_date),
-                                              adjust=hq)
-
-    stock_hfq_df.rename(columns={"日期": "date", "开盘": "open",
-                                 "收盘": "close", "最高": "high",
-                                 "最低": "low", "成交量": "volume",
-                                 "成交额": "amount", "振幅": "pct_chg",
-                                 "涨跌幅": "chg", "涨跌额": "change",
-                                 "换手率": "exchange"}, inplace=True)
-
-    stock_hfq_df['symbol'] = symbol
-    stock_hfq_df['_id'] = stock_hfq_df['symbol'] + '-' + stock_hfq_df['date']
-    stock_hfq_df['last_price'] = round(((stock_hfq_df['close']) / (1 + stock_hfq_df['chg'] / 100)), 2)
-    stock_hfq_df['max_chg'] = round(
-        ((stock_hfq_df['high'] - stock_hfq_df['last_price']) / stock_hfq_df['last_price']) * 100, 2)
-    stock_hfq_df['amount_level'] = round((stock_hfq_df['amount'] / common_service_fun_api.HUNDRED_MILLION), 2)
-    stock_hfq_df['flow_mv'] = round(stock_hfq_df['amount'] * 100 / stock_hfq_df['exchange'], 2)
-    stock_hfq_df['flow_mv_sp'] = round(stock_hfq_df['flow_mv'] / common_service_fun_api.HUNDRED_MILLION, 2)
+
+    stock_hfq_df = k_line_common_api.get_k_line_common_adapter(symbol, period, hq, end_date)
+
+
 
     classification = common_service_fun_api.classify_symbol_one(symbol)
     stock_hfq_df['classification'] = classification
@@ -60,7 +40,7 @@ def sync_all_bfq_k_line(period='daily',
                         hq='hfq',
                         hq_col='stock_hfq_daily',
                         end_date='22220101',
-                        symbol=None):
+                        symbol='300085'):
     real_time_quotes_now_es = em_stock_info_api.get_a_stock_info()
 
     symbol_list = list(real_time_quotes_now_es['symbol'])
@@ -91,7 +71,7 @@ def insert_data(stock_hfq_df, hq_col, symbol):
 
 if __name__ == '__main__':
     sync_all_bfq_k_line('daily',
-                        '',
+                        'qfq',
                         'stock_bfq_daily',
-                        None,
-                        None)
+                        '2025-05-25',
+                        '000001')

{mns-scheduler-1.3.2.4 → mns-scheduler-1.3.2.6}/mns_scheduler/k_line/month_week_daily/daily_week_month_line_sync.py

@@ -9,11 +9,9 @@ sys.path.append(project_path)
 from loguru import logger
 import mns_common.component.em.em_stock_info_api as em_stock_info_api
 from mns_common.db.MongodbUtil import MongodbUtil
-import mns_common.utils.date_handle_util as date_handle_util
 import mns_common.component.common_service_fun_api as common_service_fun_api
-import mns_common.api.akshare.k_line_api as k_line_api
 import mns_scheduler.k_line.clean.daily.daily_k_line_clean_common_service as daily_k_line_clean_common_service
-
+import mns_scheduler.k_line.common.k_line_common_api as k_line_common_api
 mongodb_util = MongodbUtil('27017')
 
 
@@ -21,14 +19,9 @@ mongodb_util = MongodbUtil('27017')
 
 def save_one_symbol(symbol, period, end_date, hq, hq_col, real_time_quotes_now):
     # 检查symbol是否以'6'开头
-    if symbol.startswith('6'):
-        symbol_a = '1.' + symbol
-    else:
-        symbol_a = '0.' + symbol
-    stock_hfq_df = k_line_api.stock_zh_a_hist(symbol=symbol_a, period=period,
-                                              start_date=date_handle_util.no_slash_date('1990-12-19'),
-                                              end_date=date_handle_util.no_slash_date(end_date),
-                                              adjust=hq)
+
+    stock_hfq_df = k_line_common_api.get_k_line_common_adapter(symbol, period, hq, end_date)
+
     real_time_quotes_now_one = real_time_quotes_now.loc[real_time_quotes_now['symbol'] == symbol]
     stock_hfq_df.rename(columns={"日期": "date", "开盘": "open",
                                  "收盘": "close", "最高": "high",

{mns-scheduler-1.3.2.4 → mns-scheduler-1.3.2.6}/mns_scheduler/k_line/year_quarter/year_quarter_line_sync.py

@@ -12,27 +12,34 @@ from mns_common.db.MongodbUtil import MongodbUtil
 import mns_common.component.common_service_fun_api as common_service_fun_api
 import mns_common.constant.db_name_constant as db_name_constant
 import mns_common.api.xueqiu.xue_qiu_k_line_api as xue_qiu_k_line_api
+import mns_common.component.cookie.cookie_info_service as cookie_info_service
+from datetime import datetime
+import mns_common.utils.data_frame_util as data_frame_util
 
 mongodb_util = MongodbUtil('27017')
 
 
 def sync_year_k_line():
-    global symbol_prefix
+    timestamp = str(int(datetime.now().timestamp() * 1000))
+
     col_name = db_name_constant.STOCK_QFQ_YEAR
     real_time_quotes_all_stocks_df = em_stock_info_api.get_a_stock_info()
     real_time_quotes_all_stocks_df = common_service_fun_api.classify_symbol(real_time_quotes_all_stocks_df)
+    real_time_quotes_all_stocks_df = common_service_fun_api.add_pre_prefix(real_time_quotes_all_stocks_df)
     for stock_one in real_time_quotes_all_stocks_df.itertuples():
         symbol = stock_one.symbol
         try:
-            classification = stock_one.classification
-            if classification in ['H', 'K']:
-                symbol_prefix = 'SH' + symbol
-            elif classification in ['S', 'C']:
-                symbol_prefix = 'SZ' + symbol
-            elif classification in ['X']:
-                symbol_prefix = 'BJ' + symbol
+            symbol_prefix = stock_one.symbol_prefix
+
+            year_k_line_df_copy = xue_qiu_k_line_api.get_xue_qiu_k_line(symbol_prefix, 'year',
+                                                                        cookie_info_service.get_xue_qiu_cookie(),
+                                                                        timestamp,
+                                                                        'before')
+            if data_frame_util.is_empty(year_k_line_df_copy):
+                logger.warning("返回数据为空:{}", symbol)
+                continue
 
-            year_k_line_df = xue_qiu_k_line_api.get_xue_qiu_k_line(symbol_prefix, 'year')
+            year_k_line_df = year_k_line_df_copy.copy()
             year_k_line_df = year_k_line_df[[
                 'volume',
                 'open',

{mns-scheduler-1.3.2.4 → mns-scheduler-1.3.2.6}/mns_scheduler/zt/script/sync_now_higt_chg_zt.py

@@ -19,13 +19,14 @@ def sync_now_day_high_chg():
     real_time_quotes_now_es = em_stock_info_api.get_a_stock_info()
     real_time_quotes_now_es_high_chg = real_time_quotes_now_es.loc[
         real_time_quotes_now_es['chg'] > common_service_fun_api.ZT_CHG]
+    now_date = datetime.now()
+
+    str_now_day = now_date.strftime('%Y-%m-%d')
     # 同步qfq k线
-    daily_week_month_line_sync.sync_all_daily_data('daily', 'qfq', 'stock_qfq_daily', None,
+    daily_week_month_line_sync.sync_all_daily_data('daily', 'qfq', 'stock_qfq_daily', str_now_day,
                                                    list(real_time_quotes_now_es_high_chg['symbol']))
 
-    now_date = datetime.now()
 
-    str_now_day = now_date.strftime('%Y-%m-%d')
     # 同步当前涨停
     em_zt_pool_sync_api.save_zt_info(str_now_day)
 

{mns-scheduler-1.3.2.4 → mns-scheduler-1.3.2.6}/mns_scheduler/zt/zt_pool/ths_zt_pool_sync_api.py

@@ -13,11 +13,12 @@ import mns_common.component.em.em_stock_info_api as em_stock_info_api
 import mns_common.component.company.company_common_service_new_api as company_common_service_new_api
 import mns_common.component.common_service_fun_api as common_service_fun_api
 from loguru import logger
+import mns_scheduler.k_line.common.k_line_common_api as k_line_common_api
 import mns_common.api.akshare.k_line_api as k_line_api
 import mns_common.utils.date_handle_util as date_handle_util
 from mns_common.db.MongodbUtil import MongodbUtil
 import mns_common.constant.db_name_constant as db_name_constant
-import time
+import mns_scheduler.k_line.common.k_line_common_api as k_line_common_api
 
 mongodb_util = MongodbUtil('27017')
 
@@ -32,56 +33,14 @@ def ths_zt_pool(str_day, real_time_quotes_all_stocks):
     now_date = datetime.now()
     now_day_str_day = now_date.strftime('%Y-%m-%d')
     ths_zt_pool_df = ths_stock_zt_pool_api.get_zt_reason(str_day)
-    if data_frame_util.is_empty(ths_zt_pool_df):
+    ths_zt_pool_df_copy = ths_zt_pool_df.copy()
+
+    if data_frame_util.is_empty(ths_zt_pool_df_copy):
         return pd.DataFrame()
     if str_day == now_day_str_day:
-        ths_zt_pool_df = merge_now_day_zt_info(ths_zt_pool_df, real_time_quotes_all_stocks)
+        ths_zt_pool_df = merge_his_day_zt_info(ths_zt_pool_df_copy, str_day)
     else:
-        ths_zt_pool_df = merge_his_day_zt_info(ths_zt_pool_df, str_day)
-
-    return ths_zt_pool_df
-
-
-def merge_now_day_zt_info(ths_zt_pool_df, real_time_quotes_all_stocks):
-    if real_time_quotes_all_stocks is None:
-        real_time_quotes_all_stocks = em_stock_info_api.get_a_stock_info()
-    real_time_quotes_all_stocks = real_time_quotes_all_stocks[['symbol', 'amount',
-                                                               'exchange', 'flow_mv', 'total_mv']]
-    real_time_quotes_all_stocks_zt = real_time_quotes_all_stocks.loc[
-        real_time_quotes_all_stocks['symbol'].isin(ths_zt_pool_df['symbol'])]
-
-    query_field = {
-        "ths_concept_name": 1,
-        "ths_concept_code": 1,
-        "ths_concept_sync_day": 1,
-        "company_type": 1,
-        "concept_create_day": 1,
-        "first_sw_industry": 1,
-        "third_sw_industry": 1,
-        "industry": 1,
-        "list_date": 1,
-    }
-    query_field_key = str(query_field)
-    query_key = str({'symbol': {"$in": list(ths_zt_pool_df['symbol'])}})
-    company_df_zt = company_common_service_new_api.get_company_info_by_field(query_key, query_field_key)
-
-    company_df_zt = company_df_zt.set_index(['_id'], drop=True)
-    real_time_quotes_all_stocks_zt = real_time_quotes_all_stocks_zt.set_index(['symbol'], drop=True)
-    ths_zt_pool_df = ths_zt_pool_df.set_index(['symbol'], drop=False)
-
-    ths_zt_pool_df = pd.merge(ths_zt_pool_df, company_df_zt, how='outer',
-                              left_index=True, right_index=True)
-
-    ths_zt_pool_df = pd.merge(ths_zt_pool_df, real_time_quotes_all_stocks_zt, how='outer',
-                              left_index=True, right_index=True)
-    ths_zt_pool_df['amount_level'] = round(ths_zt_pool_df['amount'] / common_service_fun_api.HUNDRED_MILLION, 2)
-    ths_zt_pool_df = common_service_fun_api.classify_symbol(ths_zt_pool_df)
-    ths_zt_pool_df = common_service_fun_api.total_mv_classification(ths_zt_pool_df)
-    ths_zt_pool_df.fillna('', inplace=True)
-    if 'zt_flag' in ths_zt_pool_df.columns:
-        del ths_zt_pool_df['zt_flag']
-    if 'zt_tag' in ths_zt_pool_df.columns:
-        del ths_zt_pool_df['zt_tag']
+        ths_zt_pool_df = merge_his_day_zt_info(ths_zt_pool_df_copy, str_day)
 
     return ths_zt_pool_df
 
@@ -142,40 +101,33 @@ def merge_his_day_zt_info(ths_zt_pool_df, str_day):
 def get_bfq_daily_line(ths_zt_pool_df, str_day):
     query_k_line = {'symbol': {"$in": list(ths_zt_pool_df['symbol'])}, 'date': date_handle_util.no_slash_date(str_day)}
     bfq_daily_line_df = mongodb_util.find_query_data('stock_bfq_daily', query_k_line)
-    if data_frame_util.is_not_empty(bfq_daily_line_df):
+    if bfq_daily_line_df.shape[0] < ths_zt_pool_df.shape[0]:
         bfq_daily_line_df = bfq_daily_line_df[['amount', 'chg', 'close', 'exchange',
                                                'symbol', 'amount_level',
                                                'flow_mv', 'flow_mv_sp'
                                                ]]
         bfq_daily_line_df = bfq_daily_line_df.rename(columns={"close": 'now_price'})
         return bfq_daily_line_df
-
-    bfq_k_line_df = pd.DataFrame()
-    for zt_one in ths_zt_pool_df.itertuples():
-        try:
+    else:
+        bfq_k_line_df = pd.DataFrame()
+        for zt_one in ths_zt_pool_df.itertuples():
             symbol = zt_one.symbol
-            # 检查symbol是否以'6'开头
-            if symbol.startswith('6'):
-                symbol_a = '1.' + symbol
-            else:
-                symbol_a = '0.' + symbol
-            bfq_daily_line_df = k_line_api.stock_zh_a_hist(symbol_a,
-                                                           'daily',
-                                                           date_handle_util.no_slash_date(str_day),
-                                                           date_handle_util.no_slash_date(str_day),
-                                                           '')
-            if data_frame_util.is_empty(bfq_daily_line_df):
-                continue
-            bfq_daily_line_df = bfq_daily_line_df[['amount', 'chg', 'close', 'exchange',
-                                                   'symbol', 'amount_level',
-                                                   'flow_mv', 'flow_mv_sp'
-                                                   ]]
-            bfq_daily_line_df = bfq_daily_line_df.rename(columns={"close": 'now_price'})
-            bfq_k_line_df = pd.concat([bfq_k_line_df, bfq_daily_line_df])
-        except BaseException as e:
-            logger.warning("同步不复权k线异常:{},{}", symbol, e)
-
-    return bfq_k_line_df
+            try:
+
+                bfq_daily_line_df = k_line_common_api.get_k_line_common_adapter(symbol, 'daily', '', str_day)
+
+                if data_frame_util.is_empty(bfq_daily_line_df):
+                    continue
+                bfq_daily_line_df = bfq_daily_line_df[['amount', 'chg', 'close', 'exchange',
+                                                       'symbol', 'amount_level',
+                                                       'flow_mv', 'flow_mv_sp'
+                                                       ]]
+                bfq_daily_line_df = bfq_daily_line_df.rename(columns={"close": 'now_price'})
+                bfq_k_line_df = pd.concat([bfq_k_line_df, bfq_daily_line_df])
+            except BaseException as e:
+                logger.warning("同步不复权k线异常:{},{}", symbol, e)
+        bfq_k_line_df = bfq_k_line_df.loc[bfq_k_line_df['date'] == date_handle_util.no_slash_date(str_day)]
+        return bfq_k_line_df
 
 
 def save_ths_zt_pool(ths_zt_pool_df, str_day):
@@ -236,5 +188,6 @@ if __name__ == '__main__':
     # zt_df = ths_zt_pool(trade_date, None)
     # save_ths_zt_pool(zt_df, trade_date)
     trade_date = '2025-04-18'
-    ths_zt_pool_df = ths_zt_pool(trade_date, None)
-    save_ths_zt_pool(ths_zt_pool_df, trade_date)
+    ths_zt_pool_df_test = ths_zt_pool(trade_date, None)
+    get_bfq_daily_line(ths_zt_pool_df_test, trade_date)
+    save_ths_zt_pool(ths_zt_pool_df_test, trade_date)

{mns-scheduler-1.3.2.4 → mns-scheduler-1.3.2.6}/mns_scheduler/zz_task/data_sync_task.py

@@ -96,7 +96,7 @@ def stock_sync_qfq_weekly():
     str_now_date = now_date.strftime('%Y-%m-%d')
     if date_handle_util.last_day_of_week(now_date):
         logger.info('同步每周行情数据(前复权):' + str_now_date)
-        daily_week_month_line_sync_api.sync_all_daily_data('weekly', 'qfq', 'stock_qfq_weekly', None)
+        daily_week_month_line_sync_api.sync_all_daily_data('weekly', 'qfq', 'stock_qfq_weekly', str_now_date)
 
 
 # # 定时同步每周交易行情数据(前复权)
@@ -106,7 +106,7 @@ def stock_sync_qfq_monthly():
     if date_handle_util.last_day_month(now_date):
         logger.info('同步每周行情数据(前复权):' + str_now_date)
         daily_week_month_line_sync_api.sync_all_daily_data('monthly', 'qfq', 'stock_qfq_monthly',
-                                                           None)
+                                                           str_now_date)
 
 
 #  当天实时数据备份
@@ -138,7 +138,7 @@ def stock_daily_sync_qfq():
     str_now_date = now_date.strftime('%Y-%m-%d')
     logger.info('同步每日行情数据(前复权):' + str_now_date)
     daily_week_month_line_sync_api.sync_all_daily_data('daily',
-                                                       'qfq', 'stock_qfq_daily', None)
+                                                       'qfq', 'stock_qfq_daily', str_now_date)
 
 
 # 同步当日k c x 高涨幅数据

{mns-scheduler-1.3.2.4 → mns-scheduler-1.3.2.6}/mns_scheduler.egg-info/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: mns-scheduler
-Version: 1.3.2.4
+Version: 1.3.2.6

{mns-scheduler-1.3.2.4 → mns-scheduler-1.3.2.6}/mns_scheduler.egg-info/SOURCES.txt

@@ -84,6 +84,8 @@ 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/common/__init__.py
+mns_scheduler/k_line/common/k_line_common_api.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/month_week_daily/__init__.py
@@ -137,10 +139,6 @@ mns_scheduler/trade/task/__init__.py
 mns_scheduler/trade/task/trader_task_service.py
 mns_scheduler/trade/tfp/__init__.py
 mns_scheduler/trade/tfp/stock_tfp_info_sync.py
-mns_scheduler/us/__init__.py
-mns_scheduler/us/baidu_yun_pan_handle_service.py
-mns_scheduler/us/k_line.py
-mns_scheduler/us/us_company_info_sync_service_api.py
 mns_scheduler/zb/__init__.py
 mns_scheduler/zb/stock_zb_pool_sync.py
 mns_scheduler/zt/__init__.py

{mns-scheduler-1.3.2.4 → mns-scheduler-1.3.2.6}/setup.py

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

mns-scheduler-1.3.2.4/mns_scheduler/us/baidu_yun_pan_handle_service.py

@@ -1,91 +0,0 @@
-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)
-from bypy import ByPy
-from mns_common.db.MongodbUtil import MongodbUtil
-import tempfile
-from loguru import logger
-import akshare as ak
-
-mongodb_util = MongodbUtil('27017')
-
-import subprocess
-
-
-def get_file_list(path):
-    """
-    获取百度网盘指定路径下的文件列表
-    :param path: 百度网盘中的路径，例如 '/我的资源'
-    :return: 文件列表
-    """
-    try:
-        # 调用 bypy list 命令
-        result = subprocess.run(['bypy', 'list', path], capture_output=True, text=True, check=True, encoding='utf-8')
-
-        # 输出结果
-        if result.returncode == 0:
-            file_list = result.stdout.splitlines()  # 按行分割结果
-            return file_list
-        else:
-            logger.error("获取文件路径异常:{}", result.stderr)
-            return []
-    except subprocess.CalledProcessError as e:
-        logger.error("获取文件路径异常:{}", e)
-        return []
-
-
-def upload_to_baidu(file_name, folder_name, data_df):
-    bp = ByPy()
-    file_name = file_name + '.csv'
-    with tempfile.NamedTemporaryFile(mode='w', suffix='.csv', delete=False) as temp_file:
-        data_df.to_csv(temp_file, index=False)
-        temp_file_path = temp_file.name  # 获取临时文件的路径
-
-    # 上传临时文件到百度云
-    remote_path = f'/{folder_name}/{file_name}'
-    result = bp.upload(temp_file_path, remote_path)
-    if result == 0:
-        logger.info("上传成功:{}", file_name)
-    else:
-        logger.error("上传失败:{}", file_name)
-    return result
-
-
-def mkdir_baidu_new_folder(remote_path):
-    bp = ByPy()
-    try:
-        # 调用 mkdir 方法创建文件夹
-        result = bp.mkdir(remote_path)
-
-        if result == 0:
-            logger.info("成功创建文件夹:{}", remote_path)
-        else:
-            logger.error("创建文件夹失败:{}", result)
-
-    except Exception as e:
-        logger.error("创建文件夹失败:{}", e)
-
-
-def del_baidu_old_folder(remote_path):
-    bp = ByPy()
-    try:
-        # 调用 mkdir 方法创建文件夹
-        result = bp.delete(remote_path)
-
-        if result == 0:
-            logger.info("成功删除文件夹:{}", remote_path)
-        else:
-            logger.error("删除文件夹失败:{}", result)
-
-    except Exception as e:
-        logger.error("删除文件夹失败:{}", e)
-
-
-if __name__ == '__main__':
-    folder_name1 = '/美股/不复权日线'
-    mkdir_baidu_new_folder(folder_name1)
-    list_df = get_file_list('/bypy/美股')