diff --git a/README.md b/README.md index 72d64a5..9388a6a 100644 --- a/README.md +++ b/README.md @@ -35,11 +35,19 @@ - + - + + + + + + + + + @@ -112,11 +120,16 @@ - **SSE 流式进度**:长任务实时推送进度,支持刷新 / 切页后**重连恢复**(相同参数任务只启动一次) - **统计输出**:净值曲线 · 夏普 · 最大回撤 · 胜率 · 每笔交易明细 -### 📡 实时监控(Strategy Monitor) +### 📡 监控中心(Monitor) -- **盘中 SSE 推送**:行情刷新(`quotes_updated`)+ 策略告警(`strategy_alert`)双事件流,前端实时弹通知 -- **策略监控**:订阅策略的 entry / exit 信号 + 自定义提醒条件(如 `rsi_14 > 80`),命中即推送 -- **Webhook 告警**:命中规则后可选推送外部 webhook +**统一监控规则引擎** —— 一个页面管理所有类型的监控,实时推送 + 持久化触发记录: + +- **四类监控**:策略监控 · 个股信号监控(选信号即加) · 个股价格/涨跌监控 · 全市场异动监控 +- **灵活条件**:多条件 AND/OR 组合 + 冷却期去重(防刷屏) + 严重级别(info/warn/critical) +- **多入口配置**:监控中心页面新建规则 · 个股详情页「加监控」· 策略卡片一键开启 +- **实时 SSE 推送**:命中规则后右下角弹窗通知(可配声效) + 持久化到 `alerts.jsonl` +- **触发记录**:时间倒序展示,支持按来源过滤 · 单条删除 · 清空 · 点击查看个股日K +- **菜单未读徽标**:离开监控中心后有新触发,菜单显示未读数;进入页面后清零 ### 🤖 AI 策略生成(可选) @@ -207,7 +220,7 @@ pnpm dev # http://localhost:3011 3. **自选**页:添加跟踪标的;点代码进 **K 线**页看蜡烛图 + 买卖点 4. **选股**页:点任一内置策略卡片即时扫描;或用自定义信号组合条件 5. **回测**页:选策略 / 信号 + 时间区间 → 跑回测 → 看净值 / 夏普 / 交易明细(SSE 实时进度) -6. **监控**页:配置告警规则,盘中 SSE 推送行情与策略信号;命中后写入告警日志(可选 webhook) +6. **监控中心**页:配置监控规则(策略/个股信号/价格/市场异动),盘中 SSE 实时弹窗通知 + 持久化触发记录;或在个股详情页点「加监控」快速添加 --- @@ -273,7 +286,8 @@ DATA_DIR=./data # Parquet / DuckDB 数据存储目录 | **2** | Polars enriched 流水线 + Screener + 信号扫描 | ✅ | | **3** | vectorbt 回测 + T+1 + 手续费 + 止损 + max-hold | ✅ | | **4** | 监控引擎 + 告警规则 + Webhook + APScheduler 盘后定时 | ✅ | -| **v2** | 自定义信号 / 策略商店 / AI 策略生成 / 外部数据源插件 / 早晚报 / Onboarding | 🚧 | +| **5** | 统一监控中心 + 四类监控规则 + 实时推送 + 持久化触发记录 + 声效通知 | ✅ | +| **v2** | Webhook 推送(QMT/掘金下单) · 板块异动 · 早晚报 · 更多扩展 | 🚧 | --- diff --git a/VERSION b/VERSION index 02dc6f6..d516242 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v0.1.19 +v0.1.28 diff --git a/backend/app/__init__.py b/backend/app/__init__.py index 688ef21..b5d5881 100644 --- a/backend/app/__init__.py +++ b/backend/app/__init__.py @@ -1,3 +1,3 @@ """TickFlow Stock Panel backend.""" -__version__ = "0.1.0" +__version__ = "0.1.28" diff --git a/backend/app/api/alerts.py b/backend/app/api/alerts.py new file mode 100644 index 0000000..ab27b10 --- /dev/null +++ b/backend/app/api/alerts.py @@ -0,0 +1,129 @@ +"""告警触发记录 API — 查询/清空/生成演示数据 alerts.jsonl。""" +from __future__ import annotations + +import random +import time +from pathlib import Path + +from fastapi import APIRouter, HTTPException, Request + +from app.services import alert_store + +router = APIRouter(prefix="/api/alerts", tags=["alerts"]) + + +def _data_dir(request: Request) -> Path: + return request.app.state.repo.store.data_dir + + +@router.get("") +def list_alerts( + request: Request, + days: int = 7, + limit: int = 5000, + source: str | None = None, + type: str | None = None, +): + """查询触发记录 (时间倒序)。""" + events = alert_store.list_recent( + _data_dir(request), days=days, limit=limit, source=source, type=type, + ) + total = alert_store.count(_data_dir(request)) + return {"alerts": events, "total": total} + + +@router.delete("") +def clear_alerts(request: Request): + """清空全部触发记录。""" + n = alert_store.clear(_data_dir(request)) + return {"ok": True, "cleared": n} + + +@router.delete("/{ts}") +def delete_alert(ts: int, request: Request): + """删除单条触发记录 (按 ts 毫秒时间戳)。""" + deleted = alert_store.delete_one(_data_dir(request), ts) + if not deleted: + raise HTTPException(status_code=404, detail="记录不存在") + return {"ok": True} + + +# ── 演示数据生成 (仅 Dev 页用) ───────────────────────── + +_DEMO_STOCKS = [ + ("600519.SH", "贵州茅台"), ("000001.SZ", "平安银行"), ("300750.SZ", "宁德时代"), + ("002594.SZ", "比亚迪"), ("000858.SZ", "五粮液"), ("601318.SH", "中国平安"), + ("002475.SZ", "立讯精密"), ("600036.SH", "招商银行"), ("000725.SZ", "京东方A"), + ("300059.SZ", "东方财富"), +] +_DEMO_TEMPLATES = [ + ("signal", "MA金叉触发", ["signal_ma_golden_5_20"], "info"), + ("signal", "放量突破新高", ["signal_volume_surge", "signal_n_day_high"], "warn"), + ("signal", "MACD金叉", ["signal_macd_golden"], "info"), + ("signal", "跌破MA20", ["signal_ma20_breakdown"], "info"), + ("price", "涨幅超 5%", [], "warn"), + ("price", "RSI 极度超卖", [], "warn"), + ("price", "跌幅超 3%", [], "info"), + ("market", "涨停封板", ["signal_limit_up"], "critical"), + ("market", "连板异动", ["signal_limit_up"], "warn"), + ("market", "炸板", ["signal_broken_limit_up"], "warn"), + ("strategy", "策略「趋势突破」买入信号", ["signal_n_day_high", "signal_volume_surge"], "info"), + ("strategy", "策略「趋势突破」卖出信号", ["signal_ma20_breakdown"], "info"), + ("strategy", "策略「新低反转」买入信号", ["signal_n_day_low"], "warn"), +] + + +@router.post("/seed") +def seed_demo_alerts(request: Request, count: int = 12, recent: bool = True): + """生成演示触发记录 (Dev 页用)。 + + Args: + count: 生成条数 (1-50) + recent: True=时间戳设为"刚刚"(用于测试闪烁效果); False=分散在近3天 + """ + count = max(1, min(50, count)) + now_ms = int(time.time() * 1000) + events = [] + for i in range(count): + source, message, signals, severity = _DEMO_TEMPLATES[i % len(_DEMO_TEMPLATES)] + sym, name = _DEMO_STOCKS[i % len(_DEMO_STOCKS)] + # recent 模式: 时间戳从现在往前每条错开 30 秒 (最新在前) + ts = now_ms - (i * 30000) if recent else now_ms - random.randint(60, 4320) * 60 * 1000 + events.append({ + "ts": ts, + "rule_id": f"demo_rule_{i}", + "rule_name": message, + "source": source, + "type": source, + "symbol": sym, + "name": name, + "message": message, + "price": round(random.uniform(8, 1800), 2), + "change_pct": round(random.uniform(-0.06, 0.098), 4), + "signals": signals, + "severity": severity, + }) + alert_store.append_many(_data_dir(request), events) + + # 同步推入 SSE 队列, 让所有连着 SSE 的客户端实时收到 (不依赖轮询) + qs = getattr(request.app.state, "quote_service", None) + if qs: + # 转成 SSE 推送格式 (和 _evaluate_monitors 一致) + sse_alerts = [{ + "source": ev["source"], + "type": ev["type"], + "rule_id": ev.get("rule_id"), + "symbol": ev["symbol"], + "name": ev["name"], + "message": ev["message"], + "price": ev["price"], + "change_pct": ev["change_pct"], + "signals": ev["signals"], + "severity": ev.get("severity", "info"), + } for ev in events] + with qs._lock: + qs._pending_alerts.extend(sse_alerts) + qs._alert_event.set() + + return {"ok": True, "generated": len(events)} + diff --git a/backend/app/api/data.py b/backend/app/api/data.py index b1feec7..2afe935 100644 --- a/backend/app/api/data.py +++ b/backend/app/api/data.py @@ -701,10 +701,29 @@ def table_schema(request: Request, table: str) -> list[dict]: @router.get("/version") def get_version(request: Request) -> dict: - """返回当前项目版本号（读取项目根目录 VERSION 文件）。""" + """返回当前项目版本号。 + + 优先从 pyproject.toml 读取 (项目权威版本源), + 回退到 VERSION 文件, 最后兜底 v0.0.0。 + """ from app.config import settings - version_file = Path(settings.data_dir).parent / "VERSION" - version = "v0.0.0" + project_root = Path(settings.data_dir).parent + + # 1. 优先读 pyproject.toml + pyproject = project_root / "pyproject.toml" + if pyproject.exists(): + for line in pyproject.read_text(encoding="utf-8").splitlines(): + if line.strip().startswith("version"): + # version = "0.1.28" + v = line.split("=", 1)[1].strip().strip('"').strip("'") + if v: + return {"version": f"v{v}" if not v.startswith("v") else v} + + # 2. 回退到 VERSION 文件 + version_file = project_root / "VERSION" if version_file.exists(): - version = version_file.read_text(encoding="utf-8").strip() or version - return {"version": version} + v = version_file.read_text(encoding="utf-8").strip() + if v: + return {"version": v} + + return {"version": "v0.0.0"} diff --git a/backend/app/api/kline.py b/backend/app/api/kline.py index 308282b..860ece8 100644 --- a/backend/app/api/kline.py +++ b/backend/app/api/kline.py @@ -55,6 +55,21 @@ def search_instruments( return {"results": rows} +@router.post("/instruments/names") +def instruments_names(request: Request, symbols: list[str]): + """批量查股票名称。传入 symbol 列表, 返回 {symbol: name}。""" + if not symbols: + return {"names": {}} + repo = request.app.state.repo + df = repo.get_instruments() + if df.is_empty(): + return {"names": {}} + import polars as pl + matched = df.filter(pl.col("symbol").is_in(symbols)).select(["symbol", "name"]) + names = {row["symbol"]: row["name"] for row in matched.iter_rows(named=True)} + return {"names": names} + + def _get_stock_info(repo, symbol: str) -> dict: """从 instruments 视图查标的名称 + 股本。""" try: diff --git a/backend/app/api/monitor_rules.py b/backend/app/api/monitor_rules.py new file mode 100644 index 0000000..4902231 --- /dev/null +++ b/backend/app/api/monitor_rules.py @@ -0,0 +1,212 @@ +"""监控规则 API 路由 — HTTP 请求 → 调用 monitor_rules 模块 → 同步引擎内存态。 + +只做胶水: 校验 → 持久化 → 失效引擎内存态。不含评估逻辑。 +""" +from __future__ import annotations + +from pathlib import Path + +from fastapi import APIRouter, HTTPException, Request +from pydantic import BaseModel + +from app.strategy import monitor_rules + +router = APIRouter(prefix="/api/monitor-rules", tags=["monitor-rules"]) + + +def _data_dir(request: Request) -> Path: + return request.app.state.repo.store.data_dir + + +def _sync_engine(request: Request) -> None: + """保存/删除后,把最新规则集 reload 到引擎内存态。""" + engine = getattr(request.app.state, "monitor_engine", None) + if engine is not None: + rules = monitor_rules.load_all(_data_dir(request)) + engine.set_rules(rules) + + +# ── Pydantic 模型 ─────────────────────────────────────── +class ConditionModel(BaseModel): + field: str + op: str # truth | > >= < <= == != + value: float | None = None # op 非 truth 时必填 + + +class RuleModel(BaseModel): + id: str + name: str + enabled: bool = True + type: str # strategy | signal | price | market + scope: str = "symbols" # symbols | all | sector + symbols: list[str] = [] + sector: str | None = None + strategy_id: str | None = None + direction: str = "entry" # entry | exit | both + conditions: list[ConditionModel] = [] + logic: str = "and" # and | or + cooldown_seconds: int = 3600 + severity: str = "info" # info | warn | critical + webhook_url: str = "" # Webhook 推送地址 (推送到 QMT 等外部软件, 开发中) + webhook_enabled: bool = False + message: str = "" + + +# ── 字段选项 ───────────────────────────────────────────── +@router.get("/options") +def get_options(request: Request): + """返回可选字段、信号列、运算符、枚举,供前端表单使用。""" + from app.indicators.pipeline import ENRICHED_COLUMNS + from app.strategy.custom_signals import ALLOWED_FIELDS, load_all as load_csg + + # 阈值字段 (带中文标签) + threshold_fields = [ + {"key": f, "label": ENRICHED_COLUMNS.get(f, f)} + for f in sorted(ALLOWED_FIELDS) + ] + # 内置信号列 (布尔, 用于 op=truth) + builtin_signals = [ + {"key": k, "label": v} + for k, v in ENRICHED_COLUMNS.items() + if k.startswith("signal_") + ] + # 自定义信号列 (csg_) + custom_sigs = [] + try: + for cs in load_csg(_data_dir(request)): + if cs.get("enabled") is not False: + custom_sigs.append({ + "key": f"csg_{cs['id']}", + "label": cs.get("name", cs["id"]), + }) + except Exception: + pass + + return { + "threshold_fields": threshold_fields, + "builtin_signals": builtin_signals, + "custom_signals": custom_sigs, + "operators": [">", ">=", "<", "<=", "==", "!="], + "types": [ + {"key": "signal", "label": "个股信号"}, + {"key": "price", "label": "价格/涨跌"}, + {"key": "market", "label": "市场异动"}, + {"key": "strategy", "label": "策略监控"}, + ], + "scopes": [ + {"key": "symbols", "label": "指定股票"}, + {"key": "all", "label": "全市场"}, + {"key": "sector", "label": "板块"}, + ], + "logics": [ + {"key": "and", "label": "全部满足 (AND)"}, + {"key": "or", "label": "任一满足 (OR)"}, + ], + "severities": [ + {"key": "info", "label": "普通"}, + {"key": "warn", "label": "警告"}, + {"key": "critical", "label": "重要"}, + ], + "directions": [ + {"key": "entry", "label": "买入"}, + {"key": "exit", "label": "卖出"}, + {"key": "both", "label": "买卖都报"}, + ], + } + + +# ── 列表 ─────────────────────────────────────────────── +@router.get("") +def list_rules(request: Request): + rules = monitor_rules.load_all(_data_dir(request)) + # 按 created_at 倒序 + rules.sort(key=lambda r: r.get("created_at", ""), reverse=True) + return {"rules": rules} + + +# ── 新建 / 更新 ──────────────────────────────────────── +@router.post("") +def save_rule(req: RuleModel, request: Request): + rule = monitor_rules.normalize(req.model_dump()) + # 编辑现有规则时, 保留原 created_at (避免按时间排序时位置跳动) + existing = monitor_rules.load_one(_data_dir(request), rule["id"]) + if existing and existing.get("created_at"): + rule["created_at"] = existing["created_at"] + try: + monitor_rules.validate(rule) + except ValueError as e: + raise HTTPException(status_code=400, detail=str(e)) + monitor_rules.save_one(_data_dir(request), rule) + _sync_engine(request) + return {"ok": True, "rule": rule} + + +# ── 删除 ─────────────────────────────────────────────── +@router.delete("/{rule_id}") +def delete_rule(rule_id: str, request: Request): + if not monitor_rules.ID_RE.match(rule_id): + raise HTTPException(status_code=400, detail="规则 id 非法") + deleted = monitor_rules.delete_one(_data_dir(request), rule_id) + if not deleted: + raise HTTPException(status_code=404, detail="规则不存在") + _sync_engine(request) + return {"ok": True} + + +# ── 演示数据生成 (仅 Dev 页用) ───────────────────────── + +import time as _time +from datetime import datetime, timezone + + +def _demo_rule(rule_id: str, name: str, rtype: str, scope: str, symbols: list[str], + conditions: list[dict], logic: str = "or", cooldown: int = 3600, + severity: str = "info", message: str = "") -> dict: + return monitor_rules.normalize({ + "id": rule_id, + "name": name, + "type": rtype, + "scope": scope, + "symbols": symbols, + "conditions": conditions, + "logic": logic, + "cooldown_seconds": cooldown, + "severity": severity, + "message": message, + "enabled": True, + }) + + +_DEMO_RULES_TEMPLATE = [ + ("个股信号 · 茅台放量突破", "signal", "symbols", ["600519.SH"], + [{"field": "signal_volume_surge", "op": "truth"}, + {"field": "signal_n_day_high", "op": "truth"}], "or", "info"), + ("个股信号 · 宁德金叉", "signal", "symbols", ["300750.SZ"], + [{"field": "signal_ma_golden_5_20", "op": "truth"}], "or", "info"), + ("价格 · 平安跌幅监控", "price", "symbols", ["000001.SZ"], + [{"field": "change_pct", "op": "<", "value": -0.03}], "or", "warn", "warn"), + ("价格 · 比亚迪RSI超卖", "price", "symbols", ["002594.SZ"], + [{"field": "rsi_14", "op": "<", "value": 30}], "and", "warn", "warn"), + ("市场异动 · 全市场涨停", "market", "all", [], + [{"field": "signal_limit_up", "op": "truth"}], "or", "critical", "critical"), + ("市场异动 · 全市场炸板", "market", "all", [], + [{"field": "signal_broken_limit_up", "op": "truth"}], "or", "warn", "warn"), + ("市场异动 · 跌幅超5%", "market", "all", [], + [{"field": "change_pct", "op": "<", "value": -0.05}], "or", "warn", "warn"), + ("个股信号 · 茅台跌破MA20", "signal", "symbols", ["600519.SH"], + [{"field": "signal_ma20_breakdown", "op": "truth"}], "or", "info"), +] + + +@router.post("/seed") +def seed_demo_rules(request: Request): + """生成演示监控规则 (Dev 页用)。覆盖 signal/price/market 三类。""" + ts = int(_time.time() * 1000) + created = [] + for i, (name, rtype, scope, symbols, conditions, logic, severity, sev) in enumerate(_DEMO_RULES_TEMPLATE): + rule_id = f"demo_{ts}_{i}" + rule = _demo_rule(rule_id, name, rtype, scope, symbols, conditions, logic, 3600, sev) + monitor_rules.save_one(_data_dir(request), rule) + created.append(rule_id) + _sync_engine(request) + return {"ok": True, "generated": len(created), "ids": created} diff --git a/backend/app/api/settings.py b/backend/app/api/settings.py index aa475ee..8ffa77b 100644 --- a/backend/app/api/settings.py +++ b/backend/app/api/settings.py @@ -352,34 +352,31 @@ class RealtimeMonitorConfigIn(BaseModel): @router.put("/preferences/realtime-monitor") def update_realtime_monitor_config(req: RealtimeMonitorConfigIn, request: Request) -> dict: - """更新实时监控配置。""" + """更新实时监控配置。策略监控统一迁移为 MonitorRule,由监控引擎评估。""" from app.services import preferences cfg = req.model_dump(exclude_none=True) result = preferences.set_realtime_monitor_config(cfg) - # 如果策略监控开关变化，更新 StrategyMonitorService 的监控池 + # 策略监控开关/池变化 → 同步迁移为 type=strategy 规则 + reload 引擎 if req.strategy_monitor_ids is not None or req.strategy_monitor_enabled is not None: - monitor = getattr(request.app.state, "strategy_monitor", None) - if monitor: - if preferences.get_strategy_monitor_enabled(): - # 从策略引擎加载监控配置 - engine = getattr(request.app.state, "strategy_engine", None) - ids = preferences.get_strategy_monitor_ids() - if engine and ids: - monitor.stop_all() - for sid in ids: - try: - s = engine.get(sid) - monitor.start(sid, { - "entry_signals": s.entry_signals, - "exit_signals": s.exit_signals, - "alerts": s.alerts, - }) - except ValueError: - pass - else: - monitor.stop_all() + monitor_engine = getattr(request.app.state, "monitor_engine", None) + strategy_engine = getattr(request.app.state, "strategy_engine", None) + data_dir = request.app.state.repo.store.data_dir + if monitor_engine is not None and strategy_engine is not None: + from app.strategy import monitor_rules as mr_store + try: + if preferences.get_strategy_monitor_enabled(): + ids = preferences.get_strategy_monitor_ids() + names = {s.id: s.name for s in strategy_engine.list_strategies()} + mr_store.migrate_strategy_monitors(data_dir, ids, names) + else: + # 关闭策略监控: 停用所有策略规则 + mr_store.migrate_strategy_monitors(data_dir, [], {}) + # reload 规则到引擎 + monitor_engine.set_rules(mr_store.load_all(data_dir)) + except Exception: + pass return result diff --git a/backend/app/api/strategy.py b/backend/app/api/strategy.py index a462e5e..dae6ddc 100644 --- a/backend/app/api/strategy.py +++ b/backend/app/api/strategy.py @@ -426,36 +426,8 @@ def delete_strategy(strategy_id: str, request: Request): # ── 监控 ───────────────────────────────────────────────────────────── - - -@router.post("/monitor/start") -def monitor_start(req: MonitorStartRequest, request: Request): - engine = _get_engine(request) - monitor = _get_monitor(request) - try: - s = engine.get(req.strategy_id) - except ValueError as e: - raise HTTPException(status_code=404, detail=str(e)) from e - - monitor.start(req.strategy_id, { - "entry_signals": s.entry_signals, - "exit_signals": s.exit_signals, - "alerts": s.alerts, - }) - return {"ok": True, "watching": list(monitor.watching.keys())} - - -@router.post("/monitor/stop/{strategy_id}") -def monitor_stop(strategy_id: str, request: Request): - monitor = _get_monitor(request) - monitor.stop(strategy_id) - return {"ok": True, "watching": list(monitor.watching.keys())} - - -@router.get("/monitor/status") -def monitor_status(request: Request): - monitor = _get_monitor(request) - return {"watching": list(monitor.watching.keys())} +# 注: 策略监控已统一迁移到 MonitorRuleEngine (监控通知页), 旧的 start/stop/status +# 路由已移除。StrategyMonitorService 类保留 (其 _check_signals 被 MonitorRuleEngine 复用)。 # ── 热重载 ─────────────────────────────────────────────────────────── diff --git a/backend/app/main.py b/backend/app/main.py index 0c6590f..219c4f2 100644 --- a/backend/app/main.py +++ b/backend/app/main.py @@ -11,7 +11,7 @@ from fastapi.responses import FileResponse from fastapi.staticfiles import StaticFiles from app import __version__ -from app.api import analysis, backtest, data, ext_data, financials, indices, intraday, kline, overview, pipeline, screener, settings as settings_api, signals, strategy, watchlist +from app.api import analysis, backtest, data, ext_data, financials, indices, intraday, kline, monitor_rules, alerts, overview, pipeline, screener, settings as settings_api, signals, strategy, watchlist from app.api.routes import router as core_router from app.config import settings from app.jobs import daily_pipeline @@ -113,6 +113,32 @@ async def lifespan(app: FastAPI): app.state.strategy_engine = strategy_engine logger.info("strategy engine loaded: %d strategies", len(strategy_engine.list_strategies())) + # 通用监控规则引擎: 启动时 reload 规则到内存态 (修复重启后告警失效) + from app.strategy.monitor import MonitorRuleEngine + from app.strategy import monitor_rules as mr_store + from app.services import preferences + monitor_engine = MonitorRuleEngine() + monitor_engine.set_strategy_engine(strategy_engine) + + # 自动迁移: 把旧 strategy_monitor_ids 同步为 type=strategy 规则 (统一到监控页) + try: + if preferences.get_strategy_monitor_enabled(): + ids = preferences.get_strategy_monitor_ids() + if ids: + names = {s.id: s.name for s in strategy_engine.list_strategies()} + mr_store.migrate_strategy_monitors(store.data_dir, ids, names) + logger.info("strategy monitor migrated: %d strategies", len(ids)) + except Exception as e: # noqa: BLE001 + logger.warning("strategy monitor migration failed: %s", e) + + try: + rules = mr_store.load_all(store.data_dir) + monitor_engine.set_rules(rules) + logger.info("monitor engine loaded: %d rules", monitor_engine.rule_count) + except Exception as e: # noqa: BLE001 + logger.warning("monitor engine load failed: %s", e) + app.state.monitor_engine = monitor_engine + yield if app.state.scheduler: @@ -139,11 +165,13 @@ app = FastAPI( lifespan=lifespan, ) -# 开发期 CORS 允许 Vite dev server +# CORS: 允许局域网访问 (自托管场景, 放开所有来源) +# 注: allow_credentials=True 与 allow_origins=['*'] 不能共存 (浏览器规范), +# 本项目认证走 header (API Key), 不依赖 cookie, 故关闭 credentials 换取通配来源。 app.add_middleware( CORSMiddleware, - allow_origins=["http://localhost:3011", "http://127.0.0.1:3011"], - allow_credentials=True, + allow_origins=["*"], + allow_credentials=False, allow_methods=["*"], allow_headers=["*"], ) @@ -165,6 +193,8 @@ app.include_router(financials.router) app.include_router(settings_api.router) app.include_router(strategy.router) app.include_router(signals.router) +app.include_router(monitor_rules.router) +app.include_router(alerts.router) # 生产期静态文件(前端 dist) _static = Path(settings.static_dir) diff --git a/backend/app/services/alert_store.py b/backend/app/services/alert_store.py new file mode 100644 index 0000000..961331a --- /dev/null +++ b/backend/app/services/alert_store.py @@ -0,0 +1,209 @@ +"""告警触发记录存储 — JSONL 追加写 + 滚动清理。 + +职责: + - 把每次触发的 AlertEvent 追加写入 data/user_data/alerts.jsonl + - 提供查询 (按来源/类型过滤、时间倒序、限量) + - 滚动清理: 保留近 N 天 + 上限 M 条 (取交集) + +设计: + - JSONL 每行一个 JSON 对象,便于增量追加和流式读取 + - 清理策略: 追加后按需 prune (按 ts 删旧),避免文件无限膨胀 + - 读时全量加载到内存过滤 (记录量受上限约束, 5000 条量级无压力) +""" +from __future__ import annotations + +import json +import logging +import threading +from pathlib import Path + +logger = logging.getLogger(__name__) + +# 保留策略 +MAX_DAYS = 7 +MAX_RECORDS = 5000 +# 每隔多少次写入触发一次清理 (避免每次写都 prune) +PRUNE_EVERY = 20 + +_lock = threading.Lock() +_write_count = 0 + + +def _path(data_dir: Path) -> Path: + p = data_dir / "user_data" / "alerts.jsonl" + p.parent.mkdir(parents=True, exist_ok=True) + return p + + +def append(data_dir: Path, event: dict) -> None: + """追加一条触发记录。event 应含 ts(毫秒)、rule_id、source 等字段。""" + line = json.dumps(event, ensure_ascii=False) + with _lock: + p = _path(data_dir) + with p.open("a", encoding="utf-8") as f: + f.write(line + "\n") + global _write_count + _write_count += 1 + if _write_count >= PRUNE_EVERY: + _write_count = 0 + _prune_locked(p) + + +def append_many(data_dir: Path, events: list[dict]) -> None: + """批量追加。""" + if not events: + return + with _lock: + p = _path(data_dir) + with p.open("a", encoding="utf-8") as f: + for ev in events: + f.write(json.dumps(ev, ensure_ascii=False) + "\n") + global _write_count + _write_count += len(events) + if _write_count >= PRUNE_EVERY: + _write_count = 0 + _prune_locked(p) + + +def list_recent( + data_dir: Path, + days: int = MAX_DAYS, + limit: int = MAX_RECORDS, + source: str | None = None, + type: str | None = None, +) -> list[dict]: + """读取近 N 天记录,按时间倒序,支持按 source/type 过滤。""" + import time + cutoff = (time.time() - days * 86400) * 1000 # 毫秒 + out: list[dict] = [] + p = _path(data_dir) + if not p.exists(): + return [] + try: + with p.open("r", encoding="utf-8") as f: + for line in f: + line = line.strip() + if not line: + continue + try: + ev = json.loads(line) + except Exception: + continue + if ev.get("ts", 0) < cutoff: + continue + if source and ev.get("source") != source: + continue + if type and ev.get("type") != type: + continue + out.append(ev) + except Exception as e: + logger.warning("alert_store read failed: %s", e) + return [] + # 时间倒序 + 截断 + out.sort(key=lambda x: x.get("ts", 0), reverse=True) + return out[:limit] + + +def clear(data_dir: Path) -> int: + """清空全部记录,返回清除的条数。""" + with _lock: + p = _path(data_dir) + if not p.exists(): + return 0 + count = 0 + try: + with p.open("r", encoding="utf-8") as f: + count = sum(1 for line in f if line.strip()) + except Exception: + pass + p.write_text("", encoding="utf-8") + return count + + +def delete_one(data_dir: Path, ts: int) -> bool: + """删除指定 ts 的单条记录,返回是否删除成功。 + + JSONL 无主键, 用 ts(毫秒时间戳) 作为标识。 + 若存在多条同 ts, 只删第一条。 + """ + with _lock: + p = _path(data_dir) + if not p.exists(): + return False + kept: list[dict] = [] + deleted = False + try: + with p.open("r", encoding="utf-8") as f: + for line in f: + line = line.strip() + if not line: + continue + try: + ev = json.loads(line) + except Exception: + continue + if not deleted and ev.get("ts") == ts: + deleted = True + continue + kept.append(ev) + except Exception as e: + logger.warning("alert_store delete_one read failed: %s", e) + return False + if not deleted: + return False + try: + with p.open("w", encoding="utf-8") as f: + for ev in kept: + f.write(json.dumps(ev, ensure_ascii=False) + "\n") + except Exception as e: + logger.warning("alert_store delete_one write failed: %s", e) + return False + return True + return count + + +def count(data_dir: Path) -> int: + """返回当前记录总数。""" + p = _path(data_dir) + if not p.exists(): + return 0 + try: + with p.open("r", encoding="utf-8") as f: + return sum(1 for line in f if line.strip()) + except Exception: + return 0 + + +def _prune_locked(p: Path) -> None: + """(调用方需持锁) 保留近 MAX_DAYS 天 + 上限 MAX_RECORDS 条。""" + import time + cutoff = (time.time() - MAX_DAYS * 86400) * 1000 + kept: list[dict] = [] + try: + with p.open("r", encoding="utf-8") as f: + for line in f: + line = line.strip() + if not line: + continue + try: + ev = json.loads(line) + except Exception: + continue + if ev.get("ts", 0) >= cutoff: + kept.append(ev) + except FileNotFoundError: + return + except Exception as e: + logger.warning("alert_store prune read failed: %s", e) + return + # 上限截断 (保留最新的) + if len(kept) > MAX_RECORDS: + kept.sort(key=lambda x: x.get("ts", 0)) + kept = kept[-MAX_RECORDS:] + # 重写文件 + try: + with p.open("w", encoding="utf-8") as f: + for ev in kept: + f.write(json.dumps(ev, ensure_ascii=False) + "\n") + except Exception as e: + logger.warning("alert_store prune write failed: %s", e) diff --git a/backend/app/services/quote_service.py b/backend/app/services/quote_service.py index c61ae66..fdd6392 100644 --- a/backend/app/services/quote_service.py +++ b/backend/app/services/quote_service.py @@ -57,6 +57,7 @@ class QuoteService: self._update_event = threading.Event() # SSE 通知: 行情更新后 set self._alert_event = threading.Event() # SSE 通知: 有告警时 set self._pending_alerts: list[dict] = [] # 待推送的告警 + self._max_pending_alerts: int = 1000 # 背压上限: 超出丢弃最旧 self._strategy_monitor = None # 延迟注入 self._app_state = None # 延迟注入 (FastAPI app.state) @@ -448,9 +449,7 @@ class QuoteService: # ================================================================ def _evaluate_monitors(self, daily_df: pl.DataFrame, quote_extra: pl.DataFrame | None) -> None: - """行情更新后评估策略监控，并刷新策略结果缓存。""" - from app.services import preferences - + """行情更新后评估统一监控规则引擎,并刷新策略结果缓存。""" try: # 获取 enriched 数据 (刚算好的) enriched_today, enriched_date = self.get_enriched_today() @@ -459,34 +458,50 @@ class QuoteService: all_alerts: list[dict] = [] - # 1. 策略监控评估 - if preferences.get_strategy_monitor_enabled(): - monitor = getattr(self._app_state, "strategy_monitor", None) if self._app_state else None - if monitor and monitor.watching: - strategy_alerts = monitor.on_quote_update(enriched_today) - for a in strategy_alerts: - all_alerts.append({ - "source": "strategy", - "type": a.type, - "strategy_id": a.strategy_id, - "symbol": a.symbol, - "name": a.name, - "message": a.message, - "price": a.price, - "change_pct": a.change_pct, - "signals": a.signals, - }) + # 通用监控规则评估 (统一引擎: signal/price/market/strategy) + if self._app_state: + engine = getattr(self._app_state, "monitor_engine", None) + if engine and engine.rule_count > 0: + rule_events = engine.evaluate(enriched_today) + if rule_events: + # 落盘到 alerts.jsonl + try: + from app.services import alert_store + alert_store.append_many( + self._app_state.repo.store.data_dir, rule_events, + ) + except Exception as e: # noqa: BLE001 + logger.warning("告警落盘失败: %s", e) + # 转为 SSE 推送格式 (兼容旧 alert schema) + for ev in rule_events: + all_alerts.append({ + "source": ev["source"], + "type": ev["type"], + "rule_id": ev.get("rule_id"), + "strategy_id": ev.get("rule_id") if ev["source"] == "strategy" else None, + "symbol": ev["symbol"], + "name": ev["name"], + "message": ev["message"], + "price": ev["price"], + "change_pct": ev["change_pct"], + "signals": ev["signals"], + "severity": ev.get("severity", "info"), + }) - # 2. 刷新策略结果缓存 (实时行情开启时，每轮行情更新后自动重算) + # 刷新策略结果缓存 (实时行情开启时，每轮行情更新后自动重算) if self._enabled and self._app_state: self._refresh_strategy_cache(enriched_today, enriched_date) - # 推入待推送队列 + 通知 SSE + # 推入待推送队列 + 通知 SSE (含背压保护) if all_alerts: with self._lock: self._pending_alerts.extend(all_alerts) + # 背压: 超出上限丢弃最旧 + if len(self._pending_alerts) > self._max_pending_alerts: + overflow = len(self._pending_alerts) - self._max_pending_alerts + self._pending_alerts = self._pending_alerts[overflow:] self._alert_event.set() - logger.info("策略监控评估完成: %d 条通知", len(all_alerts)) + logger.info("监控评估完成: %d 条通知", len(all_alerts)) except Exception as e: # noqa: BLE001 logger.warning("监控评估失败: %s", e) diff --git a/backend/app/strategy/monitor.py b/backend/app/strategy/monitor.py index 9b5b262..10f3b32 100644 --- a/backend/app/strategy/monitor.py +++ b/backend/app/strategy/monitor.py @@ -3,15 +3,23 @@ 职责: 接收实时行情 DataFrame → 检查监控中策略的信号/提醒 → 推送告警。 不知道: 策略加载逻辑、AI、API、配置持久化、回测。 依赖: 外部调用 on_quote_update() 传入实时数据。 + +本模块含两个评估器: + 1. StrategyMonitorService — 旧的策略监控 (type=strategy),第二步迁移到 MonitorRuleEngine + 2. MonitorRuleEngine — 通用规则引擎,覆盖 signal/price/market/strategy 四类, + 支持 scope (symbols/all/sector) + 多条件 AND/OR + cooldown 去重 """ from __future__ import annotations import logging +import time from dataclasses import dataclass, field from typing import Any, Callable import polars as pl +from app.strategy.custom_signals import _OP_BUILDERS # type: ignore # 复用运算符构造器 + logger = logging.getLogger(__name__) @@ -202,3 +210,259 @@ class StrategyMonitorService: row.get("change_pct"), )) return results + + +# ================================================================ +# 通用监控规则引擎 MonitorRuleEngine +# ================================================================ + +_SIGNAL_PREFIXES = ("signal_", "csg_") + + +def _is_signal_field(field: str) -> bool: + return any(field.startswith(p) for p in _SIGNAL_PREFIXES) + + +def _build_condition_mask(df: pl.DataFrame, conditions: list[dict], logic: str) -> pl.DataFrame: + """根据 conditions + logic 构建过滤后的命中 DataFrame。 + + conditions: [{"field","op","value"?}] — op=truth 为布尔信号, 否则阈值比较 + logic: "and" | "or" + 返回命中行 (含 symbol/name/close/change_pct + 各信号列) + """ + cols = set(df.columns) + parts: list[pl.Expr] = [] + for c in conditions: + field = c["field"] + if field not in cols: + return df.head(0) # 字段缺失,无法判定 → 空结果 + op = c["op"] + if op == "truth": + parts.append(pl.col(field).fill_null(False)) + elif op in _OP_BUILDERS: + parts.append(_OP_BUILDERS[op](pl.col(field), c["value"])) + else: + return df.head(0) + if not parts: + return df.head(0) + if logic == "or": + mask = pl.any_horizontal(parts) + else: + mask = pl.all_horizontal(parts) + return df.filter(mask) + + +class MonitorRuleEngine: + """通用监控规则引擎 — 接收实时行情 DataFrame,评估所有规则,返回 AlertEvent。 + + 与 StrategyMonitorService 的区别: + - 规则来自 monitor_rules 存储 (用户可配), 而非写死的 strategy config + - 支持 scope (symbols/all/sector) 过滤作用域 + - 支持 conditions + logic (AND/OR) 任意组合 + - ★ cooldown 去重: 同一 (rule_id, symbol) 在冷却期内不重复触发 + """ + + def __init__(self, alert_handler: Callable[[dict], None] | None = None): + self._alert_handler = alert_handler + self._rules: dict[str, dict] = {} # rule_id → rule + # (rule_id, symbol) → 上次触发时间戳(秒)。用于 cooldown 去重。 + self._last_fire: dict[tuple[str, str], float] = {} + self._strategy_engine = None # 延迟注入, type=strategy 规则用它读策略信号 + + def set_strategy_engine(self, engine) -> None: + """注入 StrategyEngine, type=strategy 规则据此读策略的 entry/exit_signals。""" + self._strategy_engine = engine + + # ── 规则管理 ─────────────────────────────────────── + def set_rules(self, rules: list[dict]) -> None: + """批量设置规则 (覆盖)。用于启动时 reload。""" + self._rules = {} + for r in rules: + if r.get("enabled") is not False: + self._rules[r["id"]] = r + logger.info("MonitorRuleEngine: 装载 %d 条规则", len(self._rules)) + + def add_rule(self, rule: dict) -> None: + if rule.get("enabled") is not False: + self._rules[rule["id"]] = rule + else: + self._rules.pop(rule["id"], None) + + def remove_rule(self, rule_id: str) -> None: + self._rules.pop(rule_id, None) + # 清理对应的 cooldown 记录 + self._last_fire = {k: v for k, v in self._last_fire.items() if k[0] != rule_id} + + def clear(self) -> None: + self._rules.clear() + self._last_fire.clear() + + @property + def rules(self) -> dict[str, dict]: + return dict(self._rules) + + @property + def rule_count(self) -> int: + return len(self._rules) + + # ── 评估 ─────────────────────────────────────────── + def evaluate(self, df: pl.DataFrame) -> list[dict]: + """行情更新后评估所有规则。 + + Args: + df: 实时 enriched 数据 (~5500行, 含 signal_/csg_/指标列) + Returns: + 触发的 AlertEvent dict 列表 (含 ts/rule_id/source/type/symbol/...) + """ + if not self._rules or df.is_empty(): + return [] + + now = time.time() + events: list[dict] = [] + + for rule_id, rule in self._rules.items(): + try: + events.extend(self._evaluate_rule(df, rule, now)) + except Exception as e: + logger.warning("规则评估失败 %s: %s", rule_id, e) + + return events + + def _evaluate_rule(self, df: pl.DataFrame, rule: dict, now: float) -> list[dict]: + """评估单条规则,返回触发的 events。""" + # 1. 按 scope 过滤作用域 + scoped = self._apply_scope(df, rule) + if scoped.is_empty(): + return [] + + # 2. 根据 type 构建命中集 + hit_rows: list[tuple[str, Any, Any, Any, list[str]]] = [] # (symbol,name,price,pct,signals) + + rtype = rule.get("type", "signal") + if rtype == "strategy": + # 策略类型: 从 StrategyEngine 读策略的 entry/exit_signals, 按 direction 评估 + hit_rows = self._match_strategy(scoped, rule) + else: + # signal / price / market: 通用条件匹配 + hit_rows = self._match_conditions(scoped, rule) + + if not hit_rows: + return [] + + # 3. cooldown 去重 + 生成 events + cooldown = rule.get("cooldown_seconds", 3600) + severity = rule.get("severity", "info") + message = rule.get("message", "") or self._default_message(rule) + source = rtype if rtype != "strategy" else "strategy" + ev_type = rule.get("direction", "entry") if rtype == "strategy" else rtype + + events: list[dict] = [] + for sym, name, price, pct, hit_sigs in hit_rows: + key = (rule["id"], sym) + last = self._last_fire.get(key) + if last is not None and (now - last) < cooldown: + continue # 冷却期内, 跳过 + self._last_fire[key] = now + ev = { + "ts": int(now * 1000), + "rule_id": rule["id"], + "rule_name": rule.get("name", ""), + "source": source, + "type": ev_type, + "symbol": sym, + "name": name, + "message": message, + "price": price, + "change_pct": pct, + "signals": hit_sigs, + "severity": severity, + } + events.append(ev) + if self._alert_handler: + try: + self._alert_handler(ev) + except Exception as e: + logger.warning("alert handler failed: %s", e) + + return events + + @staticmethod + def _apply_scope(df: pl.DataFrame, rule: dict) -> pl.DataFrame: + """按 scope 过滤 DataFrame。""" + scope = rule.get("scope", "symbols") + if scope == "all": + return df + if scope == "symbols": + syms = rule.get("symbols", []) + if not syms: + return df.head(0) + return df.filter(pl.col("symbol").is_in(syms)) + if scope == "sector": + # sector 过滤: 需 df 含板块列 (后续接入 ext_data JOIN) + # 当前先返回全量, sector 精确过滤第二步完善 + return df + return df + + def _match_strategy( + self, df: pl.DataFrame, rule: dict, + ) -> list[tuple[str, Any, Any, Any, list[str]]]: + """策略类型评估: 从 StrategyEngine 读策略信号, 按 direction 用 OR 匹配。 + + direction=entry → 策略 entry_signals + direction=exit → 策略 exit_signals + direction=both → entry + exit 合并 (命中信号名区分来源) + """ + if self._strategy_engine is None: + return [] + sid = rule.get("strategy_id") + if not sid: + return [] + try: + s = self._strategy_engine.get(sid) + except Exception: + return [] + if s is None: + return [] + + direction = rule.get("direction", "entry") + # 收集要评估的信号 (OR 组合), 与旧 StrategyMonitorService 行为一致 + sigs: list[str] = [] + if direction in ("entry", "both"): + sigs.extend(s.entry_signals or []) + if direction in ("exit", "both"): + sigs.extend(s.exit_signals or []) + if not sigs: + return [] + + # 复用旧的 _check_signals 静态方法 (已支持 signal_/csg_ 前缀) + return StrategyMonitorService._check_signals(df, sigs) + + @staticmethod + def _match_conditions( + df: pl.DataFrame, rule: dict, + ) -> list[tuple[str, Any, Any, Any, list[str]]]: + """按 conditions + logic 匹配,返回命中行 [(symbol,name,price,pct,signals)]。""" + conditions = rule.get("conditions", []) + logic = rule.get("logic", "and") + if not conditions: + return [] + hit_df = _build_condition_mask(df, conditions, logic) + results = [] + for row in hit_df.iter_rows(named=True): + sym = row.get("symbol", "") + name = row.get("name") + price = row.get("close") + pct = row.get("change_pct") + # 收集命中的信号列名 (仅 op=truth 且为真的) + hit_sigs = [ + c["field"] for c in conditions + if c.get("op") == "truth" and row.get(c["field"]) + ] + results.append((sym, name, price, pct, hit_sigs)) + return results + + @staticmethod + def _default_message(rule: dict) -> str: + rtype = rule.get("type", "signal") + name_map = {"signal": "信号触发", "price": "价格触发", "market": "市场异动", "strategy": "策略触发"} + return name_map.get(rtype, "监控触发") diff --git a/backend/app/strategy/monitor_rules.py b/backend/app/strategy/monitor_rules.py new file mode 100644 index 0000000..08392fb --- /dev/null +++ b/backend/app/strategy/monitor_rules.py @@ -0,0 +1,241 @@ +"""监控规则 — 统一的 MonitorRule 模型,覆盖策略/个股信号/个股价格/市场异动四类。 + +职责: + - 从 data/user_data/monitor_rules/*.json 加载规则定义 + - 校验规则字段合法性 + - 提供 CRUD (load_all / save_one / delete_one) + +不知道: 行情评估引擎、API、告警落盘。纯函数 + 文件存储。 + +设计 (镜像 custom_signals.py 的写法): + - 一对象一文件 + glob 全扫 + 全量重写 + - 字段白名单复用 custom_signals.ALLOWED_FIELDS (阈值条件) + 信号列清单 (布尔条件) + - id 正则与 custom_signals 一致,保证可纳入同一索引体系 +""" +from __future__ import annotations + +import json +import logging +import re +from datetime import datetime, timezone +from pathlib import Path + +from app.strategy.custom_signals import ALLOWED_FIELDS + +logger = logging.getLogger(__name__) + +# ── 常量 ──────────────────────────────────────────────── +ID_RE = re.compile(r"^[a-z0-9_]{1,40}$") +RULE_TYPES = {"strategy", "signal", "price", "market"} +SCOPES = {"symbols", "all", "sector"} +LOGICS = {"and", "or"} +DIRECTIONS = {"entry", "exit", "both"} +SEVERITIES = {"info", "warn", "critical"} +OPS = {">", ">=", "<", "<=", "==", "!="} + +# 布尔信号列前缀 (op=truth 时 field 取这些) +_SIGNAL_PREFIXES = ("signal_", "csg_") + + +# ── 持久化 (镜像 custom_signals.py) ───────────────────── +def _dir(data_dir: Path) -> Path: + d = data_dir / "user_data" / "monitor_rules" + d.mkdir(parents=True, exist_ok=True) + return d + + +def _path(data_dir: Path, rule_id: str) -> Path: + return _dir(data_dir) / f"{rule_id}.json" + + +def load_all(data_dir: Path) -> list[dict]: + """读取全部监控规则。损坏的文件被跳过。""" + d = _dir(data_dir) + out: list[dict] = [] + for f in sorted(d.glob("*.json")): + try: + out.append(json.loads(f.read_text(encoding="utf-8"))) + except Exception as e: + logger.warning("monitor rule load failed %s: %s", f.name, e) + return out + + +def load_one(data_dir: Path, rule_id: str) -> dict | None: + p = _path(data_dir, rule_id) + if not p.exists(): + return None + try: + return json.loads(p.read_text(encoding="utf-8")) + except Exception as e: + logger.warning("monitor rule load failed %s: %s", rule_id, e) + return None + + +def save_one(data_dir: Path, rule: dict) -> None: + p = _path(data_dir, rule["id"]) + p.parent.mkdir(parents=True, exist_ok=True) + p.write_text(json.dumps(rule, ensure_ascii=False, indent=2), encoding="utf-8") + + +def delete_one(data_dir: Path, rule_id: str) -> bool: + p = _path(data_dir, rule_id) + if p.exists(): + p.unlink() + return True + return False + + +# ── 校验 ──────────────────────────────────────────────── +def _is_signal_field(field: str) -> bool: + """判断 field 是否为布尔信号列 (signal_ / csg_ 前缀)。""" + return any(field.startswith(p) for p in _SIGNAL_PREFIXES) + + +def validate(rule: dict) -> None: + """校验一条监控规则,非法则抛 ValueError (含中文信息)。""" + rid = rule.get("id", "") + if not isinstance(rid, str) or not ID_RE.match(rid): + raise ValueError(f"规则 id 非法 (仅小写字母数字下划线, 1-40字符): {rid!r}") + if not isinstance(rule.get("name"), str) or not rule["name"].strip(): + raise ValueError("规则 name 不能为空") + if rule.get("type") not in RULE_TYPES: + raise ValueError(f"type 必须是 {RULE_TYPES} 之一") + + # 策略类型: 需要 strategy_id + direction,conditions 可空 + if rule.get("type") == "strategy": + if not rule.get("strategy_id"): + raise ValueError("策略类型规则必须指定 strategy_id") + if rule.get("direction", "entry") not in DIRECTIONS: + raise ValueError(f"direction 必须是 {DIRECTIONS} 之一") + else: + # 信号/价格/市场类型: 需要 conditions + conds = rule.get("conditions") + if not isinstance(conds, list) or len(conds) == 0: + raise ValueError("conditions 不能为空") + if len(conds) > 8: + raise ValueError("conditions 最多 8 条") + if rule.get("logic", "and") not in LOGICS: + raise ValueError(f"logic 必须是 {LOGICS} 之一") + for i, c in enumerate(conds): + if not isinstance(c, dict): + raise ValueError(f"第 {i+1} 个条件格式错误") + field = c.get("field", "") + op = c.get("op", "") + if op == "truth": + # 布尔信号: field 必须是 signal_/csg_ 前缀 + if not _is_signal_field(field): + raise ValueError(f"第 {i+1} 个条件: op=truth 时 field 必须是信号列 (signal_/csg_ 前缀): {field!r}") + elif op in OPS: + # 阈值比较: field 必须在白名单, 需要 value + if field not in ALLOWED_FIELDS: + raise ValueError(f"第 {i+1} 个条件: 阈值字段 {field!r} 不在白名单") + if not isinstance(c.get("value"), (int, float)): + raise ValueError(f"第 {i+1} 个条件: value 必须是数字") + else: + raise ValueError(f"第 {i+1} 个条件: op {op!r} 非法 (应为 truth 或 {OPS})") + + # scope 校验 + if rule.get("scope", "symbols") not in SCOPES: + raise ValueError(f"scope 必须是 {SCOPES} 之一") + if rule.get("scope") == "symbols": + syms = rule.get("symbols") + if not isinstance(syms, list) or len(syms) == 0: + raise ValueError("scope=symbols 时 symbols 不能为空") + + # 其余枚举 + if rule.get("severity", "info") not in SEVERITIES: + raise ValueError(f"severity 必须是 {SEVERITIES} 之一") + cd = rule.get("cooldown_seconds", 3600) + if not isinstance(cd, int) or cd < 0: + raise ValueError("cooldown_seconds 必须是非负整数") + + +def normalize(rule: dict) -> dict: + """补全默认字段,返回规范化后的规则 (不校验)。""" + r = dict(rule) + r.setdefault("enabled", True) + r.setdefault("scope", "symbols") + r.setdefault("symbols", []) + r.setdefault("sector", None) + r.setdefault("strategy_id", None) + r.setdefault("direction", "entry") + r.setdefault("conditions", []) + r.setdefault("logic", "and") + r.setdefault("cooldown_seconds", 3600) + r.setdefault("severity", "info") + r.setdefault("message", "") + r.setdefault("webhook_url", "") + r.setdefault("webhook_enabled", False) + r.setdefault("created_at", datetime.now(timezone.utc).isoformat()) + return r + + +# 策略监控自动迁移的规则 id 前缀 (固定, 保证幂等) +STRATEGY_RULE_PREFIX = "mr_strategy_" + + +def strategy_rule_id(strategy_id: str) -> str: + """策略监控规则 id = mr_strategy_{strategy_id}。""" + return f"{STRATEGY_RULE_PREFIX}{strategy_id}" + + +def migrate_strategy_monitors(data_dir: Path, strategy_ids: list[str], strategy_names: dict[str, str]) -> list[dict]: + """把 preferences.strategy_monitor_ids 里的策略,同步生成/更新 type=strategy 规则。 + + 幂等: 已存在的策略规则会被更新 (方向/名称),不会重复创建。 + 已从 strategy_ids 移除的策略, 其规则会被停用 (enabled=False) 而非删除 (保留历史触发记录的关联)。 + + Args: + data_dir: 数据目录 + strategy_ids: 当前监控池中的策略 id 列表 + strategy_names: {strategy_id: 策略名} 用于规则显示名 + Returns: + 本次生成/更新的规则列表 + """ + desired = set(strategy_ids) + existing = load_all(data_dir) + # 已存在的策略规则 {strategy_id: rule} + existing_strategy_rules: dict[str, dict] = {} + for r in existing: + rid = r.get("id", "") + if rid.startswith(STRATEGY_RULE_PREFIX): + sid = rid[len(STRATEGY_RULE_PREFIX):] + if sid: + existing_strategy_rules[sid] = r + + touched: list[dict] = [] + # 1. 为当前监控池的策略 upsert 规则 + for sid in desired: + rule_id = strategy_rule_id(sid) + name = strategy_names.get(sid, sid) + rule = existing_strategy_rules.get(sid) + if rule is None: + rule = normalize({ + "id": rule_id, + "name": f"策略监控 · {name}", + "type": "strategy", + "scope": "all", + "strategy_id": sid, + "direction": "entry", + "conditions": [], + "cooldown_seconds": 3600, + "enabled": True, + }) + else: + rule = dict(rule) + rule["enabled"] = True + rule["strategy_id"] = sid + rule["name"] = f"策略监控 · {name}" + rule.setdefault("scope", "all") + rule.setdefault("direction", "entry") + save_one(data_dir, rule) + touched.append(rule) + + # 2. 不在监控池的策略 → 停用其规则 (不删除) + for sid, rule in existing_strategy_rules.items(): + if sid not in desired and rule.get("enabled") is not False: + rule = dict(rule) + rule["enabled"] = False + save_one(data_dir, rule) + + return touched diff --git a/dev.ps1 b/dev.ps1 index d9ca3be..c9bc16a 100644 --- a/dev.ps1 +++ b/dev.ps1 @@ -148,14 +148,14 @@ $backendJob = Start-Job -Name 'backend' -ScriptBlock { $PID | Out-File -FilePath $pidFile -Encoding ascii -Force $env:PYTHONUNBUFFERED = '1' Set-Location $dir - & .\.venv\Scripts\python.exe -m uvicorn app.main:app --reload --port $port 2>&1 + & .\.venv\Scripts\python.exe -m uvicorn app.main:app --reload --host 0.0.0.0 --port $port 2>&1 } -ArgumentList $backendPidFile, $BackendDir, $BackendPort $frontendJob = Start-Job -Name 'frontend' -ScriptBlock { param($pidFile, $dir, $port) $PID | Out-File -FilePath $pidFile -Encoding ascii -Force Set-Location $dir - & pnpm dev --port $port 2>&1 + & pnpm dev --host 0.0.0.0 --port $port 2>&1 } -ArgumentList $frontendPidFile, $FrontendDir, $FrontendPort # Wait up to 5 seconds for the PID files to materialise diff --git a/dev.sh b/dev.sh index 987a86e..4304b36 100755 --- a/dev.sh +++ b/dev.sh @@ -120,14 +120,14 @@ echo ( cd "$BACKEND_DIR" - uv run uvicorn app.main:app --reload --port "$BACKEND_PORT" 2>&1 \ + uv run uvicorn app.main:app --reload --host 0.0.0.0 --port "$BACKEND_PORT" 2>&1 \ | prefix_awk "$(printf "${BLUE}[backend ]${NC} ")" ) & PIDS+=("$!") ( cd "$FRONTEND_DIR" - pnpm dev --port "$FRONTEND_PORT" 2>&1 \ + pnpm dev --host 0.0.0.0 --port "$FRONTEND_PORT" 2>&1 \ | prefix_awk "$(printf "${GREEN}[frontend]${NC} ")" ) & PIDS+=("$!") diff --git a/docs/screenshots/concept-analysis.png b/docs/screenshots/concept-analysis.png new file mode 100644 index 0000000..13255c7 Binary files /dev/null and b/docs/screenshots/concept-analysis.png differ diff --git a/docs/screenshots/dashboard.png b/docs/screenshots/dashboard.png index 7d4af68..bba7a1e 100644 Binary files a/docs/screenshots/dashboard.png and b/docs/screenshots/dashboard.png differ diff --git a/docs/screenshots/monitor.png b/docs/screenshots/monitor.png new file mode 100644 index 0000000..cf4a9bb Binary files /dev/null and b/docs/screenshots/monitor.png differ diff --git a/docs/screenshots/screener.png b/docs/screenshots/screener.png index c4f6c09..f1d1804 100644 Binary files a/docs/screenshots/screener.png and b/docs/screenshots/screener.png differ diff --git a/frontend/src/components/AlertToast.tsx b/frontend/src/components/AlertToast.tsx new file mode 100644 index 0000000..b8ec877 --- /dev/null +++ b/frontend/src/components/AlertToast.tsx @@ -0,0 +1,142 @@ +import { useCallback, useEffect, useState } from 'react' +import { useNavigate } from 'react-router-dom' +import { motion, AnimatePresence } from 'framer-motion' +import { Bell, TrendingUp, TrendingDown, X } from 'lucide-react' +import type { AlertEvent } from '@/lib/api' +import { fmtPct, fmtPrice } from '@/lib/format' +import { cn } from '@/lib/cn' +import { playNotificationSound } from '@/lib/notificationSound' + +// ===== 全局状态 (模块级, 仿 Toast.tsx 模式) ===== +type Item = { id: number; alert: AlertEvent } +let _id = 0 +let _queue: Item[] = [] +const AUTO_DISMISS = 5000 // 5 秒自动消失 +const _listeners: Set<(items: Item[]) => void> = new Set() + +/** 从 localStorage 读取配置 */ +function getEnabled(): boolean { + try { + const v = localStorage.getItem('alert_toast_enabled') + return v === null ? true : v === '1' // 默认开启 + } catch { return true } +} + +function getMaxVisible(): number { + try { + const v = parseInt(localStorage.getItem('alert_toast_max') || '', 10) + return v >= 1 && v <= 10 ? v : 3 // 默认 3, 范围 1-10 + } catch { return 3 } +} + +/** 通知外部配置变更后刷新 (设置页改了配置后调用) */ +export function refreshAlertToastConfig() { + _emit() +} + +function _emit() { _listeners.forEach(fn => fn([..._queue])) } + +/** 推入监控告警通知 (外部调用) */ +export function pushAlertToast(alert: AlertEvent) { + if (!getEnabled()) return // 开关关闭: 不弹 + const maxVisible = getMaxVisible() + const item = { id: ++_id, alert } + _queue = [..._queue, item] + // 超出上限: 丢弃最旧的 + if (_queue.length > maxVisible) { + _queue = _queue.slice(-maxVisible) + } + _emit() + setTimeout(() => dismiss(item.id), AUTO_DISMISS) + playNotificationSound() // 播放声效 +} + +/** 手动关闭 */ +export function dismiss(id: number) { + _queue = _queue.filter(t => t.id !== id) + _emit() +} + +// ===== 配色 ===== +const SEVERITY_BAR: Record = { + info: 'bg-accent', warn: 'bg-warning', critical: 'bg-danger', +} +const SOURCE_BADGE: Record = { + strategy: { label: '策略', cls: 'bg-amber-400/15 text-amber-400' }, + signal: { label: '信号', cls: 'bg-accent/15 text-accent' }, + price: { label: '价格', cls: 'bg-emerald-400/15 text-emerald-400' }, + market: { label: '异动', cls: 'bg-purple-500/15 text-purple-400' }, +} + +// ===== 容器 — 挂在 Layout ===== +export function AlertToastContainer() { + const [items, setItems] = useState([]) + const navigate = useNavigate() + + const sub = useCallback(() => { + _listeners.add(setItems) + return () => { _listeners.delete(setItems) } + }, []) + useEffect(sub, [sub]) + + // 点击通知 → 跳转监控中心 + 关闭当前通知 + const handleClick = (id: number) => { + dismiss(id) + navigate('/monitor') + } + + if (!items.length) return null + + return ( +
+ + {items.map(item => { + const ev = item.alert + const sev = SEVERITY_BAR[ev.severity ?? 'info'] ?? SEVERITY_BAR.info + const badge = SOURCE_BADGE[ev.source] ?? { label: ev.source, cls: 'bg-elevated text-muted' } + const pct = ev.change_pct ?? 0 + return ( + handleClick(item.id)} + className="pointer-events-auto relative overflow-hidden rounded-xl border border-border/60 bg-surface/95 backdrop-blur-md shadow-2xl pl-3 pr-2 py-2.5 cursor-pointer hover:border-accent/40 hover:shadow-accent/10 transition-all" + > + {/* 左侧色条 */} +
+ + {/* 顶行: 分类标签 + 代码/名称 + 涨跌幅 + 关闭 */} +
+ + {badge.label} + + {ev.symbol && {ev.symbol}} + {ev.name && {ev.name}} + {ev.change_pct != null && ( + = 0 ? 'text-danger' : 'text-bear')}> + {pct >= 0 ? : } + {fmtPct(pct)} + + )} + +
+ + {/* 底行: 触发消息 + 价格 */} +
+ + {ev.message && {ev.message}} + {ev.price != null && {fmtPrice(ev.price)}} +
+ + ) + })} + +
+ ) +} diff --git a/frontend/src/components/EChartsCandlestick.tsx b/frontend/src/components/EChartsCandlestick.tsx index ec093ea..f7bd977 100644 --- a/frontend/src/components/EChartsCandlestick.tsx +++ b/frontend/src/components/EChartsCandlestick.tsx @@ -828,6 +828,11 @@ export function EChartsCandlestick({ html += `${d.low.toFixed(2)}` html += `收` html += `${d.close.toFixed(2)}` + // 涨跌幅 (收盘后, 换手前; 和收间隔一些距离) + if (prev) { + const chgPct = (chg / prev.close * 100) + html += `${isUp ? '+' : ''}${chgPct.toFixed(2)}%` + } if (turnoverRate != null) { html += `换手` html += `${turnoverRate.toFixed(2)}%` @@ -1051,7 +1056,14 @@ export function EChartsCandlestick({ html += `低` html += `${d.low.toFixed(2)}` html += `收` - html += `${d.close.toFixed(2)}` + const prevClose0 = data[idx-1]?.close ?? d.close + const clr0 = d.close >= prevClose0 ? THEME.bull : THEME.bear + html += `${d.close.toFixed(2)}` + // 涨跌幅 (收盘后, 换手前; 和收间隔一些距离) + if (idx > 0) { + const chgPct0 = ((d.close - prevClose0) / prevClose0 * 100) + html += `${chgPct0 >= 0 ? '+' : ''}${chgPct0.toFixed(2)}%` + } if (turnoverRate != null) { html += `换手` html += `${turnoverRate.toFixed(2)}%` diff --git a/frontend/src/components/Layout.tsx b/frontend/src/components/Layout.tsx index ae95d7f..2a46515 100644 --- a/frontend/src/components/Layout.tsx +++ b/frontend/src/components/Layout.tsx @@ -1,8 +1,10 @@ +import { useEffect } from 'react' import { NavLink, Outlet, useNavigate } from 'react-router-dom' import { useQuery, useQueryClient } from '@tanstack/react-query' import { motion } from 'framer-motion' import { useQuoteStream } from '@/lib/useQuoteStream' import { ToastContainer } from '@/components/Toast' +import { AlertToastContainer } from '@/components/AlertToast' import { useCapabilities, useSettings, @@ -37,6 +39,7 @@ import { import { Logo } from './Logo' import { api, type IndexQuote } from '@/lib/api' import { cn } from '@/lib/cn' +import { setCurrentTotal as setAlertTotal, useUnreadAlerts } from '@/lib/monitorBadge' // 品牌色 — 只用于 logo / brand 区域,不影响功能语义色 const BRAND = '#8B5CF6' @@ -62,7 +65,7 @@ const nav = [ { to: '/financials', label: '财务', icon: FileText }, { to: '/indices', label: '指数', icon: BarChart3 }, { to: '/trading', label: '交易', icon: Cable }, - { to: '/monitor', label: '监控通知', icon: RadioTower }, + { to: '/monitor', label: '监控中心', icon: RadioTower }, { to: '/data', label: '数据', icon: Database }, ] as const @@ -81,6 +84,21 @@ function indexPctClass(v: number | null | undefined) { return Number(v) >= 0 ? 'text-bull' : 'text-bear' } +/** 监控中心未读徽标 — 仅在非监控页且有未读时显示。 */ +function MonitorBadge({ active }: { active: boolean }) { + const unread = useUnreadAlerts() + // 尊重用户设置: 可在菜单设置里关闭数字提示 + const badgeEnabled = (() => { + try { return localStorage.getItem('monitor_badge_enabled') !== '0' } catch { return true } + })() + if (active || unread <= 0 || !badgeEnabled) return null + return ( + + {unread > 99 ? '99+' : unread} + + ) +} + function SidebarIndexQuotes({ rows, items }: { rows: IndexQuote[] | undefined; items: CoreIndex[] }) { if (items.length === 0) return null const quoteBySymbol = new Map((rows ?? []).map(q => [q.symbol, q])) @@ -253,6 +271,20 @@ export function Layout() { const isTrading = quoteStatus?.is_trading_hours ?? false const isFreeTier = (caps?.label ?? '').toLowerCase().startsWith('free') + // 轮询触发记录总数 → 更新监控中心徽标 (每 15 秒) + const alertsTotalQuery = useQuery({ + queryKey: ['alerts-total'], + queryFn: () => api.alertsList({ days: 7, limit: 1 }), + refetchInterval: 15000, + refetchIntervalInBackground: true, + select: (data) => data.total, + }) + // 只在拿到真实总数时同步徽标 (避免 data=undefined 时传 0 重置 lastSeen) + const alertsTotal = alertsTotalQuery.data + useEffect(() => { + if (alertsTotal != null) setAlertTotal(alertsTotal) + }, [alertsTotal]) + // 合并内置页面 + 可见的扩展分析菜单 const analysisNav = (analysisMenus?.items ?? []) .filter(m => m.visible) @@ -344,8 +376,14 @@ export function Layout() { ) } > - - {label} + {({ isActive }) => ( + <> + + {label} + {/* 监控中心徽标: 仅非监控页且有未读时显示 */} + {to === '/monitor' && } + + )} ))} @@ -445,6 +483,7 @@ export function Layout() { +
) } diff --git a/frontend/src/components/StockInfoBar.tsx b/frontend/src/components/StockInfoBar.tsx index 2fa3fa6..1063249 100644 --- a/frontend/src/components/StockInfoBar.tsx +++ b/frontend/src/components/StockInfoBar.tsx @@ -1,5 +1,5 @@ import { useState, type ReactNode } from 'react' -import { Settings2, BellRing } from 'lucide-react' +import { Settings2, RadioTower, Star } from 'lucide-react' import type { KlineRow, FinancialMetricRecord } from '@/lib/api' import { fmtPrice, fmtBigNum, fmtVolume } from '@/lib/format' import { ListColumnCustomizer } from '@/components/ListColumnCustomizer' @@ -18,6 +18,11 @@ interface Props { onFieldsChange: (fields: ColumnConfig[]) => void /** 财务指标最新一期（来自 useFinancialMetrics，受 Cap.FINANCIAL 门控） */ financialMetrics?: FinancialMetricRecord + /** 加监控回调 (个股弹窗传入, 有值时渲染 RadioTower 图标) */ + onMonitor?: () => void + /** 加自选回调 + 是否已自选 (有 onToggle 时渲染 Star 图标) */ + inWatchlist?: boolean + onToggleWatchlist?: () => void } /** @@ -86,7 +91,7 @@ function renderExtInline( ) } -export function StockInfoBar({ symbol, name, stockInfo, rows, fields, onFieldsChange, financialMetrics }: Props) { +export function StockInfoBar({ symbol, name, stockInfo, rows, fields, onFieldsChange, financialMetrics, onMonitor, inWatchlist, onToggleWatchlist }: Props) { // 弹窗开关：纯本地状态，与数据/配置无关，放早期 return 之前 const [customizerOpen, setCustomizerOpen] = useState(false) // ext 标签展开状态：按 symbol::colId，切股/切字段时互不干扰 @@ -209,14 +214,26 @@ export function StockInfoBar({ symbol, name, stockInfo, rows, fields, onFieldsCh {isUp ? '+' : ''}{fmtPrice(chgPct)}% - {/* 右侧操作按钮：监控通知 + 信息条配置 */} + {/* 右侧操作按钮：加自选 + 加监控 + 信息条配置 */}
- + {onToggleWatchlist && ( + + )} + {onMonitor && ( + + )} - - | - {/* 刷新 */}
+ {/* 触发信息条 (来自监控触发记录) */} + {triggerInfo && ( +
+ {/* 左: 触发标记 + 时间 */} +
+ ⚡ 触发 + {triggerInfo.ts && ( + + {new Date(triggerInfo.ts).toLocaleString('zh-CN', { month: '2-digit', day: '2-digit', hour: '2-digit', minute: '2-digit' })} + + )} +
+ + {/* 中: 价格 + 涨跌幅 */} +
+ {triggerInfo.price != null && ( + {triggerInfo.price.toFixed(2)} + )} + {triggerInfo.changePct != null && ( + = 0 ? 'text-danger' : 'text-bear'}`}> + {triggerInfo.changePct >= 0 ? '+' : ''}{(triggerInfo.changePct * 100).toFixed(2)}% + + )} +
+ + {/* 右: 消息 + 信号标签 */} +
+ {triggerInfo.message && ( + {triggerInfo.message} + )} + {triggerInfo.signals && triggerInfo.signals.length > 0 && ( +
+ {triggerInfo.signals.map((s, j) => ( + {cnSignal(s)} + ))} +
+ )} +
+
+ )} + {/* K 线内容 */}
{ if (!showIntraday) setShowIntraday(true) }} dateRange={dateRange} + onMonitor={() => setShowMonitorEditor(true)} + inWatchlist={inWatchlist} + onToggleWatchlist={() => toggleWatchlist.mutate()} />
+ + {/* 加监控编辑器弹层 */} + + {showMonitorEditor && symbol && ( + setShowMonitorEditor(false)} + > +
e.stopPropagation()}> + setShowMonitorEditor(false)} + onSaved={() => setShowMonitorEditor(false)} + /> +
+ + )} + )} diff --git a/frontend/src/components/monitor/RuleEditor.tsx b/frontend/src/components/monitor/RuleEditor.tsx new file mode 100644 index 0000000..a6dffdc --- /dev/null +++ b/frontend/src/components/monitor/RuleEditor.tsx @@ -0,0 +1,365 @@ +import { useState } from 'react' +import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query' +import { Save, X, Plus, Search } from 'lucide-react' +import { api, genRuleId, type MonitorRule, type MonitorCondition } from '@/lib/api' +import { QK } from '@/lib/queryKeys' +import { SignalPicker } from '@/components/screener/SignalPicker' + +interface Props { + /** 编辑现有规则;null=新建 */ + rule: MonitorRule | null + /** 新建时的预填值 (如个股弹窗传入 symbol/scope) */ + preset?: Partial + /** 极简模式: 个股场景, 隐藏 type/scope/阈值等, 只显示信号点选 */ + simple?: boolean + onClose: () => void + onSaved?: () => void +} + +const TYPE_DEFAULT_NAME: Record = { + signal: '个股信号监控', price: '价格监控', market: '市场异动监控', strategy: '策略监控', +} + +const emptyRule = (preset?: Partial): MonitorRule => ({ + id: genRuleId(), + name: '', + enabled: true, + type: 'signal', + scope: 'symbols', + symbols: [], + sector: null, + strategy_id: null, + direction: 'entry', + conditions: [], + logic: 'or', + cooldown_seconds: 3600, + severity: 'info', + message: '', + ...preset, +}) + +export function RuleEditor({ rule, preset, simple, onClose, onSaved }: Props) { + const qc = useQueryClient() + const options = useQuery({ queryKey: QK.monitorRuleOptions, queryFn: api.monitorRuleOptions }) + const strategies = useQuery({ queryKey: QK.screenerStrategies, queryFn: api.screenerStrategies }) + const [editing] = useState(!!rule) + const [draft, setDraft] = useState( + rule ? { ...rule, conditions: rule.conditions.map(c => ({ ...c })) } : emptyRule(preset), + ) + const [error, setError] = useState('') + const [symbolQuery, setSymbolQuery] = useState('') + const symbolSearch = useQuery({ + queryKey: QK.instrumentSearch(symbolQuery), + queryFn: () => api.instrumentSearch(symbolQuery, 20), + enabled: symbolQuery.length > 0, + }) + + const save = useMutation({ + mutationFn: () => { + const d = { ...draft } + // name 为空时用默认名 + if (!d.name.trim()) { + const base = TYPE_DEFAULT_NAME[d.type] ?? '监控规则' + d.name = d.scope === 'symbols' && d.symbols.length > 0 + ? `${base} · ${d.symbols[0]}${d.symbols.length > 1 ? ` 等${d.symbols.length}只` : ''}` + : base + } + if (d.type === 'strategy') { + if (!d.strategy_id) throw new Error('策略监控必须选择一个策略') + } else { + if (d.conditions.length === 0) throw new Error('至少选择一个触发条件') + for (const c of d.conditions) { + if (!c.field || !c.op) throw new Error('条件填写不完整') + if (c.op !== 'truth' && (c.value === null || c.value === undefined)) throw new Error('阈值条件需要数值') + } + } + if (d.scope === 'symbols' && d.symbols.length === 0) throw new Error('请选择至少一只股票') + return api.monitorRuleSave(d) + }, + onSuccess: () => { + qc.invalidateQueries({ queryKey: QK.monitorRules }) + onSaved?.() + onClose() + }, + onError: err => setError(String((err as any)?.message ?? err)), + }) + + // 条件编辑 + const updateCond = (idx: number, patch: Partial) => + setDraft(d => ({ ...d, conditions: d.conditions.map((c, i) => i === idx ? { ...c, ...patch } : c) })) + const addCond = (op: 'truth' | 'threshold') => + setDraft(d => ({ + ...d, + conditions: [...d.conditions, op === 'truth' + ? { field: 'signal_volume_surge', op: 'truth' } + : { field: 'rsi_14', op: '<', value: 30 }], + })) + const removeCond = (idx: number) => + setDraft(d => ({ ...d, conditions: d.conditions.filter((_, i) => i !== idx) })) + + const addSymbol = (sym: string) => { + if (!draft.symbols.includes(sym)) { + setDraft(d => ({ ...d, symbols: [...d.symbols, sym] })) + } + setSymbolQuery('') + } + + const thresholdFields = options.data?.threshold_fields ?? [] + const operators = options.data?.operators ?? ['>', '>=', '<', '<=', '==', '!='] + const selectedSignals = draft.conditions.filter(c => c.op === 'truth').map(c => c.field) + const thresholdConds = draft.conditions.filter(c => c.op !== 'truth') + + const onSignalPickerChange = (next: string[]) => { + const nonTruthConds = draft.conditions.filter(c => c.op !== 'truth') + const truthConds: MonitorCondition[] = next.map(field => ({ field, op: 'truth' })) + setDraft(d => ({ ...d, conditions: [...nonTruthConds, ...truthConds] })) + } + + // ── 极简模式: 只显示信号点选 + 可选描述 ── + if (simple) { + return ( +
+
+

{editing ? '编辑监控' : '加入监控'}

+ +
+ + {draft.symbols.length > 0 && ( +
+ {draft.symbols.map(s => ( + {s} + ))} +
+ )} + +
+
选择触发信号 (任一命中即报警)
+ +
+ + + + {error &&
{error}
} + +
+ + +
+
+ ) + } + + // ── 完整模式: 监控页新建/编辑 ── + return ( +
+
+
+

{editing ? '编辑监控规则' : '新建监控规则'}

+

规则标识自动生成,描述为可选。

+
+ +
+ + {/* 描述 (可选) + 类型 */} +
+ + +
+ + {/* 作用范围 */} +
+ 作用范围 +
+ + {draft.scope === 'symbols' && ( +
+ {draft.symbols.map(sym => ( + + {sym} + + + ))} +
+ setSymbolQuery(e.target.value)} + placeholder="搜索股票..." + className="h-7 w-32 rounded border border-border bg-base pl-6 pr-2 text-[11px] text-foreground focus:outline-none focus:border-accent/50" + /> + + {symbolSearch.data && symbolSearch.data.results.length > 0 && ( +
+ {symbolSearch.data.results.map(r => ( + + ))} +
+ )} +
+
+ )} + {draft.scope === 'all' && 对全市场所有股票生效} + {draft.scope === 'sector' && 板块精确过滤(开发中,当前等同全市场)} +
+
+ + {/* 触发条件 (非 strategy) */} + {draft.type !== 'strategy' && ( +
+
+ 触发条件 +
+ + + +
+
+ + {selectedSignals.length > 0 || (options.data?.builtin_signals ?? []).length > 0 ? ( +
+
信号条件 (点选)
+ +
+ ) : null} + + {thresholdConds.length > 0 && ( +
+ {thresholdConds.map((c, i) => { + const realIdx = draft.conditions.indexOf(c) + return ( +
+ {i === 0 && selectedSignals.length === 0 ? '当' : draft.logic === 'and' ? '且' : '或'} + + + updateCond(realIdx, { value: parseFloat(e.target.value) })} step="any" className="w-24 h-7 px-1.5 rounded bg-base border border-border text-[11px] font-mono text-foreground text-center focus:outline-none focus:border-accent/50" /> + +
+ ) + })} +
+ )} + + {draft.conditions.length === 0 && ( +
+ 点击上方「信号条件」或「阈值条件」添加触发规则 +
+ )} +
+ )} + + {/* strategy 类型: 选策略 + 方向 */} + {draft.type === 'strategy' && ( +
+ 策略与方向 +
+ + +
+

+ 策略监控自动评估策略的买卖信号。entry=买入信号,exit=卖出信号,both=两者都报。作用范围建议用「全市场」。 +

+
+ )} + + {/* 通知设置 */} +
+ + + +
+ + {/* Webhook 推送 (占位, 后续开发) */} +
+
+
+ Webhook 推送 + 开发中 +
+ +
+

+ 触发时把信号推送到外部软件 (如 QMT、掘金量化),实现自动下单。后续版本支持。 +

+
+ + {error &&
{error}
} + +
+ + +
+
+ ) +} diff --git a/frontend/src/components/screener/StrategyCard.tsx b/frontend/src/components/screener/StrategyCard.tsx index ba9a13f..6f88000 100644 --- a/frontend/src/components/screener/StrategyCard.tsx +++ b/frontend/src/components/screener/StrategyCard.tsx @@ -1,4 +1,4 @@ -import { Settings2, TrendingDown } from 'lucide-react' +import { Settings2, TrendingDown, RadioTower } from 'lucide-react' import { motion } from 'framer-motion' import { storage } from '@/lib/storage' @@ -30,7 +30,7 @@ const CARD_STYLES: Record void disabled: boolean onSettings: () => void + /** 是否已加入策略监控 */ + monitored?: boolean + /** 切换策略监控 (点击 RadioTower 图标) */ + onToggleMonitor?: () => void } export function StrategyCard({ name, description, source, active, count, expiredCount, loading, cardSize, - onRun, disabled, onSettings, + onRun, disabled, onSettings, monitored, onToggleMonitor, }: StrategyCardProps) { const cs = CARD_STYLES[cardSize] const activeCls = active @@ -118,9 +122,9 @@ export function StrategyCard({ <> + {onToggleMonitor && ( + + )} ) : cardSize === 'normal' ? ( <> + {onToggleMonitor && ( + + )} ) : ( /* mini */ @@ -187,6 +205,13 @@ export function StrategyCard({ )} {loading && } + {onToggleMonitor && ( + + )} + + + {error && ( +
+ + {error} +
+ )} + + {total > 0 && ( +
+
+
检测天数
+
{total}
+
+
+
有数据
+
{hasData}
+
+
+
缺失
+
{missing.length}
+
+
+ )} + + {results.length > 0 && ( +
+
看板 Dashboard选股 Screener策略 Screener
看板页面选股/策略页策略页
监控中心 Monitor概念分析 Concept
监控中心概念分析
回测 Backtest
+ + + + + + + + + + {results.map((r) => ( + + + + + + + ))} + +
日期分钟K条数数据来源状态
{r.date}{r.rows} + {r.source} + + {r.ok ? ( + + 有 + + ) : ( + + 缺失 + + )} +
+ + )} + + {missing.length > 0 && ( +
+
+ 缺失日期的诊断 +
+

+ 缺失日期若为周末/节假日属正常； + 若为停牌日（成交量为 0）也属正常； + 若为正常交易日（日K有成交量）却缺失分钟K， + 则是 TickFlow 数据源未提供该日分钟数据。 +

+
+ )} + + ) +} + +// ── 演示数据生成 ────────────────────────────────────── +function SeedPanel() { + const qc = useQueryClient() + const [count, setCount] = useState(12) + const [recent, setRecent] = useState(true) + const [msg, setMsg] = useState('') + + const seedMut = useMutation({ + mutationFn: () => api.alertSeed(count, recent), + onSuccess: (data) => { + setMsg(`已生成 ${data.generated} 条触发记录`) + qc.invalidateQueries({ queryKey: ['alerts'] }) + qc.invalidateQueries({ queryKey: ['alerts-total'] }) + setTimeout(() => setMsg(''), 4000) + }, + onError: () => { + setMsg('生成失败') + setTimeout(() => setMsg(''), 4000) + }, + }) + + const clearMut = useMutation({ + mutationFn: () => api.alertsClear(), + onSuccess: (data) => { + setMsg(`已清空 ${data.cleared} 条触发记录`) + qc.invalidateQueries({ queryKey: ['alerts'] }) + qc.invalidateQueries({ queryKey: ['alerts-total'] }) + resetBadge() + setTimeout(() => setMsg(''), 4000) + }, + }) + + const ruleSeedMut = useMutation({ + mutationFn: () => api.monitorRuleSeed(), + onSuccess: (data) => { + setMsg(`已生成 ${data.generated} 条监控规则`) + qc.invalidateQueries({ queryKey: ['monitor-rules'] }) + setTimeout(() => setMsg(''), 4000) + }, + onError: () => { + setMsg('规则生成失败') + setTimeout(() => setMsg(''), 4000) + }, + }) + + return ( +
+
+

监控触发记录演示数据

+

+ 生成模拟的触发记录,用于测试监控中心页面的展示效果、未读徽标、新增闪烁等功能。生成的数据可随时清空。 +

+
+ +
+
+
+ + setCount(Math.max(1, Math.min(50, Number(e.target.value) || 1)))} + className="w-24 rounded-btn border border-border bg-base px-3 py-1.5 text-sm text-foreground outline-none focus:border-accent" + /> +
+ +
+ +
+ + +
+
+ + {msg && ( +
{msg}
+ )} + + {/* 监控规则生成 */} +
+
+

监控规则

+

+ 生成多种类型的演示监控规则 (个股信号/价格/市场异动),用于测试监控中心规则列表展示。 +

+
+
+ +
+
+ +
+
使用说明
+ +
+
+ ) +} + +// ── Dev 主页面 ──────────────────────────────────────── +export function Dev() { + const [tab, setTab] = useState<'minute' | 'seed'>('seed') + + return ( +
+ + + +
+ } + /> +
+
+ {tab === 'minute' ? : } +
+
+ + ) +} diff --git a/frontend/src/pages/MinuteDataProbe.tsx b/frontend/src/pages/MinuteDataProbe.tsx deleted file mode 100644 index b2d30f5..0000000 --- a/frontend/src/pages/MinuteDataProbe.tsx +++ /dev/null @@ -1,189 +0,0 @@ -import { useState } from 'react' -import { Loader2, Search, AlertTriangle, CheckCircle2, XCircle } from 'lucide-react' -import { api } from '@/lib/api' - -interface ProbeResult { - date: string - rows: number - source: string - ok: boolean -} - -/** - * 分钟K数据探测页（隐藏路由，不暴露在菜单）。 - * 用于排查"点击日K蜡烛加载分钟K为 0 条"类问题。 - * 直接访问: /minute-probe - */ -export function MinuteDataProbe() { - const [symbol, setSymbol] = useState('603261.SH') - const [days, setDays] = useState(10) - const [loading, setLoading] = useState(false) - const [results, setResults] = useState([]) - const [error, setError] = useState(null) - - const runProbe = async () => { - const sym = symbol.trim().toUpperCase() - if (!sym) return - setLoading(true) - setError(null) - setResults([]) - - // 生成最近 N 天的日期（含非交易日，由后端返回行数判定） - const dates: string[] = [] - const today = new Date() - for (let i = 0; i < days; i++) { - const d = new Date(today) - d.setDate(d.getDate() - i) - dates.push(d.toISOString().slice(0, 10)) - } - - const out: ProbeResult[] = [] - try { - for (const date of dates) { - const r = await api.klineMinute(sym, date) - const rows = r.rows?.length ?? 0 - out.push({ - date, - rows, - source: r.source ?? (rows > 0 ? 'local' : 'none'), - ok: rows > 0, - }) - setResults([...out]) - } - } catch (e: any) { - setError(e?.message ?? String(e)) - } finally { - setLoading(false) - } - } - - const total = results.length - const hasData = results.filter((r) => r.ok).length - const missing = results.filter((r) => !r.ok) - - return ( -
-
-
-

分钟K数据探测

-

- 逐日调用 /api/kline/minute 接口， - 检测每只股票最近若干天的分钟K数据是否齐全。本地无数据时会自动走 TickFlow 实时拉取。 -

-
- - {/* 输入区 */} -
-
- - setSymbol(e.target.value)} - placeholder="603261.SH" - className="w-44 rounded-btn border border-line bg-base px-3 py-1.5 text-sm text-foreground outline-none focus:border-accent" - onKeyDown={(e) => e.key === 'Enter' && !loading && runProbe()} - /> -
-
- - setDays(Math.max(1, Math.min(30, Number(e.target.value) || 1)))} - className="w-24 rounded-btn border border-line bg-base px-3 py-1.5 text-sm text-foreground outline-none focus:border-accent" - /> -
- -
- - {error && ( -
- - {error} -
- )} - - {/* 汇总 */} - {total > 0 && ( -
-
-
检测天数
-
{total}
-
-
-
有数据
-
{hasData}
-
-
-
缺失
-
{missing.length}
-
-
- )} - - {/* 明细表 */} - {results.length > 0 && ( -
- - - - - - - - - - - {results.map((r) => ( - - - - - - - ))} - -
日期分钟K条数数据来源状态
{r.date}{r.rows} - - {r.source} - - - {r.ok ? ( - - 有 - - ) : ( - - 缺失 - - )} -
-
- )} - - {missing.length > 0 && ( -
-
- 缺失日期的诊断 -
-

- 缺失日期若为周末/节假日属正常； - 若为停牌日（成交量为 0）也属正常； - 若为正常交易日（日K有成交量）却缺失分钟K， - 则是 TickFlow 数据源未提供该日分钟数据（常见于停牌后复牌首日，存在补数延迟）。 -

-
- )} -
-
- ) -} diff --git a/frontend/src/pages/Monitor.tsx b/frontend/src/pages/Monitor.tsx index ee68d22..5c8d354 100644 --- a/frontend/src/pages/Monitor.tsx +++ b/frontend/src/pages/Monitor.tsx @@ -1,77 +1,670 @@ -import { RadioTower } from 'lucide-react' +import { useState, useRef, useEffect, useMemo } from 'react' +import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query' +import { motion, AnimatePresence } from 'framer-motion' +import { RadioTower, Plus, Trash2, Settings2, Zap, Bell, ListChecks, BellRing, TrendingUp, TrendingDown, Flame } from 'lucide-react' import { PageHeader } from '@/components/PageHeader' import { EmptyState } from '@/components/EmptyState' +import { api, type MonitorRule, type AlertEvent } from '@/lib/api' +import { QK } from '@/lib/queryKeys' +import { fmtPrice, fmtPct } from '@/lib/format' +import { cn } from '@/lib/cn' +import { cnSignal } from '@/lib/signals' +import { boardTag } from '@/components/stock-table/primitives' +import { markSeen, resetBadge, leaveMonitorPage } from '@/lib/monitorBadge' +import { RuleEditor } from '@/components/monitor/RuleEditor' +import { StockPreviewDialog } from '@/components/StockPreviewDialog' -// 后续实现计划(本轮为占位): -// -// 一、信号来源 -// 1. 策略告警 —— 链路已存在(StrategyMonitorService → quote_service → SSE), -// 后续接入持久化即可直接进入本列表。 -// 2. 全市场涨跌停异动 —— 涨停/跌停/炸板(signal_broken_limit_up)/翘板 -// (signal_limit_down_recovery)指标已在 enriched 全量计算,补一条 -// 全市场扫描链路即可产出告警。 -// 3. 板块异动 —— 当前后端无独立模块,需从零开发板块聚合异动检测。 -// -// 二、历史持久化 -// 告警落盘到 data/user_data/alerts.jsonl(追加写,保留近 7 天 / 上限约 -// 5000 条),支持按来源/类型过滤、一键清空。当前告警为 fire-and-forget, -// 刷新即丢失,持久化后将形成真正的「监控列表」。 -// -// 三、通知通道扩展(预留) -// StrategyMonitorService 已预留 alert_handler 扩展点,后续可接入飞书 -// webhook、邮件、短信等外部通知通道。 -const PLAN: { title: string; desc: string }[] = [ - { - title: '策略告警', - desc: '链路已存在(StrategyMonitorService → quote_service → SSE),后续接入持久化即可直接进入本列表。', - }, - { - title: '涨跌停异动', - desc: '涨停 / 跌停 / 炸板 / 翘板指标已在 enriched 全量计算,补一条全市场扫描链路即可产出告警。', - }, - { - title: '板块异动', - desc: '当前后端无独立模块,需从零开发板块聚合异动检测逻辑。', - }, - { - title: '历史持久化', - desc: '告警落盘 data/user_data/alerts.jsonl(追加写,保留近 7 天 / 上限约 5000 条),支持按来源/类型过滤、清空。', - }, - { - title: '通知通道', - desc: 'StrategyMonitorService 已预留 alert_handler 扩展点,后续可接入飞书 webhook、邮件、短信。', - }, -] +const TYPE_LABEL: Record = { + signal: '个股信号', price: '价格/涨跌', market: '市场异动', strategy: '策略监控', +} + +/** 严重级别 → 左侧色条 + 图标 */ +const SEVERITY_CONFIG: Record = { + info: { bar: 'bg-accent/40', icon: Bell, iconCls: 'text-accent' }, + warn: { bar: 'bg-warning', icon: TrendingUp, iconCls: 'text-warning' }, + critical: { bar: 'bg-danger', icon: Flame, iconCls: 'text-danger' }, +} +const SOURCE_BADGE_STYLE: Record = { + strategy: 'bg-amber-400/10 text-amber-400 border-amber-400/20', + signal: 'bg-accent/10 text-accent border-accent/20', + price: 'bg-emerald-400/10 text-emerald-400 border-emerald-400/20', + market: 'bg-purple-500/10 text-purple-400 border-purple-500/20', +} + +/** + * 渲染策略类消息 — 策略名黄色、买入红、卖出绿、其余白色。 + */ +function renderMessage(source: string, message: string) { + if (source !== 'strategy') { + return {message} + } + const m = message.match(/^(.*?「)([^」]+)(」)(买入|卖出)(信号.*)$/) + if (!m) return {message} + const [, pre, strategyName, mid, direction, post] = m + return ( + <> + {pre} + {strategyName} + {mid} + {direction} + {post} + + ) +} export function Monitor() { + const qc = useQueryClient() + const [editorOpen, setEditorOpen] = useState(false) + const [editingRule, setEditingRule] = useState(null) + + // 触发记录: 过滤 + 统计 (提升到主组件, 供 header 行使用) + const [filter, setFilter] = useState<'all' | 'strategy' | 'signal' | 'price' | 'market'>('all') + const [confirmClear, setConfirmClear] = useState(false) + const [confirmClearRules, setConfirmClearRules] = useState(false) + const alertsQuery = useQuery({ + queryKey: QK.alerts(filter === 'all' ? undefined : filter), + queryFn: () => api.alertsList({ days: 7, limit: 500, source: filter === 'all' ? undefined : filter }), + refetchInterval: 10000, + refetchIntervalInBackground: true, + }) + const total = alertsQuery.data?.total ?? 0 + + // 规则个数 + const rulesQuery = useQuery({ queryKey: QK.monitorRules, queryFn: api.monitorRulesList }) + const rulesCount = rulesQuery.data?.rules.length ?? 0 + + // 清除全部规则 (逐条删除) + const clearRulesMut = useMutation({ + mutationFn: async () => { + const rules = rulesQuery.data?.rules ?? [] + await Promise.all(rules.map(r => api.monitorRuleDelete(r.id))) + }, + onSuccess: () => { + qc.invalidateQueries({ queryKey: QK.monitorRules }) + setConfirmClearRules(false) + }, + }) + + // 进入监控页: 清零未读徽标 + 记录"进入时刻", 之后新增的记录会闪烁 + // 离开监控页: 停止同步, 之后新增才计入未读 + const enterTsRef = useRef(Date.now()) + useEffect(() => { + enterTsRef.current = Date.now() + markSeen() + return () => leaveMonitorPage() + // eslint-disable-next-line react-hooks/exhaustive-deps + }, []) + return (
- + +
+
+ {/* 左栏: 触发记录 */} +
+
+ + {/* 过滤标签 */} +
+ {(['all', 'strategy', 'signal', 'price', 'market'] as const).map(f => ( + + ))} +
+ {/* 数量 + 清空 */} +
+ {total} + {total > 0 && ( + + )} +
+
+
+ +
+
-
-
- - -
-

后续实现规划

-
    - {PLAN.map((item) => ( -
  • - -
    -

    {item.title}

    -

    {item.desc}

    -
    -
    • - ))} -
+ {/* 右栏: 监控规则 */} +
+
+ + {rulesCount} +
+ + +
+
+
+ { setEditingRule(r); setEditorOpen(true) }} + /> +
+ + { setEditorOpen(false); setEditingRule(null) }} + /> + + setConfirmClearRules(false)} + onConfirm={() => clearRulesMut.mutate()} + pending={clearRulesMut.isPending} + />
) } + +function SectionHeader({ icon: Icon, title }: { icon: any; title: string }) { + return ( +
+ +

{title}

+
+ ) +} + +// ── 触发记录列表 ────────────────────────────────────── +function AlertsList({ alertsQuery, confirmClear, setConfirmClear, total, enterTs }: { + alertsQuery: ReturnType + confirmClear: boolean + setConfirmClear: (v: boolean) => void + total: number + enterTs: number +}) { + const qc = useQueryClient() + const [confirmTs, setConfirmTs] = useState(null) + const resetTimer = useRef | null>(null) + const [previewEv, setPreviewEv] = useState(null) + + const clearMut = useMutation({ + mutationFn: api.alertsClear, + onSuccess: () => { qc.invalidateQueries({ queryKey: ['alerts'] }); setConfirmClear(false); resetBadge() }, + }) + const delMut = useMutation({ + mutationFn: (ts: number) => api.alertDelete(ts), + onSuccess: () => qc.invalidateQueries({ queryKey: ['alerts'] }), + }) + + // 点击删除: 第一次进入确认态, 第二次真删, 3 秒后自动复位 + const handleClickDelete = (ts: number) => { + if (confirmTs === ts) { + // 第二次点击 → 真删 + if (resetTimer.current) clearTimeout(resetTimer.current) + setConfirmTs(null) + delMut.mutate(ts) + } else { + // 第一次点击 → 进入确认态, 3 秒后自动复位 + setConfirmTs(ts) + if (resetTimer.current) clearTimeout(resetTimer.current) + resetTimer.current = setTimeout(() => setConfirmTs(null), 3000) + } + } + + const events = (alertsQuery.data as any)?.alerts ?? [] + + return ( +
+ {events.length === 0 ? ( + + ) : ( +
+ {events.map((ev: any, i: number) => { + const sev = SEVERITY_CONFIG[ev.severity ?? 'info'] ?? SEVERITY_CONFIG.info + const SevIcon = sev.icon + const isNew = ev.ts > enterTs + return ( + +
+
+ +
+
+
+ {ev.symbol && (() => { + const board = boardTag(ev.symbol) + return ( + + ) + })()} + + {TYPE_LABEL[ev.source] ?? ev.source} + +
+
+ {renderMessage(ev.source, ev.message)} +
+
+ {ev.price != null && ( + {fmtPrice(ev.price)} + )} + {ev.change_pct != null && ( + = 0 ? 'text-danger' : 'text-bear')}> + {ev.change_pct >= 0 ? : } + {fmtPct(ev.change_pct)} + + )} +
+ {ev.signals && ev.signals.length > 0 && ( +
+ {ev.signals.map((s: string, j: number) => ( + {cnSignal(s)} + ))} +
+ )} +
+
+ + {new Date(ev.ts).toLocaleString('zh-CN', { month: '2-digit', day: '2-digit', hour: '2-digit', minute: '2-digit' })} + + {confirmTs === ev.ts ? ( + // 确认态: 红色实心按钮 (原删除图标位置), 再点确认删除 + + ) : ( + + )} +
+ + ) + })} +
+ )} + + setConfirmClear(false)} + onConfirm={() => clearMut.mutate()} + pending={clearMut.isPending} + /> + + setPreviewEv(null)} + /> +
+ ) +} + +// ── 监控规则列表 ────────────────────────────────────── +function RulesList({ rulesQuery, onEdit }: { + rulesQuery: ReturnType + onEdit: (rule: MonitorRule) => void +}) { + const qc = useQueryClient() + const [confirmId, setConfirmId] = useState(null) + const [previewSymbol, setPreviewSymbol] = useState(null) + const resetTimer = useRef | null>(null) + + const rules: MonitorRule[] = (rulesQuery.data as any)?.rules ?? [] + + // 收集所有规则的股票代码, 批量查名称 + const allSymbols = useMemo(() => { + const set = new Set() + for (const r of rules) { + if (r.scope === 'symbols') r.symbols.forEach(s => set.add(s)) + } + return Array.from(set) + }, [rules]) + const namesQuery = useQuery({ + queryKey: ['instrument-names', allSymbols.join(',')], + queryFn: () => api.instrumentNames(allSymbols), + enabled: allSymbols.length > 0, + staleTime: 300000, + }) + const symbolNames = namesQuery.data?.names ?? {} + + // 查策略详情 (建 strategy_id → {entry, exit} signals 映射) + const strategiesQuery = useQuery({ + queryKey: QK.screenerStrategies, + queryFn: () => api.strategyList(), + staleTime: 300000, + }) + const strategySignals = useMemo(() => { + const m: Record = {} + for (const s of strategiesQuery.data?.strategies ?? []) { + m[s.id] = { entry: s.entry_signals ?? [], exit: s.exit_signals ?? [] } + } + return m + }, [strategiesQuery.data]) + + const del = useMutation({ + mutationFn: api.monitorRuleDelete, + onSuccess: () => qc.invalidateQueries({ queryKey: QK.monitorRules }), + }) + const toggleEnabled = (rule: MonitorRule) => { + api.monitorRuleSave({ ...rule, enabled: !rule.enabled }).then(() => + qc.invalidateQueries({ queryKey: QK.monitorRules }), + ) + } + + // 点击删除: 第一次进入确认态, 第二次真删, 3 秒后自动复位 + const handleClickDelete = (id: string) => { + if (confirmId === id) { + if (resetTimer.current) clearTimeout(resetTimer.current) + setConfirmId(null) + del.mutate(id) + } else { + setConfirmId(id) + if (resetTimer.current) clearTimeout(resetTimer.current) + resetTimer.current = setTimeout(() => setConfirmId(null), 3000) + } + } + + return ( +
+ {rules.length === 0 ? ( + + ) : ( + rules.map(r => { + // 名称截取: "策略监控 · MACD金叉" → "MACD金叉", "个股信号监控 · 300750.SZ" → "个股信号监控" + const dotIdx = r.name.indexOf(' · ') + const displayName = dotIdx >= 0 ? r.name.slice(dotIdx + 3) : r.name + return ( + + {/* 左侧状态条 */} +
+ + {/* 第一行: 分类标签 + 名称 + 操作按钮 */} +
+
+ + {TYPE_LABEL[r.type]} + + {/* 个股类型: 直接显示可点击的代码+名称; 其他类型显示规则名 */} + {r.scope === 'symbols' && r.symbols.length > 0 ? ( + + ) : ( +

{displayName}

+ )} + {!r.enabled && · 停用} +
+
+ + + {confirmId === r.id ? ( + + ) : ( + + )} +
+
+ + {/* 第二行: 触发条件 (策略类型显示买卖信号) */} + {r.type === 'strategy' && r.strategy_id ? ( +
+ {(() => { + const sigs = strategySignals[r.strategy_id] + const entrySigs = (sigs?.entry ?? []).map(s => cnSignal(s)) + const exitSigs = (sigs?.exit ?? []).map(s => cnSignal(s)) + return ( + <> + {(r.direction === 'entry' || r.direction === 'both') && entrySigs.length > 0 && ( + + 买 + {entrySigs.join('、')} + + )} + {(r.direction === 'exit' || r.direction === 'both') && exitSigs.length > 0 && ( + + 卖 + {exitSigs.join('、')} + + )} + + ) + })()} +
+ ) : r.conditions.length > 0 && ( +
+ 条件 + + {r.conditions.slice(0, 3).map((c, i) => ( + + {i > 0 && {r.logic === 'and' ? '且' : '或'}} + {c.op === 'truth' ? ( + {cnSignal(c.field)} + ) : ( + {cnSignal(c.field)}{c.op}{c.value} + )} + + ))} + {r.conditions.length > 3 && +{r.conditions.length - 3}} + +
+ )} + + ) + }) + )} + + setPreviewSymbol(null)} + /> +
+ ) +} + +// ── 规则编辑对话框 ──────────────────────────────────── +function RuleEditorDialog({ open, rule, onClose }: { open: boolean; rule: MonitorRule | null; onClose: () => void }) { + return ( + + {open && ( + + e.stopPropagation()} + > + + + + )} + + ) +} + +// ── 确认对话框 ──────────────────────────────────────── +function ConfirmDialog({ open, title, message, confirmText, danger, pending, onCancel, onConfirm }: { + open: boolean + title: string + message: string + confirmText?: string + danger?: boolean + pending?: boolean + onCancel: () => void + onConfirm: () => void +}) { + return ( + + {open && ( + + e.stopPropagation()} + > +

{title}

+

{message}

+
+ + +
+ + + )} + + ) +} diff --git a/frontend/src/pages/Screener.tsx b/frontend/src/pages/Screener.tsx index 24c9538..410cade 100644 --- a/frontend/src/pages/Screener.tsx +++ b/frontend/src/pages/Screener.tsx @@ -2,7 +2,7 @@ import { useState, useEffect, useCallback, useRef, useMemo } from 'react' import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query' import { motion } from 'framer-motion' import { ScanSearch, Clock, TrendingUp, Star, Filter, Layers, Network, Sparkles, RefreshCw, Settings2, Store } from 'lucide-react' -import { api, type ScreenerStrategy, type ScreenerResult } from '@/lib/api' +import { api, genRuleId, type ScreenerStrategy, type ScreenerResult } from '@/lib/api' import { useDataStatus, usePreferences } from '@/lib/useSharedQueries' import { useWatchlistBatchAdd } from '@/lib/useSharedMutations' import { QK } from '@/lib/queryKeys' @@ -328,7 +328,7 @@ export function Screener() { // asOf 确定后 + 策略列表就绪 + 策略池非空 → 自动跑一次 (受系统设置开关控制) // 缓存命中时秒加载; 未命中时, 仅当 screener_auto_run 开启才自动触发 runAll useEffect(() => { - if (!asOf || !strategies.data?.presets.length || runAll.isPending || visiblePool.length === 0) return + if (!asOf || !strategies.data?.presets?.length || runAll.isPending || visiblePool.length === 0) return const runKey = `${asOf}|${visiblePool.join(',')}|${extColumnsParam}` if (runAllDateRef.current === runKey) return // 缓存已覆盖当前策略池 → 秒加载, 不触发 runAll @@ -433,6 +433,46 @@ export function Screener() { }, }) + // 策略监控: 查询规则, 建立 strategyId → ruleId 映射 (只看 type=strategy 且 enabled) + const monitorRules = useQuery({ queryKey: QK.monitorRules, queryFn: api.monitorRulesList }) + const strategyMonitorMap = useMemo(() => { + const m = new Map() + for (const r of monitorRules.data?.rules ?? []) { + if (r.type === 'strategy' && r.enabled && r.strategy_id) { + m.set(r.strategy_id, r.id) + } + } + return m + }, [monitorRules.data]) + + const toggleStrategyMonitor = (strategyId: string, strategyName: string) => { + const existingRuleId = strategyMonitorMap.get(strategyId) + if (existingRuleId) { + // 已监控 → 删除规则 + api.monitorRuleDelete(existingRuleId).then(() => + qc.invalidateQueries({ queryKey: QK.monitorRules }), + ) + } else { + // 未监控 → 直接创建 type=strategy 规则 + api.monitorRuleSave({ + id: genRuleId(), + name: `策略监控 · ${strategyName}`, + enabled: true, + type: 'strategy', + scope: 'all', + symbols: [], + sector: null, + strategy_id: strategyId, + direction: 'entry', + conditions: [], + logic: 'or', + cooldown_seconds: 3600, + severity: 'info', + message: '', + }).then(() => qc.invalidateQueries({ queryKey: QK.monitorRules })) + } + } + const handleBatchAdd = () => { if (!displayRows.length) return const symbols = displayRows.map((r: any) => r.symbol) @@ -515,7 +555,7 @@ export function Screener() { 策略池 - {visiblePool.length}/{strategies.data?.presets.length ?? 0} + {visiblePool.length}/{strategies.data?.presets?.length ?? 0} {/* 创建策略 */} @@ -570,6 +610,8 @@ export function Screener() { onRun={() => handleRun(s)} disabled={run.isPending && activeStrategy === s.id} onSettings={() => setSettingsStrategyId(s.id)} + monitored={strategyMonitorMap.has(s.id)} + onToggleMonitor={() => toggleStrategyMonitor(s.id, s.name)} /> ) })} diff --git a/frontend/src/pages/settings/MenuSettings.tsx b/frontend/src/pages/settings/MenuSettings.tsx index 74c05ad..74ea6dc 100644 --- a/frontend/src/pages/settings/MenuSettings.tsx +++ b/frontend/src/pages/settings/MenuSettings.tsx @@ -17,7 +17,7 @@ import { verticalListSortingStrategy, } from '@dnd-kit/sortable' import { CSS } from '@dnd-kit/utilities' -import { Eye, EyeOff, ExternalLink, GripVertical, Settings } from 'lucide-react' +import { Eye, EyeOff, ExternalLink, GripVertical, Settings, Bell } from 'lucide-react' import { Link } from 'react-router-dom' import { api } from '@/lib/api' import { QK } from '@/lib/queryKeys' @@ -42,16 +42,18 @@ const BUILTIN_PAGES: NavEntry[] = [ { id: '/financials', label: '财务', type: 'builtin', visible: true }, { id: '/indices', label: '指数', type: 'builtin', visible: true }, { id: '/trading', label: '交易', type: 'builtin', visible: true }, - { id: '/monitor', label: '监控通知', type: 'builtin', visible: true }, + { id: '/monitor', label: '监控中心', type: 'builtin', visible: true }, { id: '/data', label: '数据', type: 'builtin', visible: true }, ] // ── Sortable row ── -function SortableItem({ entry, hidden, onToggleHidden }: { +function SortableItem({ entry, hidden, onToggleHidden, badgeEnabled, onToggleBadge }: { entry: NavEntry hidden: boolean onToggleHidden: (id: string) => void + badgeEnabled?: boolean + onToggleBadge?: (id: string) => void }) { const { attributes, @@ -73,7 +75,7 @@ function SortableItem({ entry, hidden, onToggleHidden }: {
@@ -132,6 +134,22 @@ function SortableItem({ entry, hidden, onToggleHidden }: { )}
+ {/* 第 6 列: 徽标开关 (仅监控中心) */} +
+ {onToggleBadge && ( + + )} +
) } @@ -230,6 +248,17 @@ export function SettingsMenuSettingsPanel() { saveNavHidden.mutate([...next]) } + // 监控中心徽标开关 (localStorage) + const [badgeEnabled, setBadgeEnabled] = useState(() => { + try { return localStorage.getItem('monitor_badge_enabled') !== '0' } catch { return true } + }) + const toggleBadge = (id: string) => { + if (id !== '/monitor') return + const next = !badgeEnabled + setBadgeEnabled(next) + try { localStorage.setItem('monitor_badge_enabled', next ? '1' : '0') } catch { /* ignore */ } + } + return (
@@ -241,12 +270,13 @@ export function SettingsMenuSettingsPanel() {
-
+
菜单
类型
显示
设置
+
数字
+
+
+ +

通知弹窗

+
+ + { + localStorage.setItem('alert_toast_enabled', v ? '1' : '0') + setToastEnabled(v) + refreshAlertToastConfig() + }} + /> + +
+
+
最大弹窗个数
+
同时显示的通知数量 (1-5), 超出丢弃最旧的
+
+ +
+ + { + localStorage.setItem('alert_sound_enabled', v ? '1' : '0') + setSoundEnabled(v) + if (v) previewSound(soundType) + }} + /> + +
+
+ +
+
声效选择
+
选择提示音风格
+
+
+
+ + +
+
+
+
diff --git a/frontend/src/router.tsx b/frontend/src/router.tsx index e682ca8..354ec94 100644 --- a/frontend/src/router.tsx +++ b/frontend/src/router.tsx @@ -17,7 +17,7 @@ import { LimitUpLadder } from './pages/LimitUpLadder' import { Branding } from './pages/Branding' import { Settings } from './pages/Settings' import { Indices } from './pages/Indices' -import { MinuteDataProbe } from './pages/MinuteDataProbe' +import { Dev } from './pages/Dev' import { useSettings } from './lib/useSharedQueries' import { Logo } from './components/Logo' @@ -75,8 +75,8 @@ export const router = createBrowserRouter([ { path: 'indices', element: }, { path: 'branding', element: }, { path: 'settings', element: }, - // 隐藏路由：分钟K数据探测（不暴露在菜单，仅供调试） - { path: 'minute-probe', element: }, + // 隐藏路由：开发者工具（不暴露在菜单，仅供调试） + { path: 'dev', element: }, // 旧路由兼容重定向 { path: 'settings/keys', element: }, { path: 'settings/ai', element: }, diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts index 4041240..1451aaf 100644 --- a/frontend/vite.config.ts +++ b/frontend/vite.config.ts @@ -10,6 +10,7 @@ export default defineConfig({ }, }, server: { + host: '0.0.0.0', // 允许局域网访问 port: 3011, proxy: { // dev 时 /api 转发到 FastAPI