数据源修改

scripts/fetchers/eastmoney-mcp.fetcher.js

@@ -50,6 +50,59 @@ const INDICATORS = [
       sheets.find((s) => s.items?.[0]?.[0]?.includes('GDP') && s.items[0][0].includes('同比'))
       || sheets[0],
   },
+  {
+    // 国债收益率: MCP 返回日频, 用月末降采样成月频点
+    name: 'china-bond-10y',
+    groupName: 'china-macro',
+    title: '中国国债 10 年期收益率',
+    unit: '%',
+    frequency: 'month',
+    tool: 'mx_macro_data',
+    query: '查询中国10年期国债到期收益率 2024年至今 每日数据',
+    pickSheet: (sheets) =>
+      sheets.find((s) => s.items?.some?.((row) => String(row[0] || '').includes('国债到期收益率:10年')))
+      || sheets[0],
+    parseSheet: (sheet) => monthEndSample(sheet, '国债到期收益率:10年'),
+  },
+  {
+    name: 'china-bond-1y',
+    groupName: 'china-macro',
+    title: '中国国债 1 年期收益率',
+    unit: '%',
+    frequency: 'month',
+    tool: 'mx_macro_data',
+    query: '查询中国1年期国债到期收益率 2024年至今 每日数据',
+    pickSheet: (sheets) =>
+      sheets.find((s) => s.items?.some?.((row) => String(row[0] || '').includes('国债到期收益率:1年')))
+      || sheets[0],
+    parseSheet: (sheet) => monthEndSample(sheet, '国债到期收益率:1年'),
+  },
+  {
+    name: 'china-lpr-1y',
+    groupName: 'china-macro',
+    title: '中国 LPR 1 年期',
+    unit: '%',
+    frequency: 'month',
+    tool: 'mx_macro_data',
+    query: '查询中国LPR 1年期贷款市场报价利率 2024年至今 月度数据，每一个月的数值',
+    pickSheet: (sheets) =>
+      sheets.find((s) => s.sheetName?.includes('宏观数据（月）'))
+      || sheets[0],
+    parseSheet: (sheet) => pickRowByKeyword(sheet, '(LPR):1年'),
+  },
+  {
+    name: 'china-lpr-5y',
+    groupName: 'china-macro',
+    title: '中国 LPR 5 年期',
+    unit: '%',
+    frequency: 'month',
+    tool: 'mx_macro_data',
+    query: '查询中国LPR 5年期以上贷款市场报价利率 2024年至今 月度数据，每一个月的数值',
+    pickSheet: (sheets) =>
+      sheets.find((s) => s.sheetName?.includes('宏观数据（月）'))
+      || sheets[0],
+    parseSheet: (sheet) => pickRowByKeyword(sheet, '(LPR):5年'),
+  },
 ]
 
 export const META = {
@@ -139,6 +192,44 @@ function defaultParseSheet(sheet) {
   return out.reverse()  // 从老到新
 }
 
+// 宽表 → 长表, 指定 item 行 (按指标全名前缀匹配), 日频列降采样为月末值
+// 例: columns=["指标","来源","2026-08-05","2026-08-04",...] → [{period:"2024-01",value},...]
+function monthEndSample(sheet, keyword) {
+  if (!sheet || !sheet.columns || !sheet.items) return []
+  const row = sheet.items.find((r) => String(r[0] || '').includes(keyword))
+  if (!row) return []
+  const cols = sheet.columns
+  const dates = cols.slice(2)   // 新 → 老
+  const values = row.slice(2)
+  const out = []
+  const seen = new Set()
+  for (let i = 0; i < dates.length; i++) {
+    const v = parseFloat(values[i])
+    const m = String(dates[i] || '').slice(0, 7)   // "2024-01-02" → "2024-01"
+    if (!/^\d{4}-\d{2}$/.test(m) || Number.isNaN(v)) continue
+    if (seen.has(m)) continue   // 列是降序, 第一次遇到的即当月最后一个交易日
+    seen.add(m)
+    out.push({ period: m, value: v })
+  }
+  return out.reverse()  // 从老到新
+}
+
+// 宽表 → 长表, 指定 item 行 (按指标全名前缀匹配), 保留原频率 (月/季/年)
+function pickRowByKeyword(sheet, keyword) {
+  if (!sheet || !sheet.columns || !sheet.items) return []
+  const row = sheet.items.find((r) => String(r[0] || '').includes(keyword))
+  if (!row) return []
+  const cols = sheet.columns
+  const dates = cols.slice(2)
+  const values = row.slice(2)
+  const out = []
+  for (let i = 0; i < dates.length; i++) {
+    const v = parseFloat(values[i])
+    if (!Number.isNaN(v)) out.push({ period: String(dates[i]), value: v })
+  }
+  return out.reverse()  // 从老到新
+}
+
 // ====== fetcher 入口 ======
 
 export async function listAvailableTools() {
@@ -156,6 +247,7 @@ export async function fetchAll(opts = {}) {
     throw new Error('eastmoney-mcp: INDICATORS 数组为空, 加新指标见文件顶部注释')
   }
   const skip = opts.skipNames || new Set()
+  const force = opts.forceNames || new Set()
   const only = opts.onlyNames || null
 
   const key = process.env.EM_API_KEY
@@ -165,7 +257,7 @@ export async function fetchAll(opts = {}) {
 
   const results = []
   for (const cfg of INDICATORS) {
-    if (skip.has(cfg.name)) {
+    if (skip.has(cfg.name) && !force.has(cfg.name)) {
       console.log(`[MCP] ${cfg.name} 跳过 (DB 已存在)`)
       continue
     }
@@ -199,7 +291,7 @@ export async function fetchAll(opts = {}) {
     }
   }
   // 全部被 DB 优先跳过时, 返回显式标记而不是空数组 (避免被误判为失败)
-  if (results.length === 0 && INDICATORS.every((cfg) => skip.has(cfg.name))) {
+  if (results.length === 0 && INDICATORS.every((cfg) => skip.has(cfg.name) && !force.has(cfg.name))) {
     return { skipped: true, reason: 'DB 已存在全部指标' }
   }
   return results
@@ -208,3 +300,4 @@ export async function fetchAll(opts = {}) {
 
 
 
+

scripts/fetchers/index.js

@@ -36,7 +36,8 @@ export function checkEnv(required) {
 
 // 加载并运行所有启用的 fetcher, 返回 [{ name, ok, items, error, skipped }]
 // 错误隔离: 一个 fetcher 挂了不影响其他
-// opts.skipNames: Set<string> — DB 优先, 已存在的指标名, 透传给 fetcher
+// opts.skipNames:  Set<string> — DB 优先, 已存在的指标名, 透传给 fetcher
+// opts.forceNames: Set<string> — 强制刷新名单, 即使 skipNames 里有也照拉
 export async function runFetchers(opts = {}) {
   const results = []
   for (const meta of FETCHERS) {
@@ -57,7 +58,7 @@ export async function runFetchers(opts = {}) {
         throw new Error('fetcher 必须导出 META 和 fetchAll')
       }
       console.log(`[Fetcher] ${meta.name} 开始...`)
-      const out = await mod.fetchAll({ skipNames: opts.skipNames, onlyNames: opts.onlyNames })
+      const out = await mod.fetchAll({ skipNames: opts.skipNames, onlyNames: opts.onlyNames, forceNames: opts.forceNames })
       // fetcher 可返回 { skipped: true, reason } 表示"全部被 DB 优先跳过", 不算失败
       if (out && out.skipped) {
         results.push({ name: meta.name, skipped: true, reason: out.reason })

scripts/migrate-indicator-points.cjs

@@ -0,0 +1,84 @@
+/**
+ * 一次性数据迁移: 把 Indicator.data (JSON) 拆分到 IndicatorPoint 明细表
+ * 用法: 在迁移 A (建表+加列) 之后、迁移 B (删 data 列) 之前运行
+ * 幂等: 同 (indicatorId, period) 重复插入会更新 value, 可安全重跑
+ */
+require('dotenv').config()
+const mysql = require('mysql2/promise')
+
+function parseUrl(url) {
+  const u = new URL(url)
+  return {
+    host: u.hostname,
+    port: Number(u.port) || 3306,
+    user: decodeURIComponent(u.username),
+    password: decodeURIComponent(u.password),
+    database: u.pathname.replace(/^\//, ''),
+  }
+}
+
+// 根据 row 的时间字段推断频率: year | quarter | month | day
+function inferFrequency(row) {
+  if (row && row.month !== undefined) return 'month'
+  if (row && row.year !== undefined) return 'year'
+  const p = String((row && row.period) || '')
+  if (/^\d{4}$/.test(p)) return 'year'
+  if (/^\d{4}-Q[1-4]$/.test(p)) return 'quarter'
+  if (/^\d{4}-\d{2}$/.test(p)) return 'month'
+  if (/^\d{4}-\d{2}-\d{2}$/.test(p)) return 'day'
+  return 'month'
+}
+
+// 统一 row 的时间字段为 period
+function periodOf(row) {
+  if (!row) return ''
+  return String(row.period !== undefined ? row.period : (row.month !== undefined ? row.month : row.year))
+}
+
+async function main() {
+  const conn = await mysql.createConnection(parseUrl(process.env.DATABASE_URL))
+  try {
+    const [rows] = await conn.execute('SELECT id, name, groupName, data FROM Indicator')
+    console.log('[Migrate] 读取', rows.length, '个 Indicator')
+
+    let points = 0, updated = 0
+    for (const ind of rows) {
+      // mysql2 对 JSON 列已自动解析为对象, 兼容字符串兜底
+      let data = ind.data
+      if (typeof data === 'string') {
+        try { data = JSON.parse(data) } catch { data = null }
+      }
+      const title = (data && data.title) || ind.name
+      const unit = (data && data.unit) || ''
+      const source = (data && data.source) || ''
+      const rowsArr = (data && Array.isArray(data.rows)) ? data.rows : []
+      const freq = rowsArr.length ? inferFrequency(rowsArr[0]) : 'month'
+
+      // 更新 Indicator 元数据列
+      await conn.execute(
+        'UPDATE Indicator SET title=?, unit=?, source=?, frequency=?, updatedAt=NOW(3) WHERE id=?',
+        [title, unit, source, freq, ind.id],
+      )
+      updated++
+
+      // 写入明细
+      for (const r of rowsArr) {
+        const period = periodOf(r)
+        const value = Number(r.value)
+        if (!period || Number.isNaN(value)) continue
+        const [res] = await conn.execute(
+          'INSERT INTO IndicatorPoint (indicatorId, period, value, createdAt, updatedAt) VALUES (?, ?, ?, NOW(3), NOW(3)) ' +
+          'ON DUPLICATE KEY UPDATE value=VALUES(value), updatedAt=NOW(3)',
+          [ind.id, period, value],
+        )
+        points += (res.affectedRows > 0 ? 1 : 0)
+      }
+      console.log('[Migrate]', ind.name, '->', rowsArr.length, '个点, 频率', freq)
+    }
+    console.log('[Migrate] 完成: 更新', updated, '个 Indicator, 写入/更新', points, '个明细点')
+  } finally {
+    await conn.end()
+  }
+}
+
+main().catch((e) => { console.error('[Migrate] 失败:', e); process.exit(1) })

scripts/refresh-indicators.cjs

@@ -1,7 +1,12 @@
 /**
- * 拉所有启用的数据源, upsert 到 Indicator 表
- * 用法: npm run data:refresh
- * 幂等: 同 name 覆盖 data, 跨源独立, 错误隔离
+ * 拉所有启用的数据源, upsert 到 Indicator + IndicatorPoint 明细表
+ * 用法:
+ *   npm run data:refresh                        # 只拉 DB 里没有的指标
+ *   npm run data:refresh -- --force a,b,c       # 强制刷新指定指标 (忽略 DB 已有)
+ *
+ * 数据结构 (2026-08 重构):
+ *   Indicator      元数据: name/groupName/title/unit/source/frequency/hidden
+ *   IndicatorPoint 明细:   (indicatorId, period, value), period 兼容年/季/月/日
  *
  * DB 优先策略:
  *   1. 先从 DB 查已存在的 name 集合
@@ -14,6 +19,15 @@
 require('dotenv').config()
 const mysql = require('mysql2/promise')
 
+// 隐藏指标: 数据与获取脚本保留, 但不参与前端展示 (API 过滤)
+const HIDDEN_INDICATORS = new Set([
+  'china-gdp-usd',     // 中国 GDP (现价美元)
+  'china-gdp-growth',  // 中国 GDP 同比 (World Bank)
+  'china-gdp-yoy',     // 中国 GDP 同比 (妙想季度)
+  'china-unemploy',    // 中国失业率
+  'usa-gdp-usd',       // 美国 GDP
+])
+
 function parseUrl(url) {
   const u = new URL(url)
   return {
@@ -25,13 +39,63 @@ function parseUrl(url) {
   }
 }
 
-async function upsertIndicator(conn, payload) {
-  const sql =
-    'INSERT INTO `Indicator` (`name`, `groupName`, `data`, `createdAt`, `updatedAt`) ' +
-    'VALUES (?, ?, ?, NOW(3), NOW(3)) ' +
-    'ON DUPLICATE KEY UPDATE `groupName` = VALUES(`groupName`), `data` = VALUES(`data`), `updatedAt` = NOW(3)'
-  const [r] = await conn.execute(sql, [payload.name, payload.groupName, JSON.stringify(payload.data)])
-  return r.affectedRows
+function parseForceArg(argv) {
+  const i = argv.indexOf('--force')
+  if (i === -1) return new Set()
+  return new Set(String(argv[i + 1] || '').split(',').map((s) => s.trim()).filter(Boolean))
+}
+
+// 推断频率: year | quarter | month | day (优先用 fetcher 显式声明)
+function inferFrequency(data) {
+  if (data && data.frequency) return data.frequency
+  const p = String(((data && data.rows) || [])[0]?.period || '')
+  if (/^\d{4}$/.test(p)) return 'year'
+  if (/^\d{4}-Q[1-4]$/.test(p)) return 'quarter'
+  if (/^\d{4}-\d{2}$/.test(p)) return 'month'
+  if (/^\d{4}-\d{2}-\d{2}$/.test(p)) return 'day'
+  return 'month'
+}
+
+// 写 Indicator 元数据 + 全量替换明细点 (每指标一个事务)
+async function upsertIndicatorWithPoints(conn, payload) {
+  const { name, groupName, data, hidden } = payload
+  const title = data.title || name
+  const unit = data.unit || ''
+  const source = data.source || ''
+  const frequency = inferFrequency(data)
+  const rows = Array.isArray(data.rows) ? data.rows : []
+
+  await conn.beginTransaction()
+  try {
+    const [res] = await conn.execute(
+      'INSERT INTO `Indicator` (`name`, `groupName`, `title`, `unit`, `source`, `frequency`, `hidden`, `createdAt`, `updatedAt`) ' +
+      'VALUES (?, ?, ?, ?, ?, ?, ?, NOW(3), NOW(3)) ' +
+      'ON DUPLICATE KEY UPDATE `groupName` = VALUES(`groupName`), `title` = VALUES(`title`), ' +
+      '`unit` = VALUES(`unit`), `source` = VALUES(`source`), `frequency` = VALUES(`frequency`), ' +
+      '`hidden` = VALUES(`hidden`), `updatedAt` = NOW(3)',
+      [name, groupName, title, unit, source, frequency, hidden ? 1 : 0],
+    )
+    const indicatorId = res.insertId
+
+    // 明细: 先删旧点再插入新点 (全量替换, 保证与数据源一致)
+    await conn.execute('DELETE FROM `IndicatorPoint` WHERE `indicatorId` = ?', [indicatorId])
+    let points = 0
+    for (const r of rows) {
+      const period = String(r.period !== undefined ? r.period : (r.month !== undefined ? r.month : r.year))
+      const value = Number(r.value)
+      if (!period || Number.isNaN(value)) continue
+      await conn.execute(
+        'INSERT INTO `IndicatorPoint` (`indicatorId`, `period`, `value`, `createdAt`, `updatedAt`) VALUES (?, ?, ?, NOW(3), NOW(3))',
+        [indicatorId, period, value],
+      )
+      points++
+    }
+    await conn.commit()
+    return { indicatorId, points }
+  } catch (e) {
+    await conn.rollback()
+    throw e
+  }
 }
 
 async function fetchExistingNames(conn) {
@@ -44,48 +108,63 @@ async function main() {
     console.error('缺少 DATABASE_URL 环境变量')
     process.exit(1)
   }
+  const force = parseForceArg(process.argv.slice(2))
+  if (force.size) console.log('[Refresh] 强制刷新: ' + [...force].join(', '))
+
   const conn = await mysql.createConnection(parseUrl(process.env.DATABASE_URL))
   try {
     // 1) 查 DB 已存在的指标名
     const existing = await fetchExistingNames(conn)
-    console.log(`[Refresh] DB 已有 ${existing.size} 个指标: ${[...existing].join(', ') || '(空)'}`)
+    console.log('[Refresh] DB 已有 ' + existing.size + ' 个指标: ' + ([...existing].join(', ') || '(空)'))
 
-    // 2) 跑所有 fetcher, 传入 existing (DB 优先)
+    // 2) 跑所有 fetcher, 传入 existing + force (DB 优先, force 覆盖)
     const { runFetchers } = await import('./fetchers/index.js')
-    const fetcherResults = await runFetchers({ skipNames: existing })
+    const fetcherResults = await runFetchers({ skipNames: existing, forceNames: force })
 
-    // 3) 汇总
+    // 3) 汇总: force 名单里的指标即使 DB 已有也写入
     const allItems = []
     let skipped = 0, failed = 0
     for (const r of fetcherResults) {
       if (r.skipped) { skipped++; continue }
       if (!r.ok) { failed++; continue }
-      // fetcher 内部已经按 skipNames 过滤过, 这里再做一次防御性去重
       for (const it of r.items) {
-        if (existing.has(it.name)) continue
+        if (existing.has(it.name) && !force.has(it.name)) continue
         allItems.push(it)
       }
     }
-    console.log(`\n[Refresh] 汇总: ${allItems.length} 个新指标 (跳过 ${skipped} 个数据源, 失败 ${failed} 个, DB 已存在 ${existing.size} 个)`)
+    console.log('\n[Refresh] 汇总: ' + allItems.length + ' 个指标待写 (跳过 ' + skipped + ' 个数据源, 失败 ' + failed + ' 个, DB 已存在 ' + existing.size + ' 个)')
 
     if (failed > 0) {
       console.error('[Refresh] 警告: 有数据源失败, 仅写入成功的指标')
     }
 
+    // 5) 同步隐藏标记: 即使指标被 DB 优先跳过, 名单内的也确保 hidden=true
+    if (HIDDEN_INDICATORS.size > 0) {
+      const names = [...HIDDEN_INDICATORS]
+      const ph = names.map(() => '?').join(',')
+      const sql = "UPDATE `Indicator` SET `hidden` = 1, `updatedAt` = NOW(3) WHERE `name` IN (" + ph + ")"
+      await conn.execute(sql, names)
+      console.log('[Refresh] 同步隐藏标记: ' + names.length + ' 个指标 hidden=true (数据保留, 不展示)')
+    }
+
     if (allItems.length === 0) {
-      console.log('[Refresh] 无新指标, 不写库 (DB 优先策略生效)')
+      console.log('[Refresh] 无指标待写, 不写库 (DB 优先策略生效)')
       return
     }
 
     // 4) 写库
     console.log('[Refresh] 写入数据库...')
-    let ins = 0, upd = 0
+    let ins = 0, upd = 0, totalPoints = 0
     for (const it of allItems) {
-      const n = await upsertIndicator(conn, { name: it.name, groupName: it.groupName, data: it.data })
-      if (n === 1) ins++
-      else if (n === 2) upd++
+      const hidden = HIDDEN_INDICATORS.has(it.name)
+      const { points } = await upsertIndicatorWithPoints(conn, { name: it.name, groupName: it.groupName, data: it.data, hidden })
+      if (points > 0) ins++
+      else upd++
+      totalPoints += points
+      console.log('[Refresh]   ' + it.name + (hidden ? ' (hidden)' : '') + ': ' + points + ' 个明细点')
     }
-    console.log(`[Refresh] 写入完成: ${ins} 新增, ${upd} 更新\n`)
+    console.log('[Refresh] 写入完成: ' + ins + ' 个指标有数据, ' + upd + ' 个无数据, 共 ' + totalPoints + ' 个明细点\n')
+
   } finally {
     await conn.end()
   }
@@ -95,3 +174,4 @@ main().catch((e) => {
   console.error('[Refresh] 异常:', e)
   process.exit(1)
 })
+

scripts/seed.cjs

@@ -92,16 +92,8 @@ async function main() {
   }
   console.log('[Strategy]    upsert 策略: ' + n2 + ' 行 (1=新增, 2=更新)');
 
-  // Indicator 表: 改由 scripts/refresh-indicators.cjs 从 World Bank API 拉取最新数据
-  // 旧 4 个金融指标 (国债/LPR) 无稳定 JSON 数据源, 暂不维护
-  const indicators = [];
-  let n3 = 0;
-  for (const i of indicators) {
-    n3 += await upsertByName(conn, 'Indicator',
-      { name: i.name, groupName: i.groupName, data: JSON.stringify(i.data), updatedAt: new Date() },
-      'name');
-  }
-  console.log('[Indicator]   upsert 指标: ' + n3 + ' 行 (1=新增, 2=更新)');
+  // Indicator 表: 改由 scripts/refresh-indicators.cjs 管理 (2026-08 重构后数据存 IndicatorPoint 明细表)
+  // 本脚本不再写入 Indicator, 如需初始化指标请运行 npm run data:refresh
 
   const article = {
     title: '欢迎使用 iBoard',