feat: 账套模式全量接入 — 12个API entity_id统一走token解析链 + 前端登录选公司/切换器重签token
- 后端: kpis/bsc_layers/cash/predict/growth_quality/tax_compliance/data 的 entity_id 参数统一改为 Depends(get_entity_id) - 前端: 拦截器删除自动附加X-Entity-Id/entity_id; 登录页公司选择器(按用户名授权过滤); 切换器改POST /auth/switch-entity重新签发token+整页刷新; ReportCenter同步改造 - 修复前后端不匹配: login-entities路由→/auth/entities; login响应entity_id取user.entity_id
This commit is contained in:
@@ -4,6 +4,7 @@ from datetime import datetime, timedelta
|
||||
from fastapi import APIRouter, HTTPException, Depends, Query
|
||||
from sqlalchemy.orm import Session
|
||||
from app.database import get_db
|
||||
from app.deps import get_entity_id
|
||||
from app.auth_middleware import require_role
|
||||
from app.models import CashPlan
|
||||
from app.utils.cash_forecast_engine import (
|
||||
@@ -45,7 +46,7 @@ def _plan_dict(p: CashPlan) -> dict:
|
||||
|
||||
@router.get("/gap-forecast")
|
||||
def api_gap_forecast(
|
||||
entity_id: int = Query(1, description="企业ID"),
|
||||
entity_id: int = Depends(get_entity_id),
|
||||
days: int = Query(30, ge=1, le=90, description="预测天数"),
|
||||
current_cash: float = Query(None, description="当前现金余额(万元),不传则自动获取"),
|
||||
db: Session = Depends(get_db),
|
||||
@@ -60,7 +61,7 @@ def api_gap_forecast(
|
||||
|
||||
@router.get("/balance")
|
||||
def api_get_balance(
|
||||
entity_id: int = Query(1),
|
||||
entity_id: int = Depends(get_entity_id),
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
"""获取当前现金余额(预测基线)"""
|
||||
@@ -89,7 +90,7 @@ def api_set_balance(
|
||||
|
||||
@router.get("/plans")
|
||||
def api_list_plans(
|
||||
entity_id: int = Query(1),
|
||||
entity_id: int = Depends(get_entity_id),
|
||||
plan_type: str = Query(None, description="receive/pay"),
|
||||
status: str = Query(None, description="pending/completed/cancelled"),
|
||||
month: str = Query(None, description="YYYY-MM 按计划月份过滤"),
|
||||
@@ -215,7 +216,7 @@ def api_complete_plan(plan_id: int, db: Session = Depends(get_db)):
|
||||
|
||||
@router.get("/upcoming")
|
||||
def api_upcoming(
|
||||
entity_id: int = Query(1),
|
||||
entity_id: int = Depends(get_entity_id),
|
||||
days: int = Query(7, ge=1, le=30),
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
@@ -243,7 +244,7 @@ def api_upcoming(
|
||||
|
||||
@router.get("/dashboard")
|
||||
def api_cash_dashboard(
|
||||
entity_id: int = Query(1),
|
||||
entity_id: int = Depends(get_entity_id),
|
||||
month: str = Query(None, description="YYYY-MM 默认本月"),
|
||||
days: int = Query(30),
|
||||
current_cash: float = Query(None, description="当前现金余额(万元)"),
|
||||
@@ -303,7 +304,7 @@ def api_cash_dashboard(
|
||||
# ══════════════════════════════════════════════════════════
|
||||
|
||||
@router.post("/check-alerts")
|
||||
def api_check_cash_alerts(entity_id: int = 1, db: Session = Depends(get_db)):
|
||||
def api_check_cash_alerts(entity_id: int = Depends(get_entity_id), db: Session = Depends(get_db)):
|
||||
"""手动触发资金预警检查(写入预警中心kpi_alerts)"""
|
||||
try:
|
||||
return check_cash_alerts(db, entity_id=entity_id)
|
||||
@@ -313,7 +314,7 @@ def api_check_cash_alerts(entity_id: int = 1, db: Session = Depends(get_db)):
|
||||
|
||||
|
||||
@router.get("/alerts/status")
|
||||
def api_cash_alert_status(entity_id: int = Query(1), db: Session = Depends(get_db)):
|
||||
def api_cash_alert_status(entity_id: int = Depends(get_entity_id), db: Session = Depends(get_db)):
|
||||
"""资金预警状态概览 — 当前缺口/逾期情况(不写库,只读)"""
|
||||
result = forecast_cash_flow_with_plans(entity_id, db, days=30)
|
||||
return {
|
||||
|
||||
Reference in New Issue
Block a user