用户报:账号详情点「一键查询」会一直循环(Network 里刷一片 `overview` 请求)。
## 根因
上一轮我把 `overview_snapshot` / `overview_queried_at` 加到了**列表**接口
(锚点 `**bind_payload(acc),` 第一次出现的位置在列表构造器里),详情接口没有。
两层后果:
1. **详情不返回 `overview_queried_at`** → 前端 `marker !== before` 永远相等
→ 轮询到 120 秒超时。看起来就是"点一下一直转圈刷请求"。
2. **列表每个账号都带一整份 JSON 快照** → 15000 个账号的响应体积爆炸
(这个是我自己引入的回归,比第一个更隐蔽)。
## 修法
- 字段从**列表**移除、加到**详情**(列表刻意不返回,注释写明原因)
- 前端轮询**加自证**:第一次拿到响应时若没有标记字段,**立刻报错退出**,
而不是傻等 120 秒 —— 这类"字段没返回"的 bug 不该再以死循环的形式暴露
## ⚠️ 过程中我又踩了一个,被既有用例抓住
删那 4 行时**把 `**bind_payload(acc),` 一起删掉了**,导致列表不再返回绑定列
(`role_bind_status` 显示的是 Pydantic 默认值 `unknown`)。
`TestListViewKeyColumns::test_item_carries_key_columns` **立刻变红** ——
既有用例替我把这个真回归挡下来了。已恢复,并确认 diff 只剩预期的 3 行。
## 新增回归用例(+2,共 38)
`TestSnapshotExposedOnDetailOnly`:
- 详情**必须**返回快照与查询时间(不返回前端就会轮询到超时)
- 列表**不得**返回完整快照(每个账号一份 JSON,体积爆炸)
并做了**反向验证**:把"详情不返回字段"的 bug 注入回去 → 用例立刻红。
另外把 `TestListViewKeyColumns::_item` 按用户名查找改成按 id ——
`make_account("key")` 每次建新账号而库里一直累积,按用户名可能命中很早以前那个
(这次就让用例假红过一次)。
## 验证
`TZ=Asia/Shanghai` **590 passed / 6 skipped**;`TZ=UTC` 80 passed;
ruff 全绿;前端 build 通过、lint 0 errors。
1136 lines
40 KiB
Python
1136 lines
40 KiB
Python
"""账号管理路由"""
|
|
|
|
from typing import Any
|
|
|
|
from fastapi import APIRouter, Depends, HTTPException, Query
|
|
from sqlalchemy import func, or_, select, text
|
|
from sqlalchemy.orm import Session, defer, joinedload
|
|
|
|
from ..database import get_db
|
|
from ..deps import get_current_user, require_permission
|
|
from ..models import (
|
|
Account,
|
|
AccountEvent,
|
|
AuditLog,
|
|
DouyuTask,
|
|
DouyuWorkbenchAccount,
|
|
LoginTask,
|
|
User,
|
|
)
|
|
from ..permissions import user_has_permission
|
|
from ..schemas import (
|
|
AccountAssign,
|
|
AccountAutomationUpdate,
|
|
AccountBulkSelection,
|
|
AccountBulkTag,
|
|
AccountImport,
|
|
AccountLifecycleUpdate,
|
|
AccountOut,
|
|
AccountRemark,
|
|
AccountTag,
|
|
BatchAssign,
|
|
)
|
|
from ..services.account_binding import bind_payload
|
|
from ..services.account_events_service import (
|
|
CATEGORY_OPS,
|
|
EVENT_ASSIGNED,
|
|
EVENT_CK_INVALID,
|
|
EVENT_ELITE_OPENED,
|
|
EVENT_ESPORTS_OPENED,
|
|
EVENT_EXCHANGE,
|
|
EVENT_RECHARGE,
|
|
EVENT_REMARK_CHANGED,
|
|
EVENT_TAG_CHANGED,
|
|
emit_bulk,
|
|
)
|
|
from ..services.account_lifecycle import (
|
|
STATUS_ARCHIVED,
|
|
STATUS_LABELS,
|
|
set_manual_state,
|
|
)
|
|
from ..services.account_service import (
|
|
cookie_account_ids_query,
|
|
parse_and_build_accounts,
|
|
)
|
|
from ..services.audit_service import record_account_action, record_audit
|
|
from ..services.douyu_service import cookie_holding_filter
|
|
|
|
router = APIRouter(prefix="/api/accounts", tags=["账号管理"])
|
|
|
|
|
|
def _visible_accounts_query(db: Session, current: User):
|
|
"""返回当前用户可见的斗鱼账号查询。"""
|
|
query = db.query(Account)
|
|
if user_has_permission(current, "account:view_all"):
|
|
return query
|
|
if user_has_permission(current, "account:view_assigned"):
|
|
return query.filter(Account.assigned_to == current.id)
|
|
raise HTTPException(status_code=403, detail="无权查看账号")
|
|
|
|
|
|
def _query_str(value) -> str:
|
|
"""把查询参数安全地取成字符串。
|
|
|
|
存在的理由:本仓库的测试**直接调用路由函数**(不经 FastAPI),此时
|
|
`Query(...)` 的默认值不会被解析,参数拿到的仍是 `Query` 对象 ——
|
|
对它调 `.strip()` 会炸。这里统一兜住,免得每加一个筛选参数就要改一遍用例。
|
|
"""
|
|
return value.strip() if isinstance(value, str) else ""
|
|
|
|
|
|
def _filter_accounts_query(
|
|
db: Session,
|
|
query,
|
|
current: User,
|
|
*,
|
|
assigned_only: bool = False,
|
|
tag: str | None = None,
|
|
has_cookie: bool = False,
|
|
search: str = "",
|
|
status: str = "",
|
|
ck_status: str = "",
|
|
bind_status: str = "",
|
|
):
|
|
"""复用列表筛选条件,供分页列表和全量批量操作保持一致。"""
|
|
if has_cookie:
|
|
query = query.filter(Account.id.in_(cookie_account_ids_query(db)))
|
|
if assigned_only and user_has_permission(current, "account:view_all"):
|
|
query = query.filter(Account.assigned_to.isnot(None))
|
|
tag_value = _query_str(tag)
|
|
if tag_value:
|
|
query = query.filter(Account.tag == tag_value)
|
|
status_value = _query_str(status)
|
|
if status_value:
|
|
query = query.filter(Account.status == status_value)
|
|
else:
|
|
# 归档账号默认不出现 —— 「归档」本身就是「收起来别烦我」的意思。
|
|
# 要看它们必须显式带 status=archived。
|
|
query = query.filter(Account.status != STATUS_ARCHIVED)
|
|
ck_value = _query_str(ck_status)
|
|
if ck_value:
|
|
query = query.filter(Account.ck_check_status == ck_value)
|
|
bind_value = _query_str(bind_status)
|
|
if bind_value:
|
|
# 三个作用域任一命中即算(列表上「绑定」是一列,不分开筛)
|
|
query = query.filter(
|
|
or_(
|
|
Account.role_bind_status == bind_value,
|
|
Account.esports_bind_status == bind_value,
|
|
Account.xpd_bind_status == bind_value,
|
|
)
|
|
)
|
|
search_text = _query_str(search)
|
|
if search_text:
|
|
pattern = f"%{search_text}%"
|
|
query = query.filter(
|
|
or_(
|
|
Account.username.ilike(pattern),
|
|
Account.tag.ilike(pattern),
|
|
Account.remark.ilike(pattern),
|
|
)
|
|
)
|
|
return query
|
|
|
|
|
|
def _selected_account_ids(
|
|
db: Session, current: User, req: AccountBulkSelection
|
|
) -> list[int]:
|
|
"""解析批量操作目标:当前筛选全部或显式选择的 ID。"""
|
|
if req.all_matching:
|
|
rows = (
|
|
_filter_accounts_query(
|
|
db,
|
|
_visible_accounts_query(db, current),
|
|
current,
|
|
assigned_only=req.assigned_only,
|
|
tag=req.tag,
|
|
has_cookie=req.has_cookie,
|
|
search=req.search,
|
|
)
|
|
.with_entities(Account.id)
|
|
.order_by(None)
|
|
.all()
|
|
)
|
|
return [account_id for (account_id,) in rows]
|
|
|
|
seen = set()
|
|
ids = []
|
|
for account_id in req.account_ids:
|
|
if account_id not in seen:
|
|
seen.add(account_id)
|
|
ids.append(account_id)
|
|
if not ids:
|
|
return []
|
|
rows = (
|
|
_visible_accounts_query(db, current)
|
|
.filter(Account.id.in_(ids))
|
|
.with_entities(Account.id)
|
|
.order_by(None)
|
|
.all()
|
|
)
|
|
allowed = {account_id for (account_id,) in rows}
|
|
return [account_id for account_id in ids if account_id in allowed]
|
|
|
|
|
|
def _require_account_tag_permission(current: User) -> None:
|
|
"""标签权限兼容历史上使用账号导入权限的运营人员。"""
|
|
if not (
|
|
user_has_permission(current, "account:tag")
|
|
or user_has_permission(current, "account:import")
|
|
):
|
|
raise HTTPException(status_code=403, detail="无权修改账号标签")
|
|
|
|
|
|
@router.get("")
|
|
def list_accounts(
|
|
assigned_only: bool = Query(False),
|
|
tag: str = Query(None),
|
|
has_cookie: bool = Query(False),
|
|
search: str = Query(""),
|
|
status: str = Query("", description="按生命周期状态筛选;空=全部(不含归档)"),
|
|
ck_status: str = Query(
|
|
"", description="按 CK 健康结论筛选:valid / invalid / error"
|
|
),
|
|
bind_status: str = Query(
|
|
"", description="按角色绑定筛选:unknown/unbound/pending/bound"
|
|
),
|
|
page: int | None = Query(None, ge=1),
|
|
page_size: int = Query(20, ge=1, le=200),
|
|
include_sensitive: bool = Query(False),
|
|
db: Session = Depends(get_db),
|
|
current: User = Depends(get_current_user),
|
|
):
|
|
"""列表:按角色返回不同字段和范围。"""
|
|
query = _filter_accounts_query(
|
|
db,
|
|
_visible_accounts_query(db, current),
|
|
current,
|
|
assigned_only=assigned_only,
|
|
tag=tag,
|
|
has_cookie=has_cookie,
|
|
search=search,
|
|
status=status,
|
|
ck_status=ck_status,
|
|
bind_status=bind_status,
|
|
)
|
|
|
|
total = None
|
|
if page is not None:
|
|
total = query.order_by(None).with_entities(func.count(Account.id)).scalar() or 0
|
|
query = query.order_by(Account.id)
|
|
if page is not None:
|
|
query = query.offset((page - 1) * page_size).limit(page_size)
|
|
|
|
can_include_sensitive = include_sensitive and user_has_permission(
|
|
current, "account:view_full"
|
|
)
|
|
options = [joinedload(Account.assigned_user)]
|
|
if not can_include_sensitive:
|
|
options.extend(
|
|
[
|
|
defer(Account.password),
|
|
defer(Account.email),
|
|
defer(Account.email_password),
|
|
]
|
|
)
|
|
accounts = query.options(*options).all()
|
|
|
|
# 「兑换记录」列:**每页只跑一条聚合查询**,不是每行一条(避免 N+1)。
|
|
# 数据源是账号自己的事件流(`account_events` 的 `exchange`),
|
|
# 而不是 `douyu_tasks` 的 JSON —— 后者是执行日志,S5 起业务事实已经在事件里了。
|
|
exchange_stats: dict[int, tuple[int, Any, str]] = {}
|
|
ids = [acc.id for acc in accounts]
|
|
if ids:
|
|
# ① 次数 + 最近一次时间(分组聚合,走 (account_id, event_type, occurred_at) 复合索引)
|
|
for account_id, count, last_at in (
|
|
db.query(
|
|
AccountEvent.account_id,
|
|
func.count(AccountEvent.id),
|
|
func.max(AccountEvent.occurred_at),
|
|
)
|
|
.filter(
|
|
AccountEvent.account_id.in_(ids),
|
|
AccountEvent.event_type == EVENT_EXCHANGE,
|
|
)
|
|
.group_by(AccountEvent.account_id)
|
|
.all()
|
|
):
|
|
exchange_stats[int(account_id)] = (int(count or 0), last_at, "")
|
|
# ② 最近一次兑换的商品名(窗口函数取每个账号的最新一条)
|
|
ranked = (
|
|
db.query(
|
|
AccountEvent.account_id.label("account_id"),
|
|
AccountEvent.title.label("title"),
|
|
func.row_number()
|
|
.over(
|
|
partition_by=AccountEvent.account_id,
|
|
order_by=AccountEvent.id.desc(),
|
|
)
|
|
.label("rn"),
|
|
)
|
|
.filter(
|
|
AccountEvent.account_id.in_(ids),
|
|
AccountEvent.event_type == EVENT_EXCHANGE,
|
|
)
|
|
.subquery()
|
|
)
|
|
for account_id, title in (
|
|
db.query(ranked.c.account_id, ranked.c.title).filter(ranked.c.rn == 1).all()
|
|
):
|
|
key = int(account_id)
|
|
if key in exchange_stats:
|
|
count, last_at, _ = exchange_stats[key]
|
|
exchange_stats[key] = (count, last_at, str(title or ""))
|
|
|
|
result = []
|
|
for acc in accounts:
|
|
item = AccountOut(
|
|
id=acc.id,
|
|
username=acc.username,
|
|
remark=acc.remark or "",
|
|
tag=acc.tag or "",
|
|
assigned_to=acc.assigned_to,
|
|
assigned_username=acc.assigned_user.username if acc.assigned_user else None,
|
|
created_at=acc.created_at,
|
|
status=acc.status or "",
|
|
status_label=STATUS_LABELS.get(acc.status or "", acc.status or ""),
|
|
status_reason=acc.status_reason or "",
|
|
auto_managed=bool(acc.auto_managed),
|
|
# 关键列:全部是 accounts 行上的字段,无 JOIN / 无聚合
|
|
has_cookie=bool(acc.cookie),
|
|
ck_check_status=acc.ck_check_status or "",
|
|
ck_checked_at=acc.ck_checked_at,
|
|
points=acc.points,
|
|
gold_balance=acc.gold_balance,
|
|
exchange_count=exchange_stats.get(acc.id, (0, None, ""))[0],
|
|
last_exchange_at=exchange_stats.get(acc.id, (0, None, ""))[1],
|
|
last_exchange_name=exchange_stats.get(acc.id, (0, None, ""))[2],
|
|
**bind_payload(acc),
|
|
)
|
|
# 只有管理员可看完整字段(密码、邮箱等)
|
|
if can_include_sensitive:
|
|
item.password = acc.password
|
|
item.email = acc.email
|
|
item.email_password = acc.email_password
|
|
result.append(item)
|
|
if page is not None:
|
|
return {
|
|
"items": result,
|
|
"total": total or 0,
|
|
"page": page,
|
|
"page_size": page_size,
|
|
}
|
|
return result
|
|
|
|
|
|
@router.get("/summary")
|
|
def accounts_summary(
|
|
db: Session = Depends(get_db),
|
|
current: User = Depends(get_current_user),
|
|
):
|
|
"""账号管理统计,避免前端为了卡片统计拉全量账号。"""
|
|
query = db.query(Account)
|
|
if not user_has_permission(current, "account:view_all"):
|
|
if user_has_permission(current, "account:view_assigned"):
|
|
query = query.filter(Account.assigned_to == current.id)
|
|
else:
|
|
raise HTTPException(status_code=403, detail="无权查看账号")
|
|
|
|
total = query.with_entities(func.count(Account.id)).scalar() or 0
|
|
assigned_count = (
|
|
query.filter(Account.assigned_to.isnot(None))
|
|
.with_entities(func.count(Account.id))
|
|
.scalar()
|
|
or 0
|
|
)
|
|
tag_count = (
|
|
query.filter(Account.tag != "", Account.tag.isnot(None))
|
|
.with_entities(func.count(func.distinct(Account.tag)))
|
|
.scalar()
|
|
or 0
|
|
)
|
|
# 按**生命周期状态**分布:这才是可行动的(「有几个要处理」比「有几个标签」有用得多)。
|
|
# 归档默认不计入(与列表默认口径一致 —— 归档就是「收起来别烦我」)。
|
|
visible = query.filter(Account.status != STATUS_ARCHIVED)
|
|
status_rows = (
|
|
visible.with_entities(Account.status, func.count(Account.id))
|
|
.group_by(Account.status)
|
|
.all()
|
|
)
|
|
by_status = {str(row[0] or ""): int(row[1] or 0) for row in status_rows}
|
|
visible_total = sum(by_status.values())
|
|
return {
|
|
"total": total,
|
|
"visible_total": visible_total,
|
|
# 生命周期分布(键是 6 状态的枚举值)
|
|
"by_status": by_status,
|
|
# 需要人关注的:CK 已被判失效的账号数(含待人工)
|
|
"ck_invalid_count": int(
|
|
visible.filter(Account.ck_check_status == "invalid")
|
|
.with_entities(func.count(Account.id))
|
|
.scalar()
|
|
or 0
|
|
),
|
|
"no_cookie_count": int(
|
|
visible.filter(or_(Account.cookie.is_(None), Account.cookie == ""))
|
|
.with_entities(func.count(Account.id))
|
|
.scalar()
|
|
or 0
|
|
),
|
|
"assigned_count": assigned_count,
|
|
"unassigned_count": max(0, total - assigned_count),
|
|
"tag_count": tag_count,
|
|
}
|
|
|
|
|
|
@router.post("/import")
|
|
def import_accounts(
|
|
req: AccountImport,
|
|
db: Session = Depends(get_db),
|
|
current: User = Depends(require_permission("account:import")),
|
|
):
|
|
"""批量导入账号。格式:用户名|密码|邮箱|邮箱密码|标签(可选)
|
|
|
|
req.tag 为统一标签兜底:某行未单独写标签时使用该值,行内标签优先。
|
|
库中已存在的用户名(大小写不敏感)与同批重复行会自动跳过。
|
|
"""
|
|
accounts, skipped, duplicated = parse_and_build_accounts(db, req.text, req.tag)
|
|
|
|
if accounts:
|
|
db.add_all(accounts)
|
|
db.add(
|
|
AuditLog(
|
|
user_id=current.id,
|
|
username=current.username,
|
|
action="account:import",
|
|
target=f"导入{len(accounts)}个",
|
|
)
|
|
)
|
|
db.commit()
|
|
|
|
duplicated_note = f",重复跳过 {duplicated} 个" if duplicated else ""
|
|
return {
|
|
"message": f"导入成功 {len(accounts)} 个,跳过 {skipped} 个{duplicated_note}",
|
|
"success": True,
|
|
"count": len(accounts),
|
|
}
|
|
|
|
|
|
@router.put("/{account_id}/assign")
|
|
def assign_account(
|
|
account_id: int,
|
|
req: AccountAssign,
|
|
db: Session = Depends(get_db),
|
|
current: User = Depends(require_permission("account:assign")),
|
|
):
|
|
acc = db.query(Account).filter(Account.id == account_id).first()
|
|
if not acc:
|
|
raise HTTPException(status_code=404, detail="账号不存在")
|
|
|
|
if req.assigned_to:
|
|
target = db.query(User).filter(User.id == req.assigned_to).first()
|
|
if not target:
|
|
raise HTTPException(status_code=404, detail="目标用户不存在")
|
|
if target.role != "support":
|
|
raise HTTPException(status_code=400, detail="只能分配给客服角色")
|
|
|
|
# 只能分配当前仍持有 CK 的账号(CK 现在挂在账号上)
|
|
has_success = (
|
|
db.query(Account)
|
|
.filter(
|
|
Account.id == account_id,
|
|
cookie_holding_filter(),
|
|
)
|
|
.first()
|
|
)
|
|
if not has_success:
|
|
raise HTTPException(status_code=400, detail="该账号尚未成功登录,无法分配")
|
|
|
|
if acc.assigned_to != req.assigned_to:
|
|
acc.assigned_to = req.assigned_to
|
|
db.query(DouyuTask).filter(DouyuTask.account_id == acc.id).update(
|
|
{DouyuTask.account_assigned_to: req.assigned_to}, synchronize_session=False
|
|
)
|
|
target = db.query(User).filter(User.id == req.assigned_to).first()
|
|
target_name = target.username if target else ""
|
|
record_account_action(
|
|
db,
|
|
current,
|
|
account=acc,
|
|
action="account:assign",
|
|
event_type=EVENT_ASSIGNED,
|
|
title=f"分配给 {target_name}" if target_name else "取消分配",
|
|
detail={"assigned_to": req.assigned_to, "assigned_username": target_name},
|
|
)
|
|
db.commit()
|
|
return {"message": "已分配", "success": True}
|
|
|
|
|
|
@router.post("/batch-assign")
|
|
def batch_assign_accounts(
|
|
req: BatchAssign,
|
|
db: Session = Depends(get_db),
|
|
current: User = Depends(require_permission("account:assign")),
|
|
):
|
|
"""批量分配/取消分配账号给客服。"""
|
|
if not req.account_ids:
|
|
raise HTTPException(status_code=400, detail="请选择账号")
|
|
|
|
# 验证目标用户
|
|
if req.assigned_to is not None:
|
|
target = db.query(User).filter(User.id == req.assigned_to).first()
|
|
if not target:
|
|
raise HTTPException(status_code=404, detail="目标用户不存在")
|
|
if target.role != "support":
|
|
raise HTTPException(status_code=400, detail="只能分配给客服角色")
|
|
|
|
# 只能分配当前仍持有 CK 的账号(CK 现在挂在账号上)
|
|
cookie_ids_query = select(Account.id).where(cookie_holding_filter())
|
|
invalid_ids = (
|
|
db.query(Account.id)
|
|
.filter(
|
|
Account.id.in_(req.account_ids),
|
|
Account.id.notin_(cookie_ids_query),
|
|
)
|
|
.all()
|
|
)
|
|
if invalid_ids:
|
|
names = (
|
|
db.query(Account.username)
|
|
.filter(Account.id.in_([i[0] for i in invalid_ids]))
|
|
.all()
|
|
)
|
|
name_list = ", ".join([n[0] for n in names[:5]])
|
|
suffix = "..." if len(invalid_ids) > 5 else ""
|
|
raise HTTPException(
|
|
status_code=400,
|
|
detail=f"以下账号尚未成功登录,无法分配:{name_list}{suffix}",
|
|
)
|
|
|
|
# 先取出账号对象(批量时间线要逐个写事件,光有 count 不够)
|
|
target_accounts = db.query(Account).filter(Account.id.in_(req.account_ids)).all()
|
|
count = (
|
|
db.query(Account)
|
|
.filter(Account.id.in_(req.account_ids))
|
|
.update({Account.assigned_to: req.assigned_to}, synchronize_session=False)
|
|
)
|
|
db.query(DouyuTask).filter(DouyuTask.account_id.in_(req.account_ids)).update(
|
|
{DouyuTask.account_assigned_to: req.assigned_to}, synchronize_session=False
|
|
)
|
|
target_user = (
|
|
db.query(User).filter(User.id == req.assigned_to).first()
|
|
if req.assigned_to is not None
|
|
else None
|
|
)
|
|
target_name = target_user.username if target_user else ""
|
|
action_word = "分配" if req.assigned_to else "取消分配"
|
|
title = f"批量分配:{target_name}" if target_name else "批量取消分配"
|
|
record_audit(
|
|
db,
|
|
current,
|
|
action="account:assign",
|
|
target=f"批量{action_word}{count}个账号",
|
|
detail={"assigned_to": req.assigned_to, "assigned_username": target_name},
|
|
)
|
|
# 每个账号的时间线各留一条 —— 「这个账号什么时候被分配给谁」是账号级事实。
|
|
emit_bulk(
|
|
db,
|
|
[
|
|
{
|
|
"account_id": acc.id,
|
|
"event_type": EVENT_ASSIGNED,
|
|
"title": title,
|
|
"category": CATEGORY_OPS,
|
|
"detail": {
|
|
"assigned_to": req.assigned_to,
|
|
"assigned_username": target_name,
|
|
},
|
|
"source": "audit",
|
|
"actor_type": "user",
|
|
"actor_id": current.id,
|
|
}
|
|
for acc in target_accounts
|
|
],
|
|
)
|
|
db.commit()
|
|
action = "分配" if req.assigned_to else "取消分配"
|
|
return {
|
|
"message": f"已批量{action} {count} 个账号",
|
|
"success": True,
|
|
"count": count,
|
|
}
|
|
|
|
|
|
@router.get("/assignments/summary")
|
|
def assignments_summary(
|
|
db: Session = Depends(get_db),
|
|
current: User = Depends(require_permission("account:assign")),
|
|
):
|
|
"""分配概览:每个客服分配了多少账号(仅统计当前仍持有 CK 的账号)。"""
|
|
cookie_subq = select(Account.id).where(cookie_holding_filter())
|
|
cookie_accounts = db.query(Account).filter(Account.id.in_(cookie_subq)).subquery()
|
|
|
|
results = (
|
|
db.query(
|
|
User.id, User.username, func.count(cookie_accounts.c.id).label("count")
|
|
)
|
|
.outerjoin(cookie_accounts, cookie_accounts.c.assigned_to == User.id)
|
|
.filter(User.role == "support")
|
|
.group_by(User.id, User.username)
|
|
.order_by(func.count(cookie_accounts.c.id).desc())
|
|
.all()
|
|
)
|
|
total_unassigned = (
|
|
db.query(func.count(cookie_accounts.c.id))
|
|
.filter(cookie_accounts.c.assigned_to.is_(None))
|
|
.scalar()
|
|
) or 0
|
|
return {
|
|
"support_users": [
|
|
{"id": uid, "username": uname, "assigned_count": cnt}
|
|
for uid, uname, cnt in results
|
|
],
|
|
"unassigned_count": total_unassigned,
|
|
}
|
|
|
|
|
|
@router.put("/{account_id}/lifecycle")
|
|
def set_account_lifecycle(
|
|
account_id: int,
|
|
req: AccountLifecycleUpdate,
|
|
db: Session = Depends(get_db),
|
|
current: User = Depends(require_permission("account:manage")),
|
|
):
|
|
"""人工停用 / 归档 / 恢复账号(生命周期状态机,见 `services/account_lifecycle`)。
|
|
|
|
- `disabled`:账号不可用(封号、退单、归还)—— 自动化**不再碰它**;
|
|
- `archived`:软删除,默认列表不再展示;
|
|
- `auto`:解除人工态,立刻按底层判据重新推导(例如账号又能用了)。
|
|
"""
|
|
acc = db.query(Account).filter(Account.id == account_id).first()
|
|
if not acc:
|
|
raise HTTPException(status_code=404, detail="账号不存在")
|
|
if acc.status == req.status:
|
|
return {"message": "状态未变化", "status": acc.status, "success": True}
|
|
|
|
set_manual_state(
|
|
db,
|
|
acc,
|
|
req.status,
|
|
reason=req.reason or "",
|
|
actor_id=current.id,
|
|
actor_type="user",
|
|
)
|
|
db.add(
|
|
AuditLog(
|
|
user_id=current.id,
|
|
username=current.username,
|
|
action=f"account:lifecycle:{req.status}",
|
|
target=acc.username,
|
|
account_id=acc.id,
|
|
detail=req.reason or "",
|
|
)
|
|
)
|
|
db.commit()
|
|
return {
|
|
"message": "状态已更新",
|
|
"status": acc.status,
|
|
"success": True,
|
|
}
|
|
|
|
|
|
@router.put("/{account_id}/automation")
|
|
def set_account_automation(
|
|
account_id: int,
|
|
req: AccountAutomationUpdate,
|
|
db: Session = Depends(get_db),
|
|
current: User = Depends(require_permission("account:manage")),
|
|
):
|
|
"""自动化开关。
|
|
|
|
与 `status=disabled` 的区别:`auto_managed=False` 的账号**仍然可用**
|
|
(人照样能手动跑任务),只是巡检/自动重登绕过它 —— 用于敏感账号人工维护。
|
|
"""
|
|
acc = db.query(Account).filter(Account.id == account_id).first()
|
|
if not acc:
|
|
raise HTTPException(status_code=404, detail="账号不存在")
|
|
acc.auto_managed = bool(req.auto_managed)
|
|
db.add(
|
|
AuditLog(
|
|
user_id=current.id,
|
|
username=current.username,
|
|
action="account:automation",
|
|
target=acc.username,
|
|
account_id=acc.id,
|
|
detail="参与自动化" if req.auto_managed else "不参与自动化",
|
|
)
|
|
)
|
|
db.commit()
|
|
return {
|
|
"message": "自动化开关已更新",
|
|
"auto_managed": acc.auto_managed,
|
|
"success": True,
|
|
}
|
|
|
|
|
|
@router.put("/{account_id}/remark")
|
|
def set_account_remark(
|
|
account_id: int,
|
|
req: AccountRemark,
|
|
db: Session = Depends(get_db),
|
|
current: User = Depends(require_permission("account:remark")),
|
|
):
|
|
"""设置单个账号的备注。
|
|
|
|
备注是自由文本(标签是短枚举),所以走单个接口、不做批量 —— 批量给一堆账号写
|
|
同一句备注没有实际意义。与改标签一样:审计 + 账号时间线一次写完。
|
|
"""
|
|
acc = db.query(Account).filter(Account.id == account_id).first()
|
|
if not acc:
|
|
raise HTTPException(status_code=404, detail="账号不存在")
|
|
|
|
old_remark = acc.remark or ""
|
|
new_remark = (req.remark or "").strip()[:256]
|
|
if old_remark == new_remark:
|
|
return {"message": "备注未变化", "success": True, "remark": new_remark}
|
|
acc.remark = new_remark
|
|
record_account_action(
|
|
db,
|
|
current,
|
|
account=acc,
|
|
action="account:remark",
|
|
event_type=EVENT_REMARK_CHANGED,
|
|
title=f"备注:{old_remark or '(空)'} → {new_remark or '(空)'}",
|
|
detail={"from": old_remark, "to": new_remark},
|
|
)
|
|
db.commit()
|
|
return {"message": "备注已更新", "success": True, "remark": new_remark}
|
|
|
|
|
|
def _apply_tag_bulk(db: Session, current: User, ids: list[int], tag: str) -> None:
|
|
"""批量改标签:更新 + 审计 + **逐账号写事件**。
|
|
|
|
先取出对象再更新:`bulk update` 不加载实体,而每个账号的时间线都要各留一条
|
|
「标签从什么改成了什么」——这正是本仓库以前的缺口(`tag_changed` 事件类型
|
|
定义了、前端也渲染了,却从来没有代码发过)。
|
|
"""
|
|
accounts = _visible_accounts_query(db, current).filter(Account.id.in_(ids)).all()
|
|
if not accounts:
|
|
return
|
|
previous = {acc.id: (acc.tag or "") for acc in accounts}
|
|
db.query(Account).filter(Account.id.in_([a.id for a in accounts])).update(
|
|
{Account.tag: tag}, synchronize_session=False
|
|
)
|
|
record_audit(
|
|
db,
|
|
current,
|
|
action="account:tag",
|
|
target=f"批量设置标签「{tag}」{len(accounts)} 个账号",
|
|
detail={"to": tag},
|
|
)
|
|
emit_bulk(
|
|
db,
|
|
[
|
|
{
|
|
"account_id": acc.id,
|
|
"event_type": EVENT_TAG_CHANGED,
|
|
"title": f"标签:{previous[acc.id] or '(空)'} → {tag or '(空)'}",
|
|
"category": CATEGORY_OPS,
|
|
"detail": {"from": previous[acc.id], "to": tag},
|
|
"source": "audit",
|
|
"actor_type": "user",
|
|
"actor_id": current.id,
|
|
}
|
|
for acc in accounts
|
|
],
|
|
)
|
|
|
|
|
|
@router.put("/{account_id}/tag")
|
|
def set_account_tag(
|
|
account_id: int,
|
|
req: AccountTag,
|
|
db: Session = Depends(get_db),
|
|
current: User = Depends(get_current_user),
|
|
):
|
|
"""设置单个可见账号的标签。"""
|
|
_require_account_tag_permission(current)
|
|
acc = _visible_accounts_query(db, current).filter(Account.id == account_id).first()
|
|
if not acc:
|
|
raise HTTPException(status_code=404, detail="账号不存在")
|
|
old_tag = acc.tag or ""
|
|
acc.tag = (req.tag or "").strip()
|
|
record_account_action(
|
|
db,
|
|
current,
|
|
account=acc,
|
|
action="account:tag",
|
|
event_type=EVENT_TAG_CHANGED,
|
|
title=f"标签:{old_tag or '(空)'} → {acc.tag or '(空)'}",
|
|
detail={"from": old_tag, "to": acc.tag},
|
|
)
|
|
db.commit()
|
|
return {"message": "标签已更新", "success": True}
|
|
|
|
|
|
@router.put("/batch-tag")
|
|
def batch_tag(
|
|
req: AccountTag,
|
|
db: Session = Depends(get_db),
|
|
current: User = Depends(get_current_user),
|
|
):
|
|
"""批量设置账号标签。"""
|
|
_require_account_tag_permission(current)
|
|
if not req.account_ids:
|
|
raise HTTPException(status_code=400, detail="请选择账号")
|
|
tag = (req.tag or "").strip()
|
|
_apply_tag_bulk(db, current, req.account_ids, tag)
|
|
count = len(req.account_ids)
|
|
db.commit()
|
|
return {"message": f"已为 {count} 个账号设置标签", "success": True}
|
|
|
|
|
|
@router.put("/batch-tag-selection")
|
|
def batch_tag_selection(
|
|
req: AccountBulkTag,
|
|
db: Session = Depends(get_db),
|
|
current: User = Depends(get_current_user),
|
|
):
|
|
"""按显式选择或当前筛选结果批量设置账号标签。"""
|
|
_require_account_tag_permission(current)
|
|
ids = _selected_account_ids(db, current, req)
|
|
if not ids:
|
|
raise HTTPException(status_code=400, detail="请选择账号")
|
|
tag = (req.tag_value or "").strip()
|
|
_apply_tag_bulk(db, current, ids, tag)
|
|
count = len(ids)
|
|
db.commit()
|
|
scope = "当前筛选下" if req.all_matching else "选中的"
|
|
return {
|
|
"message": f"已为{scope} {count} 个账号设置标签",
|
|
"success": True,
|
|
"count": count,
|
|
}
|
|
|
|
|
|
@router.get("/tags/list")
|
|
def list_tags(
|
|
db: Session = Depends(get_db),
|
|
current: User = Depends(get_current_user),
|
|
):
|
|
"""获取当前用户可见账号的标签列表。"""
|
|
query = _visible_accounts_query(db, current)
|
|
tags = (
|
|
query.filter(Account.tag != "", Account.tag.isnot(None))
|
|
.with_entities(Account.tag)
|
|
.distinct()
|
|
.all()
|
|
)
|
|
return [t[0] for t in tags if t[0]]
|
|
|
|
|
|
@router.delete("/batch/delete")
|
|
def batch_delete_accounts(
|
|
account_ids: str = Query(..., description="逗号分隔的账号ID"),
|
|
db: Session = Depends(get_db),
|
|
current: User = Depends(require_permission("account:delete")),
|
|
):
|
|
"""批量删除账号及其关联的登录任务。"""
|
|
if not account_ids:
|
|
raise HTTPException(status_code=400, detail="请指定账号ID")
|
|
|
|
ids = [int(x) for x in account_ids.split(",") if x.strip().isdigit()]
|
|
if not ids:
|
|
raise HTTPException(status_code=400, detail="无效的账号ID")
|
|
|
|
# 先删除关联的登录任务
|
|
db.query(LoginTask).filter(LoginTask.account_id.in_(ids)).delete(
|
|
synchronize_session=False
|
|
)
|
|
db.query(DouyuTask).filter(DouyuTask.account_id.in_(ids)).delete(
|
|
synchronize_session=False
|
|
)
|
|
db.query(DouyuWorkbenchAccount).filter(
|
|
DouyuWorkbenchAccount.account_id.in_(ids)
|
|
).delete(synchronize_session=False)
|
|
|
|
# 删除账号
|
|
deleted = (
|
|
db.query(Account).filter(Account.id.in_(ids)).delete(synchronize_session=False)
|
|
)
|
|
|
|
# 账号删除会**连带删掉它的事件时间线**(外键),所以留下的痕迹只有审计。
|
|
# 批量删时 account_id 无法表达 N 个账号,改成把删掉的 id 记进 detail ——
|
|
# 出了事故才知道删了哪些,正是本项目 10-03 那次事故的教训。
|
|
record_audit(
|
|
db,
|
|
current,
|
|
action="account:delete",
|
|
target=f"批量删除{deleted}个账号",
|
|
detail={"account_ids": ids[:200], "total_ids": len(ids), "deleted": deleted},
|
|
)
|
|
db.commit()
|
|
return {"message": f"已删除 {deleted} 个账号", "deleted": deleted, "success": True}
|
|
|
|
|
|
@router.post("/batch-delete")
|
|
def batch_delete_accounts_selection(
|
|
req: AccountBulkSelection,
|
|
db: Session = Depends(get_db),
|
|
current: User = Depends(require_permission("account:delete")),
|
|
):
|
|
"""按显式选择或当前筛选结果批量删除账号及其关联任务。"""
|
|
ids = _selected_account_ids(db, current, req)
|
|
if not ids:
|
|
raise HTTPException(status_code=400, detail="请选择账号")
|
|
|
|
db.query(LoginTask).filter(LoginTask.account_id.in_(ids)).delete(
|
|
synchronize_session=False
|
|
)
|
|
db.query(DouyuTask).filter(DouyuTask.account_id.in_(ids)).delete(
|
|
synchronize_session=False
|
|
)
|
|
db.query(DouyuWorkbenchAccount).filter(
|
|
DouyuWorkbenchAccount.account_id.in_(ids)
|
|
).delete(synchronize_session=False)
|
|
deleted = (
|
|
_visible_accounts_query(db, current)
|
|
.filter(Account.id.in_(ids))
|
|
.delete(synchronize_session=False)
|
|
)
|
|
record_audit(
|
|
db,
|
|
current,
|
|
action="account:delete",
|
|
target=f"{'按筛选' if req.all_matching else '批量'}删除{deleted}个账号",
|
|
detail={"account_ids": ids[:200], "total_ids": len(ids), "deleted": deleted},
|
|
)
|
|
db.commit()
|
|
return {"message": f"已删除 {deleted} 个账号", "deleted": deleted, "success": True}
|
|
|
|
|
|
@router.get("/{account_id}/overview")
|
|
def account_overview(
|
|
account_id: int,
|
|
db: Session = Depends(get_db),
|
|
current: User = Depends(get_current_user),
|
|
):
|
|
"""账号详情页的「状态卡 + 统计」。
|
|
|
|
状态取 `accounts` 的当前值(覆盖式),统计由 `account_events` 聚合 —— 这正是
|
|
「状态与流水分离」的用法:页面上两者拼起来看。
|
|
"""
|
|
acc = _visible_accounts_query(db, current).filter(Account.id == account_id).first()
|
|
if not acc:
|
|
raise HTTPException(status_code=404, detail="账号不存在")
|
|
|
|
stats = (
|
|
db.execute(
|
|
text(
|
|
"""
|
|
SELECT
|
|
SUM(CASE WHEN event_type = :recharge THEN amount ELSE 0 END) AS recharge_total,
|
|
SUM(CASE WHEN event_type = :exchange THEN 1 ELSE 0 END) AS exchange_count,
|
|
SUM(CASE WHEN event_type = :exchange THEN -amount ELSE 0 END) AS points_spent,
|
|
SUM(CASE WHEN event_type = :ck_invalid THEN 1 ELSE 0 END) AS ck_invalid_count,
|
|
MIN(CASE WHEN event_type = :elite THEN occurred_at END) AS elite_opened_at,
|
|
MIN(CASE WHEN event_type = :esports THEN occurred_at END) AS esports_opened_at,
|
|
COUNT(*) AS event_count
|
|
FROM account_events WHERE account_id = :aid
|
|
"""
|
|
),
|
|
{
|
|
"aid": account_id,
|
|
"recharge": EVENT_RECHARGE,
|
|
"exchange": EVENT_EXCHANGE,
|
|
"ck_invalid": EVENT_CK_INVALID,
|
|
"elite": EVENT_ELITE_OPENED,
|
|
"esports": EVENT_ESPORTS_OPENED,
|
|
},
|
|
)
|
|
.mappings()
|
|
.first()
|
|
or {}
|
|
)
|
|
|
|
# 登录次数取历史记录(事件表不回填,所以登录相关计数仍以 login_tasks 为准);
|
|
# 「最近 CK 检测」改从**账号**上读(2026-10-04 CK 解耦:ck_checked_at 已搬到 accounts)。
|
|
login_stats = (
|
|
db.execute(
|
|
text(
|
|
"""
|
|
SELECT COUNT(*) AS login_count,
|
|
MAX(finished_at) AS last_login_at
|
|
FROM login_tasks
|
|
WHERE account_id = :aid AND status = 'success'
|
|
"""
|
|
),
|
|
{"aid": account_id},
|
|
)
|
|
.mappings()
|
|
.first()
|
|
or {}
|
|
)
|
|
|
|
return {
|
|
"id": acc.id,
|
|
"username": acc.username,
|
|
"nickname": acc.nickname,
|
|
"uid": acc.uid,
|
|
"tag": acc.tag,
|
|
"remark": acc.remark,
|
|
"assigned_to": acc.assigned_to,
|
|
"created_at": acc.created_at, # 导入时间
|
|
# 生命周期状态(账号现在到底能不能用、要不要人处理)
|
|
"status": acc.status or "",
|
|
"status_label": STATUS_LABELS.get(acc.status or "", acc.status or ""),
|
|
"status_reason": acc.status_reason or "",
|
|
"status_changed_at": acc.status_changed_at,
|
|
"auto_managed": bool(acc.auto_managed),
|
|
# CK 的持有与健康(详情页状态卡要一眼看出「能不能用」)
|
|
"has_cookie": bool(acc.cookie),
|
|
"ck_check_status": acc.ck_check_status or "",
|
|
"ck_checked_at": acc.ck_checked_at,
|
|
# 当前状态(覆盖式字段)
|
|
"points": acc.points,
|
|
"gold_balance": acc.gold_balance,
|
|
"exchange_balance": acc.exchange_balance,
|
|
"game_name": acc.game_name,
|
|
"game_channel": acc.game_channel,
|
|
**bind_payload(acc),
|
|
# 最近一次「一键查询」快照(列表接口刻意**不**返回,避免体积爆炸)
|
|
"overview_snapshot": acc.overview_snapshot,
|
|
"overview_queried_at": acc.overview_queried_at,
|
|
"elite_opened": acc.elite_opened,
|
|
"elite_expire_time": acc.elite_expire_time,
|
|
"esports_points": acc.esports_points,
|
|
"esports_bind_status": acc.esports_bind_status,
|
|
"esports_game_name": acc.esports_game_name,
|
|
"esports_can_change_time": acc.esports_can_change_time,
|
|
# 统计
|
|
"stats": {
|
|
"recharge_total": int(stats.get("recharge_total") or 0),
|
|
"exchange_count": int(stats.get("exchange_count") or 0),
|
|
"points_spent": int(stats.get("points_spent") or 0),
|
|
"ck_invalid_count": int(stats.get("ck_invalid_count") or 0),
|
|
"event_count": int(stats.get("event_count") or 0),
|
|
"login_count": int(login_stats.get("login_count") or 0),
|
|
"last_login_at": login_stats.get("last_login_at"),
|
|
"last_ck_check_at": acc.ck_checked_at,
|
|
},
|
|
# 「开通时间」由事件表提供;事件表从上线起才有,早于上线的不显示。
|
|
"opened_at": {
|
|
"elite": stats.get("elite_opened_at"),
|
|
"esports": stats.get("esports_opened_at"),
|
|
},
|
|
}
|
|
|
|
|
|
@router.get("/{account_id}/events")
|
|
def account_events(
|
|
account_id: int,
|
|
page: int = 1,
|
|
page_size: int = 50,
|
|
event_type: str = "",
|
|
category: str = Query(
|
|
"", description="按粗分类筛选:lifecycle / auth / business / ops"
|
|
),
|
|
db: Session = Depends(get_db),
|
|
current: User = Depends(get_current_user),
|
|
):
|
|
"""账号时间线(倒序分页)。
|
|
|
|
权限沿用账号可见性:客服只能看自己名下账号的事件。
|
|
|
|
`category` 是给页面用的「大分类」过滤(状态变迁 / 登录与 CK / 业务 / 人工操作),
|
|
比逐一点 `event_type` 好用:客服最常看的是「人工操作」与「状态变迁」两条线。
|
|
"""
|
|
acc = _visible_accounts_query(db, current).filter(Account.id == account_id).first()
|
|
if not acc:
|
|
raise HTTPException(status_code=404, detail="账号不存在")
|
|
|
|
page = max(1, int(page))
|
|
page_size = max(1, min(int(page_size), 200))
|
|
where = "WHERE account_id = :aid"
|
|
params: dict[str, Any] = {"aid": account_id}
|
|
sql_event_type = _query_str(event_type)
|
|
sql_category = _query_str(category)
|
|
if sql_event_type:
|
|
where += " AND event_type = :etype"
|
|
params["etype"] = sql_event_type
|
|
if sql_category:
|
|
where += " AND category = :category"
|
|
params["category"] = sql_category
|
|
|
|
total = (
|
|
db.execute(
|
|
text(f"SELECT COUNT(*) FROM account_events {where}"), params
|
|
).scalar()
|
|
or 0
|
|
)
|
|
|
|
rows = (
|
|
db.execute(
|
|
text(
|
|
f"""
|
|
SELECT id, event_type, category, occurred_at, title, amount,
|
|
balance_after, subject_type, subject_key, detail, source,
|
|
actor_type, actor_id
|
|
FROM account_events {where}
|
|
ORDER BY occurred_at DESC, id DESC
|
|
LIMIT :limit OFFSET :offset
|
|
"""
|
|
),
|
|
{**params, "limit": page_size, "offset": (page - 1) * page_size},
|
|
)
|
|
.mappings()
|
|
.all()
|
|
)
|
|
|
|
return {
|
|
"items": [dict(row) for row in rows],
|
|
"total": int(total),
|
|
"page": page,
|
|
"page_size": page_size,
|
|
}
|
|
|
|
|
|
@router.delete("/{account_id}")
|
|
def delete_account(
|
|
account_id: int,
|
|
db: Session = Depends(get_db),
|
|
current: User = Depends(require_permission("account:delete")),
|
|
):
|
|
acc = db.query(Account).filter(Account.id == account_id).first()
|
|
if not acc:
|
|
raise HTTPException(status_code=404, detail="账号不存在")
|
|
|
|
# 先删除关联的登录任务,避免外键约束失败
|
|
db.query(LoginTask).filter(LoginTask.account_id == account_id).delete(
|
|
synchronize_session=False
|
|
)
|
|
db.query(DouyuTask).filter(DouyuTask.account_id == account_id).delete(
|
|
synchronize_session=False
|
|
)
|
|
db.query(DouyuWorkbenchAccount).filter(
|
|
DouyuWorkbenchAccount.account_id == account_id
|
|
).delete(synchronize_session=False)
|
|
# 事件表有指向 accounts 的外键,不清会直接删不掉账号。
|
|
# 账号都没了,它的时间线也没有保留意义(审计仍在 audit_logs 里,那份不带外键)。
|
|
db.query(AccountEvent).filter(AccountEvent.account_id == account_id).delete(
|
|
synchronize_session=False
|
|
)
|
|
|
|
db.add(
|
|
AuditLog(
|
|
user_id=current.id,
|
|
username=current.username,
|
|
action="account:delete",
|
|
target=acc.username,
|
|
account_id=account_id,
|
|
)
|
|
)
|
|
db.delete(acc)
|
|
db.commit()
|
|
return {"message": "已删除", "success": True}
|