mns-common 1.3.9.9__py3-none-any.whl → 1.6.1.4__py3-none-any.whl

mns_common/api/ths/zt/ths_stock_zt_pool_v2_api.py

@@ -140,7 +140,8 @@ def convert_statistics(stat):
 # 获取实时行情涨停列表
 def get_real_time_zt_info():
     real_time_df = em_real_time_quotes_api.get_real_time_quotes_now(None, None)
-    real_time_df_zt = real_time_df.loc[real_time_df['chg'] > common_service_fun_api.ZT_CHG]
+    real_time_df_zt = real_time_df.loc[
+        (real_time_df['chg'] > common_service_fun_api.ZT_CHG) | (real_time_df['wei_bi'] == 100)]
     if data_frame_util.is_empty(real_time_df_zt):
         return pd.DataFrame()
     real_time_df_zt = real_time_df_zt[[
@@ -197,24 +198,83 @@ def get_now_zt_pool_with_reason(str_day):
     real_time_zt_df = get_real_time_zt_info()
     # 昨日涨停列表
     last_trade_zt = zt_common_service_api.get_last_trade_day_zt(str_day)
-    # 东方财富涨停列表
-    em_now_zt_pool = stock_zt_pool_api.stock_em_zt_pool_df(date_handle_util.no_slash_date(str_day))
+
+    try:
+        # 东方财富涨停列表
+        em_now_zt_pool = stock_zt_pool_api.stock_em_zt_pool_df(date_handle_util.no_slash_date(str_day))
+    except BaseException as e:
+        em_now_zt_pool = pd.DataFrame()
+        logger.error("获取东方财富涨停列表异常:{}", e)
+
     if data_frame_util.is_not_empty(em_now_zt_pool):
         real_time_zt_df_wei_bi_100 = real_time_zt_df.loc[real_time_zt_df['symbol'].isin(em_now_zt_pool['symbol'])]
         real_time_zt_df_high_chg = real_time_zt_df.loc[~(real_time_zt_df['symbol'].isin(em_now_zt_pool['symbol']))]
+
+        em_now_zt_pool = em_now_zt_pool[['symbol',
+                                         'connected_boards_numbers',
+                                         'statistics',
+                                         'closure_funds',
+                                         'first_closure_time',
+                                         'last_closure_time',
+                                         'frying_plates_numbers']]
+
+        em_now_zt_pool = em_now_zt_pool.set_index(['symbol'], drop=True)
+        real_time_zt_df_wei_bi_100 = real_time_zt_df_wei_bi_100.set_index(['symbol'], drop=False)
+        real_time_zt_df_wei_bi_100 = pd.merge(real_time_zt_df_wei_bi_100, em_now_zt_pool, how='outer',
+                                              left_index=True, right_index=True)
+
+        now_continue_zt = last_trade_zt.loc[
+            last_trade_zt['symbol'].isin(list(real_time_zt_df_wei_bi_100['symbol']))]
+
     else:
-        real_time_zt_df_high_chg = real_time_zt_df
+        real_time_zt_df_wei_bi_100 = real_time_zt_df.loc[real_time_zt_df['wei_bi'] == 100]
+
+        real_time_zt_df_wei_bi_100['connected_boards_numbers'] = 1
+        real_time_zt_df_wei_bi_100['statistics'] = '1/1'
+        real_time_zt_df_wei_bi_100['closure_funds'] = real_time_zt_df_wei_bi_100['now_price'] * \
+                                                      real_time_zt_df_wei_bi_100['buy_1_num'] * 100
+        real_time_zt_df_wei_bi_100['first_closure_time'] = '153000'
+        real_time_zt_df_wei_bi_100['last_closure_time'] = '153000'
+        real_time_zt_df_wei_bi_100['frying_plates_numbers'] = 0
+        now_continue_zt = last_trade_zt.loc[
+            last_trade_zt['symbol'].isin(list(real_time_zt_df_wei_bi_100['symbol']))]
+
+        if data_frame_util.is_not_empty(now_continue_zt):
+            now_continue_zt = now_continue_zt[['symbol', 'connected_boards_numbers', 'statistics']]
+
+            connected_boards_map = now_continue_zt.set_index('symbol')['connected_boards_numbers'].to_dict()
+
+            # 将映射的值加到原DataFrame上
+            real_time_zt_df_wei_bi_100['connected_boards_numbers'] = real_time_zt_df_wei_bi_100[
+                                                                         'connected_boards_numbers'] + \
+                                                                     real_time_zt_df_wei_bi_100['symbol'].map(
+                                                                         connected_boards_map).fillna(0)
+
+            real_time_zt_df_wei_bi_100 = real_time_zt_df_wei_bi_100.sort_values(by=['connected_boards_numbers'],
+                                                                                ascending=False)
+
+        real_time_zt_df_high_chg = real_time_zt_df.loc[real_time_zt_df['wei_bi'] != 100]
+
+        # todo
+    # 高涨幅处理
+    now_zt_pool_df = handle_high_chg(real_time_zt_df_high_chg, last_trade_zt, real_time_zt_df_wei_bi_100)
+
+    now_zt_pool_df = merge_zt_reason(now_zt_pool_df, str_day, last_trade_zt, now_continue_zt)
+
+    result_first = now_zt_pool_df.loc[now_zt_pool_df['connected_boards_numbers'] == 1]
+    result_connected_boards = now_zt_pool_df.loc[now_zt_pool_df['connected_boards_numbers'] > 1]
+    result_connected_boards = result_connected_boards.sort_values(by=['connected_boards_numbers'], ascending=False)
+    result_first = result_first.sort_values(by=['first_closure_time'], ascending=True)
+
+    now_zt_pool_df = pd.concat([result_connected_boards,
+                                result_first])
+    now_zt_pool_df = now_zt_pool_df.fillna('未知数据')
+    now_zt_pool_df.drop_duplicates('symbol', keep='last', inplace=True)
 
-    em_now_zt_pool = em_now_zt_pool[
-        ['symbol', 'connected_boards_numbers',
-         'statistics', 'closure_funds', 'first_closure_time',
-         'last_closure_time', 'frying_plates_numbers']]
+    return now_zt_pool_df
 
-    em_now_zt_pool = em_now_zt_pool.set_index(['symbol'], drop=True)
-    real_time_zt_df_wei_bi_100 = real_time_zt_df_wei_bi_100.set_index(['symbol'], drop=False)
-    real_time_zt_df_wei_bi_100 = pd.merge(real_time_zt_df_wei_bi_100, em_now_zt_pool, how='outer',
-                                          left_index=True, right_index=True)
 
+def handle_high_chg(real_time_zt_df_high_chg, last_trade_zt, real_time_zt_df_wei_bi_100):
     # 初始化数据
     real_time_zt_df_high_chg['closure_funds'] = 0
     real_time_zt_df_high_chg['first_closure_time'] = '153000'
@@ -228,6 +288,7 @@ def get_now_zt_pool_with_reason(str_day):
 
     last_trade_zt_copy_today_high_chg = last_trade_zt.loc[
         last_trade_zt['symbol'].isin(real_time_zt_df_high_chg_last_trade_zt['symbol'])]
+
     last_trade_zt_copy_today_high_chg = last_trade_zt_copy_today_high_chg[
         ['symbol', 'connected_boards_numbers', 'statistics']]
     last_trade_zt_copy_today_high_chg['connected_boards_numbers'] = last_trade_zt_copy_today_high_chg[
@@ -247,21 +308,10 @@ def get_now_zt_pool_with_reason(str_day):
                                 real_time_zt_df_high_chg_last_trade_zt,
                                 real_time_zt_df_high_chg_last_trade_no_zt])
 
-    now_zt_pool_df = merge_zt_reason(now_zt_pool_df, str_day, last_trade_zt)
-
-    result_first = now_zt_pool_df.loc[now_zt_pool_df['connected_boards_numbers'] == 1]
-    result_connected_boards = now_zt_pool_df.loc[now_zt_pool_df['connected_boards_numbers'] > 1]
-    result_connected_boards = result_connected_boards.sort_values(by=['connected_boards_numbers'], ascending=False)
-    result_first = result_first.sort_values(by=['first_closure_time'], ascending=True)
-
-    now_zt_pool_df = pd.concat([result_connected_boards,
-                                result_first])
-    now_zt_pool_df = now_zt_pool_df.fillna('未知数据')
-    now_zt_pool_df.drop_duplicates('symbol', keep='last', inplace=True)
     return now_zt_pool_df
 
 
-def merge_zt_reason(now_zt_pool_df, str_day, last_trade_zt):
+def merge_zt_reason(now_zt_pool_df, str_day, last_trade_zt, now_continue_zt):
     try:
         zt_reason_df = get_ths_stock_zt_reason_with_cache(str_day)
     except BaseException as e:
@@ -269,9 +319,17 @@ def merge_zt_reason(now_zt_pool_df, str_day, last_trade_zt):
         logger.error("获取涨停原因异常:{}", e)
 
     last_trade_zt_copy = last_trade_zt.copy()
+
     if "zt_reason" not in last_trade_zt.columns:
         last_trade_zt_copy['zt_reason'] = '暂无'
-    last_trade_zt_copy = last_trade_zt_copy[['symbol', 'zt_reason']]
+
+    if 'main_line' not in last_trade_zt.columns:
+        last_trade_zt['main_line'] = ''
+
+    if 'sub_main_line' not in last_trade_zt.columns:
+        last_trade_zt['sub_main_line'] = ''
+
+    last_trade_zt_copy = last_trade_zt_copy[['symbol', 'zt_reason', 'sub_main_line', 'main_line']]
 
     if data_frame_util.is_empty(zt_reason_df):
         now_zt_pool_df['zt_reason'] = '暂无'
@@ -289,6 +347,21 @@ def merge_zt_reason(now_zt_pool_df, str_day, last_trade_zt):
     zt_reason_df_copy = zt_reason_df_copy.set_index(['symbol'], drop=True)
     now_zt_pool_df = now_zt_pool_df.set_index(['symbol'], drop=False)
 
+    if data_frame_util.is_not_empty(now_continue_zt):
+        now_continue_zt = now_continue_zt[['symbol', 'main_line', 'sub_main_line']]
+
+        # 创建一个 symbol 到 main_line 的映射
+        main_line_mapping = now_continue_zt.set_index('symbol')['main_line'].to_dict()
+
+        # 使用 map 更新 main_line 列
+        now_zt_pool_df['main_line'] = now_zt_pool_df['symbol'].map(main_line_mapping).fillna("")
+
+        # 创建一个 symbol 到 main_line 的映射
+        sub_main_line_mapping = now_continue_zt.set_index('symbol')['sub_main_line'].to_dict()
+
+        # 使用 map 更新 sub_main_line 列
+        now_zt_pool_df['sub_main_line'] = now_zt_pool_df['symbol'].map(sub_main_line_mapping).fillna("")
+
     result_zt_df = pd.merge(now_zt_pool_df, zt_reason_df_copy, how='outer',
                             left_index=True, right_index=True)
 
@@ -299,8 +372,12 @@ def merge_zt_reason(now_zt_pool_df, str_day, last_trade_zt):
     last_trade_zt_copy = last_trade_zt_copy.set_index(['symbol'], drop=True)
     del zt_reason_na['zt_reason']
     zt_reason_na = zt_reason_na.set_index(['symbol'], drop=False)
+    del last_trade_zt_copy['main_line']
+    del last_trade_zt_copy['sub_main_line']
+
     zt_reason_na = pd.merge(zt_reason_na, last_trade_zt_copy, how='outer',
                             left_index=True, right_index=True)
+
     zt_reason_na['zt_reason'] = zt_reason_na['zt_reason'].fillna('0')
     # 删除昨日涨停 今日未涨停的
     zt_reason_na.dropna(subset=['symbol'], inplace=True)
@@ -363,12 +440,11 @@ def zt_reason_group(zt_pool_df):
 
 
 if __name__ == '__main__':
-    str_day_test = '2024-10-09'
-
+    str_day_test = '2025-10-28'
+    # 同花顺涨停
+    ths_zt_pool_df = get_now_zt_pool_with_reason(str_day_test)
     # 东财涨停池
     em_now_zt_pool_test = stock_zt_pool_api.stock_em_zt_pool_df(date_handle_util.no_slash_date(str_day_test))
-    # 同花顺涨停
-    ths_zt_pool_df = get_zt_reason(str_day_test)
 
     miss_zt_df = em_now_zt_pool_test.loc[~(em_now_zt_pool_test['symbol'].isin(ths_zt_pool_df['symbol']))]
     pass

mns_common/api/ths/zt/ths_stock_zt_reason_web_api.py

@@ -0,0 +1,100 @@
+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)
+
+import requests
+from bs4 import BeautifulSoup
+from loguru import logger
+import mns_common.component.cookie.cookie_info_service as cookie_info_service
+
+
+# 获取公司热点
+def get_ths_web_zt_reason_info(symbol, ths_cookie):
+    try:
+
+        url = "https://basic.10jqka.com.cn/new/" + symbol + "/"
+
+        headers = {
+            "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7",
+            "Accept-Language": "zh-CN,zh;q=0.9",
+            "Cache-Control": "max-age=0",
+            "Connection": "keep-alive",
+            "Sec-Fetch-Dest": "document",
+            "Sec-Fetch-Mode": "navigate",
+            "Sec-Fetch-Site": "cross-site",
+            "Sec-Fetch-User": "?1",
+            "Upgrade-Insecure-Requests": "1",
+            "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/129.0.0.0 Safari/537.36",
+            "sec-ch-ua": "\"Google Chrome\";v=\"129\", \"Not=A?Brand\";v=\"8\", \"Chromium\";v=\"129\"",
+            "sec-ch-ua-mobile": "?0",
+            "sec-ch-ua-platform": "\"Windows\"",
+            "cookie": ths_cookie
+        }
+        cookies = {
+            "searchGuide": "sg",
+            "skin_color": "white",
+            "Hm_lvt_722143063e4892925903024537075d0d": "1725031809,1725842892,1726621825,1727227162",
+            "Hm_lvt_929f8b362150b1f77b477230541dbbc2": "1725031809,1725842892,1726621825,1727227162",
+            "spversion": "20130314",
+            "user": "MDq%2BsNDQcE06Ok5vbmU6NTAwOjYxMzk4NTQ0ODo1LDEsMjA7NiwxLDIwOzcsMTExMTExMTExMTEwLDIwOzgsMTExMTAxMTEwMDAwMTExMTEwMDEwMDEwMDEwMDAwMDAsMjA7MzMsMDAwMTAwMDAwMDAwLDIwOzM2LDEwMDExMTExMDAwMDExMDAxMDExMTExMSwyMDs0NiwwMDAwMTExMTEwMDAwMDExMTExMTExMTEsMjA7NTEsMTEwMDAwMDAwMDAwMDAwMCwyMDs1OCwwMDAwMDAwMDAwMDAwMDAwMSwyMDs3OCwxLDIwOzg3LDAwMDAwMDAwMDAwMDAwMDAwMDAxMDAwMCwyMDsxMTksMDAwMDAwMDAwMDAwMDAwMDAwMTAxMDAwMDAsMjA7MTI1LDExLDIwOzQ0LDExLDQwOzEsMTAxLDQwOzIsMSw0MDszLDEsNDA7MTAyLDEsNDA6Mjc6Ojo2MDM5ODU0NDg6MTcyODQ4NzEyNjo6OjE2MzQ1NjY5ODA6NjA0ODAwOjA6MTRhZjIxYmRiNTgzODUxOTgxZWVjZGQ4NjQxZjA2NDg5OmRlZmF1bHRfNDox",
+            "userid": "603985448",
+            "u_name": "%BE%B0%D0%D0pM",
+            "escapename": "%25u666f%25u884cpM",
+            "ticket": "955f0ee44d86aede75787f64ae45bae9",
+            "user_status": "0",
+            "utk": "2df15e757efe7d4a489cf764fa371ff9",
+            "Hm_lvt_78c58f01938e4d85eaf619eae71b4ed1": "1728463065,1728526291,1728541890,1728550124",
+            "historystock": "301551%7C*%7C002205%7C*%7C000627%7C*%7C300746%7C*%7C300139",
+            "reviewJump": "nojump",
+            "usersurvey": "1",
+            "v": "A8mumxxpynGwb7YF90Bxvvav2P4mFrxUJwzh32s-RzXtX-dgs2bNGLda8aj4"
+        }
+        response = requests.get(url, headers=headers, cookies=cookies)
+        soup = BeautifulSoup(response.content, "html.parser")
+        for a in soup.find_all("a", class_="check_details f12"):
+            if "涨停分析" in a.get_text():
+                # 找到其后的兄弟节点中 class 为 check_else 的 div，包含详细内容
+                parent = a.find_parent("span", class_="performance_trailer")
+                if parent:
+                    detail_div = parent.find("div", class_="check_else")
+                    if detail_div:
+                        # 提取div内的完整原始HTML字符串
+                        raw_html = detail_div.decode_contents()
+                        # 按<br/>切割，精准拆分 涨停原因 + 涨停分析
+                        if '<br/>' in raw_html:
+                            zt_reason, zt_analysis = raw_html.split('<br/>', 1)  # 只切割1次，核心！
+                            # 清洗文本：去除首尾空格/换行，纯文本提取
+                            zt_reason = zt_reason.strip()
+                            zt_analysis = zt_analysis.strip()
+                        else:
+                            # 容错：没有br标签的情况，全部给分析
+                            zt_reason = ""
+                            zt_analysis = detail_div.get_text(strip=True)
+            else:
+                result_dict = {
+                    'zt_reason': '',
+                    'zt_analysis': '',
+                }
+                logger.error("无涨停原因和分析:{}", symbol)
+                return result_dict
+
+        result_dict = {
+            'zt_reason': zt_reason,
+            'zt_analysis': zt_analysis,
+        }
+        return result_dict
+    except BaseException as e:
+        logger.error("获取公司涨停信息异常:{},{}", symbol, e)
+        result_dict = {
+            'zt_reason': '',
+            'zt_analysis': '',
+        }
+        return result_dict
+
+
+if __name__ == '__main__':
+    get_ths_web_zt_reason_info('920021', cookie_info_service.get_ths_cookie())

mns_common/api/us/ths_us_company_info_api.py

@@ -5,5 +5,136 @@ file_path = os.path.abspath(__file__)
 end = file_path.index('mns') + 16
 project_path = file_path[0:end]
 sys.path.append(project_path)
+import requests
+from bs4 import BeautifulSoup
+
 
 # 同花顺 美股地址:https://basic.10jqka.com.cn/168/PINS/company.html
+
+# 获取美股公司信息 https://stockpage.10jqka.com.cn/LMT/company/
+def get_us_ths_company_info(stock_code):
+    """
+    根据股票代码，获取同花顺公司基本信息
+    :param stock_code: 股票代码，例如 LMT / AAPL 字符串格式，核心传参参数
+    :return: dict 结构化的公司基本信息，失败返回空字典
+    """
+    # 1. 基础配置：参数化拼接URL + 请求头（必须加，否则会被反爬拦截）
+    base_url = f"https://stockpage.10jqka.com.cn/{stock_code}/company/"
+    headers = {
+        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36",
+        "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8"
+    }
+    company_data = {}  # 存储最终的公司信息
+
+    try:
+        # 2. 发起GET请求获取网页源码
+        response = requests.get(url=base_url, headers=headers, timeout=10)
+        response.raise_for_status()  # 抛出请求异常（404/500等）
+        response.encoding = "utf-8"  # 指定编码，防止中文乱码
+
+        # 3. 解析HTML网页结构
+        soup = BeautifulSoup(response.text, "html.parser")
+        # 精准定位目标表格（唯一核心表格）
+        table = soup.find("table", class_="companyinfo-tab")
+        if not table:
+            print(f"错误：未找到 {stock_code} 的公司信息表格")
+            return company_data
+
+        # 4. 提取所有表格内的文本内容+清洗数据
+        all_tds = table.find_all("td")
+        for td in all_tds:
+            td_text = td.get_text(strip=True)  # 自动去除首尾空格/换行
+            if not td_text:
+                continue
+            # 按【字段名：字段值】的格式拆分数据，封装到字典
+            if "：" in td_text:
+                key, value = td_text.split("：", 1)  # 只分割第一个冒号
+                company_data[key] = value
+
+        # 单独提取：公司LOGO图片地址（补充信息，可选）
+        logo_img = table.find("img")
+        if logo_img:
+            company_data["公司LOGO"] = logo_img.get("src", "")
+            company_data["LOGO备注"] = logo_img.get("alt", "")
+
+        # 特殊清洗：公司简介 去除多余空格/换行符，格式化展示
+        if "公司简介" in company_data:
+            company_data["公司简介"] = company_data["公司简介"].replace("\r", "").replace("\n", "").strip()
+
+    except requests.exceptions.RequestException as e:
+        print(f"请求失败：{e}")
+    except Exception as e:
+        print(f"解析数据异常：{e}")
+
+    return company_data
+
+
+def get_us_ths_company_info_v2(stock_code,market_code):
+    """
+    根据股票代码，获取同花顺公司基本信息
+    :param stock_code: 股票代码，例如 LMT / AAPL 字符串格式，核心传参参数
+    :return: dict 结构化的公司基本信息，失败返回空字典
+    """
+    # 1. 基础配置：参数化拼接URL + 请求头（必须加，否则会被反爬拦截）
+    base_url = f"https://stockpage.10jqka.com.cn/{stock_code}/company/"
+    base_url = f"https://basic.10jqka.com.cn/{market_code}/{stock_code}/company.html"
+    headers = {
+        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36",
+        "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8"
+    }
+    company_data = {}  # 存储最终的公司信息
+
+    try:
+        # 2. 发起GET请求获取网页源码
+        response = requests.get(url=base_url, headers=headers, timeout=10)
+        response.raise_for_status()  # 抛出请求异常（404/500等）
+        response.encoding = "utf-8"  # 指定编码，防止中文乱码
+
+        # 3. 解析HTML网页结构
+        soup = BeautifulSoup(response.text, "html.parser")
+        # 精准定位目标表格（唯一核心表格）
+        table = soup.find("table", class_="companyinfo-tab")
+        if not table:
+            print(f"错误：未找到 {stock_code} 的公司信息表格")
+            return company_data
+
+        # 4. 提取所有表格内的文本内容+清洗数据
+        all_tds = table.find_all("td")
+        for td in all_tds:
+            td_text = td.get_text(strip=True)  # 自动去除首尾空格/换行
+            if not td_text:
+                continue
+            # 按【字段名：字段值】的格式拆分数据，封装到字典
+            if "：" in td_text:
+                key, value = td_text.split("：", 1)  # 只分割第一个冒号
+                company_data[key] = value
+
+        # 单独提取：公司LOGO图片地址（补充信息，可选）
+        logo_img = table.find("img")
+        if logo_img:
+            company_data["公司LOGO"] = logo_img.get("src", "")
+            company_data["LOGO备注"] = logo_img.get("alt", "")
+
+        # 特殊清洗：公司简介 去除多余空格/换行符，格式化展示
+        if "公司简介" in company_data:
+            company_data["公司简介"] = company_data["公司简介"].replace("\r", "").replace("\n", "").strip()
+
+    except requests.exceptions.RequestException as e:
+        print(f"请求失败：{e}")
+    except Exception as e:
+        print(f"解析数据异常：{e}")
+
+    return company_data
+
+
+# ------------------- 核心调用：参数传参 测试 -------------------
+if __name__ == "__main__":
+    # 股票代码 作为参数传入函数，满足你的核心要求 ✅
+    stock_code_param = "GEV"  # 这里可替换任意股票代码，例如：AAPL、MSFT
+    result1=get_us_ths_company_info_v2('META','168')
+    result = get_us_ths_company_info(stock_code_param)
+
+    # 格式化打印结果
+    print(f"===== {stock_code_param} 公司基本信息 =====")
+    for k, v in result.items():
+        print(f"{k}: {v}")

mns_common/api/xueqiu/xue_qiu_k_line_api.py

@@ -54,9 +54,20 @@ def get_xue_qiu_k_line(symbol, period, cookie, end_time, hq):
             data=response_data['data']['item'],
             columns=response_data['data']['column']
         )
-        # 处理DataFrame列（秒级时间戳）
-        df['str_day'] = pd.to_datetime(df['timestamp'], unit='ms').dt.normalize()
-        df["str_day"] = df["str_day"].dt.strftime("%Y-%m-%d")
+
+        # 1. 转换为 datetime（自动处理毫秒级时间戳）
+        df["beijing_time"] = pd.to_datetime(df["timestamp"], unit="ms")
+
+        # 2. 设置 UTC 时区
+        df["beijing_time"] = df["beijing_time"].dt.tz_localize("UTC")
+
+        # 3. 转换为北京时间（UTC+8）
+        df["beijing_time"] = df["beijing_time"].dt.tz_convert("Asia/Shanghai")
+
+        # 4. 提取年月日（格式：YYYY-MM-DD）
+        df["str_day"] = df["beijing_time"].dt.strftime("%Y-%m-%d %H:%M:%S")
+        del df["beijing_time"]
+
         return df
     else:
         # 直接抛出带有明确信息的异常
@@ -65,8 +76,8 @@ def get_xue_qiu_k_line(symbol, period, cookie, end_time, hq):
 
 if __name__ == '__main__':
     number = 1
-    cookies = "cookiesu=581743780372237; device_id=e315f5f93cf4d1af01436bc234312ebb; s=ci1338vttl; xq_a_token=75116a2a5439edb58d3d99533cfbc4d72e0ee819; xqat=75116a2a5439edb58d3d99533cfbc4d72e0ee819; xq_r_token=521f1781edc2a09cffdf7d59b5b3fe37c1c1f577; xq_id_token=eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJ1aWQiOi0xLCJpc3MiOiJ1YyIsImV4cCI6MTc0OTk0OTc1MywiY3RtIjoxNzQ4MTU5ODU3NzYwLCJjaWQiOiJkOWQwbjRBWnVwIn0.HP0CrptQ8jJjU9eJ0LhdAA_PlErW_Sp4OA5SjCyIQhKN5nTlrlovKty3IKutb5Nn_8EgeLZqrTeLKTsNIIE1uRGEppgo-Suk6_IOV1X900M47R2aBV2TX-J3rSmfyP7mAXav8CVT1pwiRU8Xr_ag3XT8WxVNQY1aOiV5JEyKeJucwvRyoa0iB4sM9j2kxcRXCF3nK9JnofsvAg-I7ySf3hCly3csj-zWQQSWeUjpmMlMS2ddLjvAHQUNbBFMTZ2BVji0ae3mURUB2jz4A6O8pZGZHuh3qDdQfeLq0i80H2AnOEqsJ246THsS7RS20HidyWWbYm3gBlRptDr1lWgsGg; u=581743780372237; Hm_lvt_1db88642e346389874251b5a1eded6e3=1746435822,1747730708,1748159904; HMACCOUNT=2CB33FC8EC07B09A; Hm_lpvt_1db88642e346389874251b5a1eded6e3=1748159918; ssxmod_itna=QqjxRQKiTx2DgD4qbD0nYDCDpEDymxBP01kD+xQ5DODLxn+xGdqufh=z3O=DcllGdHwiYK9DDsZ4xiNDAg40iDC3md1aUr0TPz=GmnG5Gyz7AbR3Otq2Q8c51cYZO7eBpjlSgy4xAEYDQKDoxGkDiyKD0FY+Diibx0rD0eDPxDYDGbwDDyIoUxDj7gwTzOsk77eo8oDb6xhfjxDR=dDSQ8vs8Os=Y3DarY3kUxGDmKDIalKf7oDF=d3Pq0ke4i35xEnbq0OSFYG2movzUrceE0rde4FKYR1=QiqOlG4aWG4ecpxnTillebZnbVQGFzDsQRS4xDGSKHBKqxs3DqhYkCuke4CQ+YKYozoo52q5xd1E4kEmROwyY5M04aAQKD5h05NGDs0Dl0DoCs4D; ssxmod_itna2=QqjxRQKiTx2DgD4qbD0nYDCDpEDymxBP01kD+xQ5DODLxn+xGdqufh=z3O=DcllGdHwiYK4Dfi3Qe+0wxDFOihv=8B0DD/CcBOpAgn9LMTKhhSafFNwTqw64jzZ/oQMQq4dVL95j2MbxV+kj1R3inzDd47u0y0+dUbwdeLB2QA+QBj4unSq=lSq0A0LhD1xfxGMR6KPLu+bTxvmj30MbWLjxqYLcc9=ajBhTle/THgetZmeTqY7GQCa7qFTx4+IfcbdxfeFbUSI7m5ndqfBxLhOyjZidzB887ak=NR/NzFlhDkTQPSksf+WR0WNGuFSqxSFFCh5BR5iaq0bVFpxSTc3PnQ0U9RIKDN0bA02TQDezeHGhVG7Vz4QnrLi03kGg+vRU0w4p3Ti0n7Kn5CWoGUPz99Fip6GEYZi+eIdFnD75WCq0iu1AbK7AFQDNQadaG5aIDkA4Xy+7gUS5SWGEGiWGAxHg+RipnTa3B948MFWQkPG9ay8MYs4B8vYw+4ycXQQhpmHecNj9YHuooqedamM7lW4QXaFnLdSTgBlfWG2SlAwvkmjTqwKuI4LR3cys+lX/uUiw4h8mfnKhZEcaXkTA33sFo+aT2djFUm2Cr2b/ECeLiqeOCmKiYbPZUhHC9vFm48Dnz1y5azM2wBzcKc89hcKXSpR8f4MnL5RBA/KxANHjN6g4NrXv0qCK7EX0GbbDo0WOH+EC2dj4z7tYGDh5Rf3QDrYVr3YwMGWB+QCWG+Q7ofPuoOIXGBrfIeE4nhd3o4h3YKo+pD5Crd0CRYC7Kp20qMSrziDD"
+    cookies ='cookiesu=291756518429127; device_id=8c5eef4332e51dbcbcd92943b0dd91e4; s=bz17174k1c; xq_a_token=b9c7e702181cba3ed732d5019efe2dfe2fb054b0; xqat=b9c7e702181cba3ed732d5019efe2dfe2fb054b0; xq_r_token=c1edaf05e1c6fdf8122671eced8049e8df8a4290; xq_id_token=eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJ1aWQiOi0xLCJpc3MiOiJ1YyIsImV4cCI6MTc2MTYxNDEwNywiY3RtIjoxNzU5OTc2NzUxOTI3LCJjaWQiOiJkOWQwbjRBWnVwIn0.JwQMnAT6E1lPSqfK-GnFpLNQz-Jr-xtZ6HoUfnCfeRTNKrDJqf0l5_iY7dhEo6A5m38MmXj0hgR-xYkzPm35fFcQCQnZ06dOK0XCP6AE9r5KVFd73GyqbXLijKDFPQVM0sPgbgCs9fTOmB7Nlju_7B_raPmZ8IIHzZRU6uSK9oXsrnwpo4TD0Mr2nMF3ktVwEQHdkZsjm9mdSZaT9fkDvayFKKmg_O-JbHDZ6mTF1i-zR6oH-5r3g6HJJU9-_NwzZMeBEVnLG8IWwO8_n9CWdpbqQ-qC-iue4yEHFdiTLBCRRgyFauVv0kJS1ZNKvvefxkETTVr-WgXobT82ED7ApA; u=291756518429127; Hm_lvt_1db88642e346389874251b5a1eded6e3=1759765103,1759808830,1759970243,1759976801; HMACCOUNT=4C4F802C04F4D70A; Hm_lpvt_1db88642e346389874251b5a1eded6e3=1759978805'
     while True:
-        test_df = get_xue_qiu_k_line('SZ000004', 'day', cookies, '1748246492232', 'after')
+        test_df = get_xue_qiu_k_line('SZ300188', '1m', cookies, '1760065317680', '')
         print(number)
         number = number + 1

mns_common/component/common_service_fun_api.py

@@ -71,22 +71,36 @@ def classify_symbol_one(symbol):
 # 添加前缀
 def add_pre_prefix_one(symbol):
     symbol_simple = symbol[0:6]
+    if bool(1 - is_valid_symbol(symbol_simple)):
+        return symbol
+
     if symbol_simple.startswith('6'):
-        return 'SH' + symbol
+        return 'SH' + symbol_simple
     elif symbol_simple.startswith('0') or symbol_simple.startswith('3'):
-        return 'SZ' + symbol
+        return 'SZ' + symbol_simple
     else:
-        return 'BJ' + symbol
+        return 'BJ' + symbol_simple
+
+
+def is_valid_symbol(symbol):
+    # 确保输入是字符串（避免数字或其他类型）
+    if not isinstance(symbol, str):
+        return False
+    # 检查长度是否为6且所有字符都是数字
+    return len(symbol) == 6 and symbol.isdigit()
+
 
 # 添加后缀
 def add_after_prefix_one(symbol):
     symbol_simple = symbol[0:6]
+    if bool(1 - is_valid_symbol(symbol_simple)):
+        return symbol
     if symbol_simple.startswith('6'):
-        return symbol + '.SH'
+        return symbol_simple + '.SH'
     elif symbol_simple.startswith('0') or symbol_simple.startswith('3'):
-        return symbol + '.SZ'
+        return symbol_simple + '.SZ'
     else:
-        return symbol + '.BJ'
+        return symbol_simple + '.BJ'
 
 
 def symbol_amount_simple(real_time_quotes_now_df):
@@ -117,8 +131,7 @@ def exclude_st_symbol(real_time_quotes_now_df):
 # 排除带星的ST 容易退市
 def exclude_star_st_symbol(df):
     exclude_st_symbol_list = list(
-        df.loc[(df['name'].str.contains('\*'))
-               | (df['name'].str.contains('退'))]['symbol'])
+        df.loc[(df['name'].str.contains(r'\*')) | (df['name'].str.contains('退'))]['symbol'])
     return df.loc[
         ~(df['symbol'].isin(
             exclude_st_symbol_list))]
@@ -181,6 +194,8 @@ def group_by_industry_sum(real_time_quotes_now, field1, field2):
 
 
 def symbol_add_prefix(symbol):
+    if bool(1 - symbol.isdigit()):
+        return symbol
     symbol_simple = symbol[0:6]
     if symbol_simple.startswith('6'):
         return '1.' + symbol_simple
@@ -188,3 +203,8 @@ def symbol_add_prefix(symbol):
         return '0.' + symbol_simple
     else:
         return '0.' + symbol_simple
+
+
+# 排除改变代码的北交所
+def exclude_change_bjs_code(df):
+    return df[~df['symbol'].str.startswith(('8', '4'))]

mns_common/component/company/company_common_service_new_api.py

@@ -9,6 +9,8 @@ from functools import lru_cache
 from mns_common.db.MongodbUtil import MongodbUtil
 import mns_common.constant.db_name_constant as db_name_constant
 import pandas as pd
+pd.set_option('future.no_silent_downcasting', True)
+
 
 mongodb_util = MongodbUtil('27017')
 

mns_common/component/cookie/cookie_enum.py

@@ -0,0 +1,16 @@
+from enum import Enum
+
+'''
+价格枚举
+'''
+
+
+class CookieEnum(Enum):
+    THS_COOKIE = ('ths_cookie', '同花顺cookie')
+    EM_COOKIE = ('em_cookie', '东方财富cookie')
+    XUE_QIU_COOKIE = ('xue_qiu_cookie', '雪球cookie')
+    KPL_COOKIE = ('kpl_cookie', '开盘啦cookie')
+
+    def __init__(self, cookie_code, cookie_name):
+        self.cookie_code = cookie_code
+        self.cookie_name = cookie_name

mns_common/component/cookie/cookie_info_service.py

@@ -6,28 +6,38 @@ end = file_path.index('mns') + 16
 project_path = file_path[0:end]
 sys.path.append(project_path)
 from mns_common.db.MongodbUtil import MongodbUtil
+from mns_common.component.cookie.cookie_enum import CookieEnum
 
 mongodb_util = MongodbUtil('27017')
 
-from functools import lru_cache
 
-
-@lru_cache(maxsize=None)
+# ths cookie
 def get_ths_cookie():
-    stock_account_info = mongodb_util.find_query_data('stock_account_info', {"type": "ths_cookie", })
+    stock_account_info = mongodb_util.find_query_data('stock_account_info',
+                                                      {"type": CookieEnum.THS_COOKIE.cookie_code})
     ths_cookie = list(stock_account_info['cookie'])[0]
     return ths_cookie
 
 
-@lru_cache(maxsize=None)
+# 东财 cookie
 def get_em_cookie():
-    stock_account_info = mongodb_util.find_query_data('stock_account_info', {"type": "em_cookie", })
+    stock_account_info = mongodb_util.find_query_data('stock_account_info',
+                                                      {"type": CookieEnum.EM_COOKIE.cookie_code})
     em_cookie = list(stock_account_info['cookie'])[0]
     return em_cookie
 
 
-@lru_cache(maxsize=None)
+# 雪球 cookie
 def get_xue_qiu_cookie():
-    stock_account_info = mongodb_util.find_query_data('stock_account_info', {"type": "xue_qiu", })
+    stock_account_info = mongodb_util.find_query_data('stock_account_info',
+                                                      {"type": CookieEnum.XUE_QIU_COOKIE.cookie_code })
+    cookie = list(stock_account_info['cookie'])[0]
+    return cookie
+
+
+# 开盘啦 token
+def get_kpl_cookie():
+    stock_account_info = mongodb_util.find_query_data('stock_account_info',
+                                                      {"type": CookieEnum.KPL_COOKIE.cookie_code, })
     cookie = list(stock_account_info['cookie'])[0]
     return cookie

mns_common/component/data/data_init_api.py

@@ -60,16 +60,21 @@ def calculate_parameter_factor(real_time_quotes_now):
     real_time_quotes_now['large_inflow_multiple'] = round(
         (real_time_quotes_now['large_order_net_inflow'] / real_time_quotes_now['reference_main_inflow']), 2)
 
-    real_time_quotes_now.loc[:, 'real_disk_diff_amount_exchange'] = round(
-        (real_time_quotes_now['disk_diff_amount_exchange'] / real_time_quotes_now['mv_circulation_ratio']), 2)
+    if 'real_disk_diff_amount_exchange' not in real_time_quotes_now.columns:
+        real_time_quotes_now.loc[:, 'real_disk_diff_amount_exchange'] = round(
+            (real_time_quotes_now['disk_diff_amount_exchange'] / real_time_quotes_now['mv_circulation_ratio']), 2)
 
-    real_time_quotes_now.loc[:, 'real_main_inflow_multiple'] = round(
-        (real_time_quotes_now['main_inflow_multiple'] / real_time_quotes_now['mv_circulation_ratio']), 2)
+    if 'real_main_inflow_multiple' not in real_time_quotes_now.columns:
+        real_time_quotes_now.loc[:, 'real_main_inflow_multiple'] = round(
+            (real_time_quotes_now['main_inflow_multiple'] / real_time_quotes_now['mv_circulation_ratio']), 2)
 
-    real_time_quotes_now.loc[:, 'real_super_main_inflow_multiple'] = round(
-        (real_time_quotes_now['super_main_inflow_multiple'] / real_time_quotes_now['mv_circulation_ratio']), 2)
-    real_time_quotes_now.loc[:, 'real_exchange'] = round(
-        (real_time_quotes_now['exchange'] / real_time_quotes_now['mv_circulation_ratio']), 2)
+    if 'real_super_main_inflow_multiple' not in real_time_quotes_now.columns:
+        real_time_quotes_now.loc[:, 'real_super_main_inflow_multiple'] = round(
+            (real_time_quotes_now['super_main_inflow_multiple'] / real_time_quotes_now['mv_circulation_ratio']), 2)
+
+    if 'real_exchange' not in real_time_quotes_now.columns:
+        real_time_quotes_now.loc[:, 'real_exchange'] = round(
+            (real_time_quotes_now['exchange'] / real_time_quotes_now['mv_circulation_ratio']), 2)
 
     real_time_quotes_now.loc[:, 'max_real_main_inflow_multiple'] = real_time_quotes_now[
         ['real_main_inflow_multiple', 'real_super_main_inflow_multiple']].max(axis=1)