新增定时任务

This commit is contained in:
2026-09-03 15:47:50 +08:00
parent a9752b01a9
commit 7cdfd76bfb
10 changed files with 516 additions and 25 deletions
+117 -5
View File
@@ -1,11 +1,15 @@
"""
远程控制路由:云端下发开始/结束投递任务,客户端轮询执行并回调。
远程控制路由:云端下发开始/结束任务,客户端轮询执行并回调。
- 状态快照 rpa_status:心跳携带全量状态上报,每用户一行(单设备)
- 任务 rpa_task:pending → running → done/failed,pending 超时 → expired
(start_apply / stop_apply 可由控制端手动下发;start_activate / stop_activate
仅由定时调度器下发)
- 去重(服务端权威拦截):同类型任务未达终态时拒绝重复下发
- 定时排程 rpa_schedule:每日到点由 scheduler 自动下发对应任务
"""
import json
import re
from datetime import datetime, timedelta
from fastapi import APIRouter, Depends, HTTPException, Query
@@ -13,16 +17,17 @@ from sqlalchemy.orm import Session
from ..auth import get_current_user
from ..database import get_db
from ..models import User, RpaStatus, RpaTask
from ..models import User, RpaStatus, RpaTask, RpaSchedule
from ..online import is_online
from ..schemas import RpaTaskIn, RpaTaskFinishIn, Message
from ..scheduler import KIND_TASK_TYPES, PENDING_EXPIRE_MINUTES
from ..schemas import RpaTaskIn, RpaTaskFinishIn, RpaScheduleIn, Message
router = APIRouter(prefix="/api/rpa", tags=["远程控制"])
# 任务终态:达到终态后同类型任务才允许再次下发
TERMINAL_STATUS = ("done", "failed", "expired")
# pending 超过该时长未客户端认领则过期,防止离线恢复后执行过时任务
PENDING_EXPIRE_MINUTES = 10
# 定时排程时间格式:HH:MM(零填充 24 小时制)
_TIME_RE = re.compile(r"^([01]\d|2[0-3]):[0-5]\d$")
def _task_dict(t: RpaTask) -> dict:
@@ -165,3 +170,110 @@ def finish_task(
task.result = (req.result or "")[:500]
db.commit()
return Message(msg="ok")
# =======================================================
# 定时任务排程(每日到点由调度器自动下发 RpaTask)
# =======================================================
def _schedule_dict(s: RpaSchedule) -> dict:
return {
"id": s.id,
"kind": s.kind,
"params": json.loads(s.params) if s.params else None,
"start_time": s.start_time,
"end_time": s.end_time,
"enabled": bool(s.enabled),
"last_start_date": s.last_start_date,
"last_stop_date": s.last_stop_date,
"last_result": s.last_result,
"created_at": (s.created_at + timedelta(hours=8)).strftime("%Y-%m-%d %H:%M:%S"),
}
@router.get("/schedules", response_model=dict)
def list_schedules(
current_user: User = Depends(get_current_user),
db: Session = Depends(get_db),
):
"""当前用户的定时排程列表(倒序)"""
rows = db.query(RpaSchedule).filter(RpaSchedule.user_id == current_user.id) \
.order_by(RpaSchedule.id.desc()).all()
return {"items": [_schedule_dict(s) for s in rows]}
@router.post("/schedules", response_model=dict)
def create_schedule(
req: RpaScheduleIn,
current_user: User = Depends(get_current_user),
db: Session = Depends(get_db),
):
"""创建定时排程。不做客户端在线预检(定时本就是为无人值守场景,
下发时若离线由 pending 过期机制兑底)"""
if req.kind not in KIND_TASK_TYPES:
raise HTTPException(status_code=422, detail="任务类型只能为 apply(自动投递)或 activate(Boss激活)")
if not _TIME_RE.match(req.start_time or "") or not _TIME_RE.match(req.end_time or ""):
raise HTTPException(status_code=422, detail="时间格式应为 HH:MM(24 小时制)")
if req.end_time <= req.start_time:
raise HTTPException(status_code=422, detail="结束时间必须晚于开始时间")
params = req.params or {}
if req.kind == "apply":
if not params.get("keywords") or not params.get("city"):
raise HTTPException(status_code=422, detail="定时投递必须提供 keywords 与 city")
else: # activate
if not (params.get("match_text") or "").strip():
raise HTTPException(status_code=422, detail="定时激活必须提供匹配条件文本 match_text")
if not (params.get("reply_message") or "").strip():
raise HTTPException(status_code=422, detail="定时激活必须提供激活消息 reply_message")
if params.get("status_filter") not in (None, "unread", "read", "all"):
raise HTTPException(status_code=422, detail="消息状态过滤取值非法")
sched = RpaSchedule(
user_id=current_user.id,
kind=req.kind,
params=json.dumps(params, ensure_ascii=False),
start_time=req.start_time,
end_time=req.end_time,
enabled=True,
)
db.add(sched)
db.commit()
db.refresh(sched)
return _schedule_dict(sched)
@router.put("/schedules/{schedule_id}", response_model=dict)
def toggle_schedule(
schedule_id: int,
enabled: bool = Query(..., description="启用/停用"),
current_user: User = Depends(get_current_user),
db: Session = Depends(get_db),
):
"""启用/停用定时排程"""
sched = db.query(RpaSchedule).filter(
RpaSchedule.id == schedule_id,
RpaSchedule.user_id == current_user.id,
).first()
if not sched:
raise HTTPException(status_code=404, detail="排程不存在")
sched.enabled = enabled
db.commit()
return _schedule_dict(sched)
@router.delete("/schedules/{schedule_id}", response_model=Message)
def delete_schedule(
schedule_id: int,
current_user: User = Depends(get_current_user),
db: Session = Depends(get_db),
):
"""删除定时排程(仅停止后续调度,不影响已下发的任务)"""
sched = db.query(RpaSchedule).filter(
RpaSchedule.id == schedule_id,
RpaSchedule.user_id == current_user.id,
).first()
if not sched:
raise HTTPException(status_code=404, detail="排程不存在")
db.delete(sched)
db.commit()
return Message(msg="已删除")