diff --git a/app.py b/app.py index 9514afdf..0561471e 100755 --- a/app.py +++ b/app.py @@ -10995,18 +10995,18 @@ def get_hot_events(): @app.route('/api/events/mainline', methods=['GET']) def get_events_by_mainline(): """ - 获取按主线（lv2概念）分组的事件列表 + 获取按主线（lv1/lv2/lv3概念）分组的事件列表 逻辑： 1. 根据筛选条件获取事件列表 2. 通过 related_concepts 表关联概念 - 3. 调用 concept-api/hierarchy 获取概念的 lv2 归属 - 4. 按 lv2 分组返回 + 3. 调用 concept-api/hierarchy 获取概念的层级归属 + 4. 按指定层级分组返回 参数： - recent_days: 近N天（默认7天） - importance: 重要性筛选（S,A,B,C 或 all） - - limit: 每个主线最多返回多少事件（默认20） + - group_by: 分组方式 (lv1/lv2/lv3/具体概念ID如L2_AI_INFRA)，默认lv2 返回： { @@ -11023,7 +11023,9 @@ def get_events_by_mainline(): ... ], "total_events": 100, - "ungrouped_count": 5 + "ungrouped_count": 5, + "group_by": "lv2", + "hierarchy_options": {...} // 层级选项供前端下拉框使用 } } """ @@ -11036,13 +11038,15 @@ def get_events_by_mainline(): # 获取请求参数 recent_days = request.args.get('recent_days', 7, type=int) importance = request.args.get('importance', 'all') + group_by = request.args.get('group_by', 'lv2') # lv1/lv2/lv3 或具体ID # 计算日期范围 since_date = datetime.now() - timedelta(days=recent_days) # ==================== 1. 获取概念层级映射 ==================== # 调用 concept-api 获取层级结构 - concept_hierarchy_map = {} # { concept_name: { lv1, lv2, lv1_id, lv2_id } } + concept_hierarchy_map = {} # { concept_name: { lv1, lv2, lv3, lv1_id, lv2_id, lv3_id } } + hierarchy_options = {'lv1': [], 'lv2': [], 'lv3': []} # 层级选项供前端下拉框使用 try: # 从本地文件读取概念层级结构 @@ -11053,19 +11057,48 @@ def get_events_by_mainline(): hierarchy_data = json.load(f) hierarchy_list = hierarchy_data.get('hierarchy', []) - # 构建概念名称 -> lv2 映射 + # 构建概念名称 -> 完整层级映射 + 层级选项 # 结构: L1 -> L2 -> L3 -> concepts (concepts 只在 L3 层) - # JSON 字段名: lv1, lv1_id, lv2, lv2_id (不是 name/id) for lv1 in hierarchy_list: lv1_name = lv1.get('lv1', '') lv1_id = lv1.get('lv1_id', '') + # 添加 lv1 选项 + if lv1_id and lv1_name: + hierarchy_options['lv1'].append({ + 'id': lv1_id, + 'name': lv1_name + }) + for lv2 in lv1.get('children', []) or []: lv2_name = lv2.get('lv2', '') lv2_id = lv2.get('lv2_id', '') + # 添加 lv2 选项 + if lv2_id and lv2_name: + hierarchy_options['lv2'].append({ + 'id': lv2_id, + 'name': lv2_name, + 'lv1_id': lv1_id, + 'lv1_name': lv1_name + }) + # L3 层包含 concepts for lv3 in lv2.get('children', []) or []: + lv3_name = lv3.get('lv3', '') + lv3_id = lv3.get('lv3_id', '') + + # 添加 lv3 选项 + if lv3_id and lv3_name: + hierarchy_options['lv3'].append({ + 'id': lv3_id, + 'name': lv3_name, + 'lv2_id': lv2_id, + 'lv2_name': lv2_name, + 'lv1_id': lv1_id, + 'lv1_name': lv1_name + }) + for concept in lv3.get('concepts', []) or []: concept_name = concept if isinstance(concept, str) else concept.get('name', '') if concept_name: @@ -11073,10 +11106,12 @@ def get_events_by_mainline(): 'lv1': lv1_name, 'lv1_id': lv1_id, 'lv2': lv2_name, - 'lv2_id': lv2_id + 'lv2_id': lv2_id, + 'lv3': lv3_name, + 'lv3_id': lv3_id } - app.logger.info(f'[mainline] 加载概念层级映射: {len(concept_hierarchy_map)} 个概念') + app.logger.info(f'[mainline] 加载概念层级映射: {len(concept_hierarchy_map)} 个概念, lv1: {len(hierarchy_options["lv1"])}, lv2: {len(hierarchy_options["lv2"])}, lv3: {len(hierarchy_options["lv3"])}') except Exception as e: app.logger.warning(f'[mainline] 获取概念层级失败: {e}') @@ -11175,15 +11210,32 @@ def get_events_by_mainline(): return None + # 判断分组方式 + is_specific_id = group_by.startswith('L1_') or group_by.startswith('L2_') or group_by.startswith('L3_') + for event in events: concepts = event_concepts_map.get(event.id, []) - # 找出该事件所属的所有 lv2 - event_lv2s = set() + # 找出该事件所属的层级信息 + event_groups = set() # 存储 (group_id, group_name, parent_info) 元组 for concept in concepts: hierarchy = find_concept_hierarchy(concept) if hierarchy: - event_lv2s.add((hierarchy['lv2_id'], hierarchy['lv2'], hierarchy['lv1'])) + if is_specific_id: + # 筛选特定概念ID + if group_by.startswith('L1_') and hierarchy['lv1_id'] == group_by: + event_groups.add((hierarchy['lv2_id'], hierarchy['lv2'], hierarchy['lv1'], hierarchy.get('lv3', ''), hierarchy.get('lv3_id', ''))) + elif group_by.startswith('L2_') and hierarchy['lv2_id'] == group_by: + event_groups.add((hierarchy.get('lv3_id', hierarchy['lv2_id']), hierarchy.get('lv3', hierarchy['lv2']), hierarchy['lv2'], hierarchy['lv1'], '')) + elif group_by.startswith('L3_') and hierarchy.get('lv3_id') == group_by: + event_groups.add((hierarchy['lv3_id'], hierarchy['lv3'], hierarchy['lv2'], hierarchy['lv1'], '')) + elif group_by == 'lv1': + event_groups.add((hierarchy['lv1_id'], hierarchy['lv1'], '', '', '')) + elif group_by == 'lv3': + if hierarchy.get('lv3_id'): + event_groups.add((hierarchy['lv3_id'], hierarchy['lv3'], hierarchy['lv2'], hierarchy['lv1'], '')) + else: # 默认 lv2 + event_groups.add((hierarchy['lv2_id'], hierarchy['lv2'], hierarchy['lv1'], '', '')) # 事件数据 event_data = { @@ -11202,17 +11254,28 @@ def get_events_by_mainline(): } } - if event_lv2s: - # 添加到每个相关的 lv2 分组 - for lv2_id, lv2_name, lv1_name in event_lv2s: - if lv2_id not in mainline_groups: - mainline_groups[lv2_id] = { - 'lv2_id': lv2_id, - 'lv2_name': lv2_name, - 'lv1_name': lv1_name, + if event_groups: + # 添加到每个相关的分组 + for group_info in event_groups: + group_id = group_info[0] + group_name = group_info[1] + parent_name = group_info[2] if len(group_info) > 2 else '' + grandparent_name = group_info[3] if len(group_info) > 3 else '' + + if group_id not in mainline_groups: + mainline_groups[group_id] = { + 'group_id': group_id, + 'group_name': group_name, + 'parent_name': parent_name, + 'grandparent_name': grandparent_name, + # 兼容旧字段 + 'lv2_id': group_id if group_by == 'lv2' or group_by.startswith('L1_') else None, + 'lv2_name': group_name if group_by == 'lv2' or group_by.startswith('L1_') else parent_name, + 'lv1_name': parent_name if group_by == 'lv2' else grandparent_name, + 'lv3_name': group_name if group_by == 'lv3' or group_by.startswith('L2_') else None, 'events': [] } - mainline_groups[lv2_id]['events'].append(event_data) + mainline_groups[group_id]['events'].append(event_data) else: ungrouped_events.append(event_data) @@ -11248,7 +11311,7 @@ def get_events_by_mainline(): # ==================== 6. 整理返回数据 ==================== mainlines = [] - for lv2_id, group in mainline_groups.items(): + for group_id, group in mainline_groups.items(): # 按时间倒序排列（不限制数量） group['events'] = sorted( group['events'], @@ -11256,8 +11319,8 @@ def get_events_by_mainline(): reverse=True ) group['event_count'] = len(group['events']) - # 添加涨跌幅数据 - lv2_name = group.get('lv2_name', '') + # 添加涨跌幅数据（目前只支持 lv2） + lv2_name = group.get('lv2_name', '') or group.get('group_name', '') if lv2_name in lv2_price_map: group['avg_change_pct'] = lv2_price_map[lv2_name]['avg_change_pct'] group['price_date'] = lv2_price_map[lv2_name]['trade_date'] @@ -11276,6 +11339,8 @@ def get_events_by_mainline(): 'total_events': len(events), 'mainline_count': len(mainlines), 'ungrouped_count': len(ungrouped_events), + 'group_by': group_by, + 'hierarchy_options': hierarchy_options, # 调试信息 '_debug': { 'hierarchy_count': len(concept_hierarchy_map), diff --git a/src/mocks/handlers/event.js b/src/mocks/handlers/event.js index 32952a50..6d9aceca 100644 --- a/src/mocks/handlers/event.js +++ b/src/mocks/handlers/event.js @@ -1588,7 +1588,7 @@ export const eventHandlers = [ // ==================== 主线模式相关 ==================== - // 获取按主线（lv1/lv2概念）分组的事件列表 + // 获取按主线（lv1/lv2/lv3概念）分组的事件列表 http.get('/api/events/mainline', async ({ request }) => { await delay(500); @@ -1596,7 +1596,7 @@ export const eventHandlers = [ const recentDays = parseInt(url.searchParams.get('recent_days') || '7', 10); const importance = url.searchParams.get('importance') || 'all'; const limitPerMainline = parseInt(url.searchParams.get('limit') || '20', 10); - // 分组方式: 'lv1' | 'lv2' | 具体的 lv2_id（如 'L2_AI_INFRA'） + // 分组方式: 'lv1' | 'lv2' | 'lv3' | 具体的概念ID（如 'L1_TMT', 'L2_AI_INFRA', 'L3_AI_CHIP'） const groupBy = url.searchParams.get('group_by') || 'lv2'; console.log('[Mock Event] 获取主线数据:', { recentDays, importance, limitPerMainline, groupBy }); @@ -1605,73 +1605,113 @@ export const eventHandlers = [ // 生成 mock 事件数据 const allEvents = generateDynamicNewsEvents(100); - // 定义 lv2 主线分类 + // 定义完整的 lv1 -> lv2 -> lv3 层级结构 const mainlineDefinitions = [ - { lv2_id: 'L2_AI_INFRA', lv2_name: 'AI基础设施 (算力/CPO/PCB)', lv1_id: 'L1_TMT', lv1_name: 'TMT (科技/媒体/通信)', keywords: ['算力', 'AI', '人工智能', 'CPO', 'PCB', '光模块', '大模型', '智能体'] }, - { lv2_id: 'L2_SEMICONDUCTOR', lv2_name: '半导体 (设计/制造/封测)', lv1_id: 'L1_TMT', lv1_name: 'TMT (科技/媒体/通信)', keywords: ['半导体', '芯片', '光刻', 'IC', '晶圆', '封装', '测试'] }, - { lv2_id: 'L2_ROBOT', lv2_name: '机器人 (人形机器人/工业机器人)', lv1_id: 'L1_TMT', lv1_name: 'TMT (科技/媒体/通信)', keywords: ['机器人', '人形', '自动化', '工业机器人', '具身智能'] }, - { lv2_id: 'L2_CONSUMER_ELEC', lv2_name: '消费电子 (手机/XR/可穿戴)', lv1_id: 'L1_TMT', lv1_name: 'TMT (科技/媒体/通信)', keywords: ['手机', 'XR', 'VR', 'AR', '可穿戴', '华为', '苹果', '消费电子'] }, - { lv2_id: 'L2_TELECOM', lv2_name: '通信、互联网与软件', lv1_id: 'L1_TMT', lv1_name: 'TMT (科技/媒体/通信)', keywords: ['通信', '5G', '6G', '互联网', '软件', '云计算', 'SaaS', '数字化'] }, - { lv2_id: 'L2_NEW_ENERGY', lv2_name: '新能源 (光伏/储能/电池)', lv1_id: 'L1_NEW_ENERGY_ENV', lv1_name: '新能源与智能汽车 (New Energy & Auto)', keywords: ['光伏', '储能', '电池', '锂电', '新能源', '风电', '清洁能源'] }, - { lv2_id: 'L2_EV', lv2_name: '智能网联汽车', lv1_id: 'L1_NEW_ENERGY_ENV', lv1_name: '新能源与智能汽车 (New Energy & Auto)', keywords: ['新能源汽车', '电动车', '智能驾驶', '汽车', '整车', '零部件', '智能网联'] }, - { lv2_id: 'L2_LOW_ALTITUDE', lv2_name: '低空经济 (无人机/eVTOL)', lv1_id: 'L1_ADVANCED_MFG', lv1_name: '先进制造', keywords: ['低空', '无人机', 'eVTOL', '飞行', '空域'] }, - { lv2_id: 'L2_MILITARY', lv2_name: '军工 (航空航天/国防)', lv1_id: 'L1_ADVANCED_MFG', lv1_name: '先进制造', keywords: ['军工', '国防', '航空', '航天', '卫星', '导弹'] }, - { lv2_id: 'L2_PHARMA', lv2_name: '医药医疗 (创新药/器械)', lv1_id: 'L1_PHARMA', lv1_name: '医药健康', keywords: ['医药', '医疗', '创新药', '器械', '生物', 'CXO'] }, - { lv2_id: 'L2_FINANCE', lv2_name: '金融 (银行/券商/保险)', lv1_id: 'L1_FINANCE', lv1_name: '金融', keywords: ['金融', '银行', '券商', '保险', '证券'] }, + { lv3_id: 'L3_AI_CHIP', lv3_name: 'AI芯片与算力', lv2_id: 'L2_AI_INFRA', lv2_name: 'AI基础设施 (算力/CPO/PCB)', lv1_id: 'L1_TMT', lv1_name: 'TMT (科技/媒体/通信)', keywords: ['算力', 'AI芯片', 'GPU', '英伟达', '华为昇腾', '寒武纪'] }, + { lv3_id: 'L3_AI_SERVER', lv3_name: '服务器与数据中心', lv2_id: 'L2_AI_INFRA', lv2_name: 'AI基础设施 (算力/CPO/PCB)', lv1_id: 'L1_TMT', lv1_name: 'TMT (科技/媒体/通信)', keywords: ['服务器', '数据中心', '智算中心', '液冷'] }, + { lv3_id: 'L3_OPTICAL', lv3_name: '光通信与CPO', lv2_id: 'L2_AI_INFRA', lv2_name: 'AI基础设施 (算力/CPO/PCB)', lv1_id: 'L1_TMT', lv1_name: 'TMT (科技/媒体/通信)', keywords: ['CPO', '光通信', '光模块', '光芯片'] }, + { lv3_id: 'L3_PCB', lv3_name: 'PCB与封装', lv2_id: 'L2_AI_INFRA', lv2_name: 'AI基础设施 (算力/CPO/PCB)', lv1_id: 'L1_TMT', lv1_name: 'TMT (科技/媒体/通信)', keywords: ['PCB', '封装', 'AI PCB'] }, + { lv3_id: 'L3_AI_APP', lv3_name: 'AI应用与大模型', lv2_id: 'L2_AI_INFRA', lv2_name: 'AI基础设施 (算力/CPO/PCB)', lv1_id: 'L1_TMT', lv1_name: 'TMT (科技/媒体/通信)', keywords: ['大模型', '智能体', 'AI', '人工智能', 'DeepSeek', 'KIMI', 'ChatGPT'] }, + { lv3_id: 'L3_CHIP_DESIGN', lv3_name: '芯片设计', lv2_id: 'L2_SEMICONDUCTOR', lv2_name: '半导体 (设计/制造/封测)', lv1_id: 'L1_TMT', lv1_name: 'TMT (科技/媒体/通信)', keywords: ['芯片设计', '半导体', 'IC设计'] }, + { lv3_id: 'L3_CHIP_MFG', lv3_name: '芯片制造', lv2_id: 'L2_SEMICONDUCTOR', lv2_name: '半导体 (设计/制造/封测)', lv1_id: 'L1_TMT', lv1_name: 'TMT (科技/媒体/通信)', keywords: ['晶圆', '光刻', '芯片制造', '中芯国际'] }, + { lv3_id: 'L3_HUMANOID', lv3_name: '人形机器人', lv2_id: 'L2_ROBOT', lv2_name: '机器人 (人形机器人/工业机器人)', lv1_id: 'L1_TMT', lv1_name: 'TMT (科技/媒体/通信)', keywords: ['人形机器人', '具身智能', '特斯拉机器人'] }, + { lv3_id: 'L3_INDUSTRIAL_ROBOT', lv3_name: '工业机器人', lv2_id: 'L2_ROBOT', lv2_name: '机器人 (人形机器人/工业机器人)', lv1_id: 'L1_TMT', lv1_name: 'TMT (科技/媒体/通信)', keywords: ['工业机器人', '自动化', '机器人'] }, + { lv3_id: 'L3_MOBILE', lv3_name: '智能手机', lv2_id: 'L2_CONSUMER_ELEC', lv2_name: '消费电子 (手机/XR/可穿戴)', lv1_id: 'L1_TMT', lv1_name: 'TMT (科技/媒体/通信)', keywords: ['手机', '华为', '苹果', '小米', '折叠屏'] }, + { lv3_id: 'L3_XR', lv3_name: 'XR与可穿戴', lv2_id: 'L2_CONSUMER_ELEC', lv2_name: '消费电子 (手机/XR/可穿戴)', lv1_id: 'L1_TMT', lv1_name: 'TMT (科技/媒体/通信)', keywords: ['XR', 'VR', 'AR', '可穿戴', 'MR', 'Vision Pro'] }, + { lv3_id: 'L3_5G', lv3_name: '5G/6G通信', lv2_id: 'L2_TELECOM', lv2_name: '通信、互联网与软件', lv1_id: 'L1_TMT', lv1_name: 'TMT (科技/媒体/通信)', keywords: ['5G', '6G', '通信', '基站'] }, + { lv3_id: 'L3_CLOUD', lv3_name: '云计算与软件', lv2_id: 'L2_TELECOM', lv2_name: '通信、互联网与软件', lv1_id: 'L1_TMT', lv1_name: 'TMT (科技/媒体/通信)', keywords: ['云计算', '软件', 'SaaS', '互联网', '数字化'] }, + { lv3_id: 'L3_PV', lv3_name: '光伏', lv2_id: 'L2_NEW_ENERGY', lv2_name: '新能源 (光伏/储能/电池)', lv1_id: 'L1_NEW_ENERGY_ENV', lv1_name: '新能源与智能汽车', keywords: ['光伏', '太阳能', '硅片', '组件'] }, + { lv3_id: 'L3_STORAGE', lv3_name: '储能与电池', lv2_id: 'L2_NEW_ENERGY', lv2_name: '新能源 (光伏/储能/电池)', lv1_id: 'L1_NEW_ENERGY_ENV', lv1_name: '新能源与智能汽车', keywords: ['储能', '电池', '锂电', '固态电池', '新能源'] }, + { lv3_id: 'L3_EV_OEM', lv3_name: '新能源整车', lv2_id: 'L2_EV', lv2_name: '智能网联汽车', lv1_id: 'L1_NEW_ENERGY_ENV', lv1_name: '新能源与智能汽车', keywords: ['新能源汽车', '电动车', '比亚迪', '特斯拉', '整车'] }, + { lv3_id: 'L3_AUTO_DRIVE', lv3_name: '智能驾驶', lv2_id: 'L2_EV', lv2_name: '智能网联汽车', lv1_id: 'L1_NEW_ENERGY_ENV', lv1_name: '新能源与智能汽车', keywords: ['智能驾驶', '自动驾驶', '智能网联', '车路协同'] }, + { lv3_id: 'L3_DRONE', lv3_name: '无人机', lv2_id: 'L2_LOW_ALTITUDE', lv2_name: '低空经济 (无人机/eVTOL)', lv1_id: 'L1_ADVANCED_MFG', lv1_name: '先进制造', keywords: ['无人机', '低空', '空域'] }, + { lv3_id: 'L3_EVTOL', lv3_name: 'eVTOL', lv2_id: 'L2_LOW_ALTITUDE', lv2_name: '低空经济 (无人机/eVTOL)', lv1_id: 'L1_ADVANCED_MFG', lv1_name: '先进制造', keywords: ['eVTOL', '飞行汽车', '空中出租车'] }, + { lv3_id: 'L3_AEROSPACE', lv3_name: '航空航天', lv2_id: 'L2_MILITARY', lv2_name: '军工 (航空航天/国防)', lv1_id: 'L1_ADVANCED_MFG', lv1_name: '先进制造', keywords: ['航空', '航天', '卫星', '火箭', '军工'] }, + { lv3_id: 'L3_DEFENSE', lv3_name: '国防军工', lv2_id: 'L2_MILITARY', lv2_name: '军工 (航空航天/国防)', lv1_id: 'L1_ADVANCED_MFG', lv1_name: '先进制造', keywords: ['国防', '导弹', '军工装备'] }, + { lv3_id: 'L3_DRUG', lv3_name: '创新药', lv2_id: 'L2_PHARMA', lv2_name: '医药医疗 (创新药/器械)', lv1_id: 'L1_PHARMA', lv1_name: '医药健康', keywords: ['创新药', '医药', '生物', 'CXO'] }, + { lv3_id: 'L3_DEVICE', lv3_name: '医疗器械', lv2_id: 'L2_PHARMA', lv2_name: '医药医疗 (创新药/器械)', lv1_id: 'L1_PHARMA', lv1_name: '医药健康', keywords: ['医疗器械', '医疗', '器械'] }, + { lv3_id: 'L3_BANK', lv3_name: '银行', lv2_id: 'L2_FINANCE', lv2_name: '金融 (银行/券商/保险)', lv1_id: 'L1_FINANCE', lv1_name: '金融', keywords: ['银行', '金融'] }, + { lv3_id: 'L3_BROKER', lv3_name: '券商', lv2_id: 'L2_FINANCE', lv2_name: '金融 (银行/券商/保险)', lv1_id: 'L1_FINANCE', lv1_name: '金融', keywords: ['券商', '证券'] }, ]; - // 生成 lv2 选项列表供前端下拉框使用 - const lv2Options = mainlineDefinitions.map(m => ({ - lv2_id: m.lv2_id, - lv2_name: m.lv2_name, - lv1_name: m.lv1_name, - })); + // 生成层级选项供前端下拉框使用 + const hierarchyOptions = { + lv1: [...new Map(mainlineDefinitions.map(m => [m.lv1_id, { id: m.lv1_id, name: m.lv1_name }])).values()], + lv2: [...new Map(mainlineDefinitions.map(m => [m.lv2_id, { id: m.lv2_id, name: m.lv2_name, lv1_id: m.lv1_id, lv1_name: m.lv1_name }])).values()], + lv3: mainlineDefinitions.map(m => ({ id: m.lv3_id, name: m.lv3_name, lv2_id: m.lv2_id, lv2_name: m.lv2_name, lv1_id: m.lv1_id, lv1_name: m.lv1_name })), + }; // 按主线分组事件 const mainlineGroups = {}; - // 判断是否为具体的 lv2_id - const isSpecificLv2 = groupBy.startsWith('L2_'); + // 判断分组方式 + const isSpecificId = groupBy.startsWith('L1_') || groupBy.startsWith('L2_') || groupBy.startsWith('L3_'); allEvents.forEach(event => { - // 从事件的 keywords (related_concepts) 中查找匹配的主线 const keywords = event.keywords || event.related_concepts || []; const conceptNames = keywords.map(k => k.concept || k.name || k).join(' '); const titleAndDesc = `${event.title || ''} ${event.description || ''}`; const textToMatch = `${conceptNames} ${titleAndDesc}`.toLowerCase(); - // 匹配主线 mainlineDefinitions.forEach(mainline => { const matched = mainline.keywords.some(kw => textToMatch.includes(kw.toLowerCase())); if (matched) { - // 根据分组方式决定分组键 let groupKey, groupData; - if (isSpecificLv2) { - // 具体 lv2 概念：只显示该概念下的事件，不分组 - if (mainline.lv2_id !== groupBy) return; - groupKey = mainline.lv2_id; - groupData = { - lv2_id: mainline.lv2_id, - lv2_name: mainline.lv2_name, - lv1_name: mainline.lv1_name, - events: [] - }; + if (isSpecificId) { + // 筛选特定概念ID + if (groupBy.startsWith('L1_') && mainline.lv1_id === groupBy) { + groupKey = mainline.lv2_id; + groupData = { + group_id: mainline.lv2_id, + group_name: mainline.lv2_name, + parent_name: mainline.lv1_name, + events: [] + }; + } else if (groupBy.startsWith('L2_') && mainline.lv2_id === groupBy) { + groupKey = mainline.lv3_id; + groupData = { + group_id: mainline.lv3_id, + group_name: mainline.lv3_name, + parent_name: mainline.lv2_name, + grandparent_name: mainline.lv1_name, + events: [] + }; + } else if (groupBy.startsWith('L3_') && mainline.lv3_id === groupBy) { + groupKey = mainline.lv3_id; + groupData = { + group_id: mainline.lv3_id, + group_name: mainline.lv3_name, + parent_name: mainline.lv2_name, + grandparent_name: mainline.lv1_name, + events: [] + }; + } else { + return; + } } else if (groupBy === 'lv1') { - // 按一级概念分组 groupKey = mainline.lv1_id; groupData = { - lv1_id: mainline.lv1_id, - lv1_name: mainline.lv1_name, + group_id: mainline.lv1_id, + group_name: mainline.lv1_name, + events: [] + }; + } else if (groupBy === 'lv3') { + groupKey = mainline.lv3_id; + groupData = { + group_id: mainline.lv3_id, + group_name: mainline.lv3_name, + parent_name: mainline.lv2_name, + grandparent_name: mainline.lv1_name, events: [] }; } else { - // 默认按二级概念分组 + // 默认 lv2 groupKey = mainline.lv2_id; groupData = { - lv2_id: mainline.lv2_id, - lv2_name: mainline.lv2_name, - lv1_name: mainline.lv1_name, + group_id: mainline.lv2_id, + group_name: mainline.lv2_name, + parent_name: mainline.lv1_name, events: [] }; } @@ -1679,7 +1719,6 @@ export const eventHandlers = [ if (!mainlineGroups[groupKey]) { mainlineGroups[groupKey] = groupData; } - // 避免重复添加 if (!mainlineGroups[groupKey].events.find(e => e.id === event.id)) { mainlineGroups[groupKey].events.push(event); } @@ -1687,7 +1726,6 @@ export const eventHandlers = [ }); }); - // 转换为数组，限制每组数量，按事件数量排序 const mainlines = Object.values(mainlineGroups) .map(group => ({ ...group, @@ -1697,7 +1735,6 @@ export const eventHandlers = [ .filter(group => group.event_count > 0) .sort((a, b) => b.event_count - a.event_count); - // 统计未分组的事件 const groupedEventIds = new Set(); mainlines.forEach(m => m.events.forEach(e => groupedEventIds.add(e.id))); const ungroupedCount = allEvents.filter(e => !groupedEventIds.has(e.id)).length; @@ -1717,7 +1754,7 @@ export const eventHandlers = [ mainline_count: mainlines.length, ungrouped_count: ungroupedCount, group_by: groupBy, - lv2_options: lv2Options, + hierarchy_options: hierarchyOptions, } }); } catch (error) { diff --git a/src/views/Community/components/DynamicNews/layouts/MainlineTimelineView.js b/src/views/Community/components/DynamicNews/layouts/MainlineTimelineView.js index ced08b53..192de442 100644 --- a/src/views/Community/components/DynamicNews/layouts/MainlineTimelineView.js +++ b/src/views/Community/components/DynamicNews/layouts/MainlineTimelineView.js @@ -136,7 +136,7 @@ const MainlineCard = React.memo( noOfLines={1} flex={1} > - {mainline.lv2_name || mainline.lv1_name || "其他"} + {mainline.group_name || mainline.lv2_name || mainline.lv1_name || "其他"} {/* 涨跌幅显示 - 在概念名称旁边 */} {mainline.avg_change_pct != null && ( @@ -160,14 +160,15 @@ const MainlineCard = React.memo( {mainline.event_count} - {/* 只有当同时存在 lv1_name 和 lv2_name 时才显示副标题 */} - {mainline.lv1_name && mainline.lv2_name && ( + {/* 显示上级概念名称作为副标题 */} + {mainline.parent_name && ( - {mainline.lv1_name} + {mainline.grandparent_name ? `${mainline.grandparent_name} > ` : ""} + {mainline.parent_name} )} @@ -283,10 +284,10 @@ const MainlineTimelineViewComponent = forwardRef( const [error, setError] = useState(null); const [mainlineData, setMainlineData] = useState(null); const [expandedGroups, setExpandedGroups] = useState({}); - // 概念级别选择: 'lv1' | 'lv2' | 具体的 lv2_id + // 概念级别选择: 'lv1' | 'lv2' | 'lv3' | 具体概念ID（如 L1_TMT, L2_AI_INFRA, L3_AI_CHIP） const [groupBy, setGroupBy] = useState("lv2"); - // lv2 概念选项（从 API 获取） - const [lv2Options, setLv2Options] = useState([]); + // 层级选项（从 API 获取） + const [hierarchyOptions, setHierarchyOptions] = useState({ lv1: [], lv2: [], lv3: [] }); // 根据主线类型获取配色 const getColorScheme = useCallback((lv2Name) => { @@ -406,15 +407,16 @@ const MainlineTimelineViewComponent = forwardRef( mainlines: sortedMainlines, }); - // 保存 lv2 选项供下拉框使用 - if (result.data.lv2_options) { - setLv2Options(result.data.lv2_options); + // 保存层级选项供下拉框使用 + if (result.data.hierarchy_options) { + setHierarchyOptions(result.data.hierarchy_options); } // 初始化展开状态（默认全部展开） const initialExpanded = {}; sortedMainlines.forEach((mainline) => { - initialExpanded[mainline.lv2_id || mainline.lv1_id] = true; + const groupId = mainline.group_id || mainline.lv2_id || mainline.lv1_id; + initialExpanded[groupId] = true; }); setExpandedGroups(initialExpanded); } else { @@ -563,24 +565,55 @@ const MainlineTimelineViewComponent = forwardRef( onChange={setGroupBy} size="small" style={{ - width: 160, + width: 200, backgroundColor: "transparent", }} popupClassName="dark-select-dropdown" dropdownStyle={{ backgroundColor: "#252a34", borderColor: "#3a3f4b", + maxHeight: 400, }} + showSearch + optionFilterProp="label" options={[ - { value: "lv1", label: "按一级概念" }, - { value: "lv2", label: "按二级概念" }, - ...(lv2Options.length > 0 + { + label: "分组方式", + options: [ + { value: "lv1", label: "按一级概念（大类）" }, + { value: "lv2", label: "按二级概念（细分）" }, + { value: "lv3", label: "按三级概念（更细）" }, + ], + }, + ...(hierarchyOptions.lv1?.length > 0 ? [ { - label: "具体概念", - options: lv2Options.map((opt) => ({ - value: opt.lv2_id, - label: opt.lv2_name, + label: "一级概念（展开）", + options: hierarchyOptions.lv1.map((opt) => ({ + value: opt.id, + label: opt.name, + })), + }, + ] + : []), + ...(hierarchyOptions.lv2?.length > 0 + ? [ + { + label: "二级概念（展开）", + options: hierarchyOptions.lv2.map((opt) => ({ + value: opt.id, + label: `${opt.name}`, + })), + }, + ] + : []), + ...(hierarchyOptions.lv3?.length > 0 + ? [ + { + label: "三级概念（展开）", + options: hierarchyOptions.lv3.map((opt) => ({ + value: opt.id, + label: `${opt.name}`, })), }, ] @@ -656,9 +689,16 @@ const MainlineTimelineViewComponent = forwardRef( }} > {mainlines.map((mainline) => { - const groupId = mainline.lv2_id || mainline.lv1_id || "ungrouped"; + const groupId = + mainline.group_id || + mainline.lv2_id || + mainline.lv1_id || + "ungrouped"; const groupName = - mainline.lv2_name || mainline.lv1_name || "其他"; + mainline.group_name || + mainline.lv2_name || + mainline.lv1_name || + "其他"; return (