兜底
This commit is contained in:
+2
-1
@@ -14,7 +14,7 @@ from loguru import logger
|
||||
|
||||
from .config import settings
|
||||
from .database import engine
|
||||
from .routers import register, resumes, sessions, jobs, blacklist
|
||||
from .routers import register, resumes, sessions, jobs, blacklist, rpa
|
||||
|
||||
|
||||
@asynccontextmanager
|
||||
@@ -49,6 +49,7 @@ app.include_router(resumes.router)
|
||||
app.include_router(sessions.router)
|
||||
app.include_router(jobs.router)
|
||||
app.include_router(blacklist.router)
|
||||
app.include_router(rpa.router)
|
||||
|
||||
|
||||
@app.get("/", tags=["健康检查"])
|
||||
|
||||
@@ -156,3 +156,51 @@ class CompanyBlacklist(Base):
|
||||
created_at = Column(DateTime, default=utcnow, nullable=False)
|
||||
|
||||
user = relationship("User", back_populates="blacklist")
|
||||
|
||||
|
||||
class RpaStatus(Base):
|
||||
"""
|
||||
客户端 RPA 状态快照(每用户一行,单设备不做设备区分)。
|
||||
心跳每次携带全量状态上报:Boss 登录 / 浏览器 / 投递状态。
|
||||
"""
|
||||
__tablename__ = "rpa_status"
|
||||
|
||||
user_id = Column(Integer, ForeignKey("users.id", ondelete="CASCADE"),
|
||||
primary_key=True)
|
||||
# Boss 直聘登录状态:not_login / logging_in / logged_in / unknown
|
||||
boss_login = Column(String(20), default="unknown", nullable=False)
|
||||
# 指纹浏览器状态:running / stopped / unknown
|
||||
browser = Column(String(20), default="unknown", nullable=False)
|
||||
# 投递状态:idle / running
|
||||
apply_status = Column(String(20), default="idle", nullable=False)
|
||||
# 当前进度文本(如“评估:xx公司 - xx职位”)
|
||||
current = Column(String(200), nullable=True)
|
||||
applied = Column(Integer, default=0, nullable=False)
|
||||
skipped = Column(Integer, default=0, nullable=False)
|
||||
updated_at = Column(DateTime, default=utcnow, onupdate=utcnow, nullable=False)
|
||||
|
||||
user = relationship("User")
|
||||
|
||||
|
||||
class RpaTask(Base):
|
||||
"""
|
||||
远程控制任务(云端下发 → 客户端轮询执行 → 回调更新状态)。
|
||||
状态机:pending → running → done/failed;pending 超时 → expired。
|
||||
去重:同类型任务未达终态(done/failed/expired)时拒绝重复下发。
|
||||
"""
|
||||
__tablename__ = "rpa_task"
|
||||
|
||||
id = Column(Integer, primary_key=True, autoincrement=True)
|
||||
user_id = Column(Integer, ForeignKey("users.id", ondelete="CASCADE"),
|
||||
nullable=False, index=True)
|
||||
# start_apply / stop_apply
|
||||
task_type = Column(String(20), nullable=False)
|
||||
# 任务参数 JSON(start_apply 的投递参数)
|
||||
params = Column(Text, nullable=True)
|
||||
# pending / running / done / failed / expired
|
||||
status = Column(String(20), default="pending", nullable=False)
|
||||
result = Column(String(500), nullable=True)
|
||||
created_at = Column(DateTime, default=utcnow, nullable=False)
|
||||
updated_at = Column(DateTime, default=utcnow, onupdate=utcnow, nullable=False)
|
||||
|
||||
user = relationship("User")
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
账号注册 / 登录 / 用户状态路由
|
||||
"""
|
||||
from datetime import datetime
|
||||
from typing import Optional
|
||||
from fastapi import APIRouter, Depends, HTTPException
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
@@ -9,11 +10,11 @@ from ..auth import (
|
||||
create_access_token, get_current_user, hash_password, verify_password,
|
||||
)
|
||||
from ..database import get_db
|
||||
from ..models import User
|
||||
from ..models import User, RpaStatus
|
||||
from ..online import is_online, touch, require_online_user
|
||||
from ..schemas import (
|
||||
RegisterRequest, LoginRequest, AuthResponse,
|
||||
UserInfo, LoginStatusUpdate, Message,
|
||||
UserInfo, LoginStatusUpdate, Message, HeartbeatIn,
|
||||
)
|
||||
|
||||
router = APIRouter(prefix="/api/auth", tags=["认证与用户"])
|
||||
@@ -60,11 +61,27 @@ def login(req: LoginRequest, db: Session = Depends(get_db)):
|
||||
|
||||
@router.post("/heartbeat", response_model=Message)
|
||||
def heartbeat(
|
||||
req: Optional[HeartbeatIn] = None,
|
||||
current_user: User = Depends(get_current_user),
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
"""客户端心跳:刷新 last_seen_at,用于在线判定(统一走 online.touch)"""
|
||||
"""客户端心跳:刷新 last_seen_at(在线判定),同时携带 RPA 全量状态写入 rpa_status"""
|
||||
touch(current_user, db)
|
||||
st = db.query(RpaStatus).filter(RpaStatus.user_id == current_user.id).first()
|
||||
if st is None:
|
||||
st = RpaStatus(user_id=current_user.id)
|
||||
db.add(st)
|
||||
if req:
|
||||
if req.boss_login:
|
||||
st.boss_login = req.boss_login
|
||||
if req.browser:
|
||||
st.browser = req.browser
|
||||
if req.apply_status:
|
||||
st.apply_status = req.apply_status
|
||||
st.current = (req.current or "")[:200] or None
|
||||
st.applied = req.applied
|
||||
st.skipped = req.skipped
|
||||
db.commit()
|
||||
return Message(msg="ok")
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,167 @@
|
||||
"""
|
||||
远程控制路由:云端下发开始/结束投递任务,客户端轮询执行并回调。
|
||||
|
||||
- 状态快照 rpa_status:心跳携带全量状态上报,每用户一行(单设备)
|
||||
- 任务 rpa_task:pending → running → done/failed,pending 超时 → expired
|
||||
- 去重(服务端权威拦截):同类型任务未达终态时拒绝重复下发
|
||||
"""
|
||||
import json
|
||||
from datetime import datetime, timedelta
|
||||
|
||||
from fastapi import APIRouter, Depends, HTTPException, Query
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from ..auth import get_current_user
|
||||
from ..database import get_db
|
||||
from ..models import User, RpaStatus, RpaTask
|
||||
from ..online import is_online
|
||||
from ..schemas import RpaTaskIn, RpaTaskFinishIn, Message
|
||||
|
||||
router = APIRouter(prefix="/api/rpa", tags=["远程控制"])
|
||||
|
||||
# 任务终态:达到终态后同类型任务才允许再次下发
|
||||
TERMINAL_STATUS = ("done", "failed", "expired")
|
||||
# pending 超过该时长未客户端认领则过期,防止离线恢复后执行过时任务
|
||||
PENDING_EXPIRE_MINUTES = 10
|
||||
|
||||
|
||||
def _task_dict(t: RpaTask) -> dict:
|
||||
return {
|
||||
"id": t.id,
|
||||
"task_type": t.task_type,
|
||||
"params": json.loads(t.params) if t.params else None,
|
||||
"status": t.status,
|
||||
"result": t.result,
|
||||
"created_at": (t.created_at + timedelta(hours=8)).strftime("%Y-%m-%d %H:%M:%S"),
|
||||
"updated_at": (t.updated_at + timedelta(hours=8)).strftime("%Y-%m-%d %H:%M:%S"),
|
||||
}
|
||||
|
||||
|
||||
@router.get("/status", response_model=dict)
|
||||
def get_rpa_status(
|
||||
current_user: User = Depends(get_current_user),
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
"""RPA 状态快照(控制端展示):在线 + Boss登录 + 浏览器 + 投递状态"""
|
||||
st = db.query(RpaStatus).filter(RpaStatus.user_id == current_user.id).first()
|
||||
return {
|
||||
"online": is_online(current_user),
|
||||
"boss_login": st.boss_login if st else "unknown",
|
||||
"browser": st.browser if st else "unknown",
|
||||
"apply_status": st.apply_status if st else "idle",
|
||||
"current": st.current if st else None,
|
||||
"applied": st.applied if st else 0,
|
||||
"skipped": st.skipped if st else 0,
|
||||
"updated_at": (st.updated_at + timedelta(hours=8)).strftime("%Y-%m-%d %H:%M:%S") if st else None,
|
||||
}
|
||||
|
||||
|
||||
@router.post("/tasks", response_model=dict)
|
||||
def create_task(
|
||||
req: RpaTaskIn,
|
||||
current_user: User = Depends(get_current_user),
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
"""控制端下发任务。服务端权威去重:同类型非终态任务存在时拒绝"""
|
||||
if req.task_type not in ("start_apply", "stop_apply"):
|
||||
raise HTTPException(status_code=422, detail="未知任务类型")
|
||||
|
||||
if not is_online(current_user):
|
||||
raise HTTPException(status_code=409, detail="RPA 客户端离线,无法下发任务")
|
||||
|
||||
# 去重拦截:同类型任务未达终态,禁止重复下发
|
||||
dup = db.query(RpaTask).filter(
|
||||
RpaTask.user_id == current_user.id,
|
||||
RpaTask.task_type == req.task_type,
|
||||
RpaTask.status.in_(("pending", "running")),
|
||||
).first()
|
||||
if dup:
|
||||
raise HTTPException(
|
||||
status_code=409,
|
||||
detail=f"已有同类型任务未结束(#{dup.id} 状态={dup.status}),请勿重复下发")
|
||||
|
||||
# 基于状态快照的业务预检,避免下发必然失败的任务
|
||||
st = db.query(RpaStatus).filter(RpaStatus.user_id == current_user.id).first()
|
||||
if req.task_type == "start_apply" and st and st.apply_status == "running":
|
||||
raise HTTPException(status_code=409, detail="投递任务已在运行中")
|
||||
if req.task_type == "stop_apply" and st and st.apply_status != "running":
|
||||
raise HTTPException(status_code=409, detail="当前没有运行中的投递任务")
|
||||
|
||||
if req.task_type == "start_apply":
|
||||
params = req.params or {}
|
||||
if not params.get("keywords") or not params.get("city_code"):
|
||||
raise HTTPException(status_code=422, detail="开始投递必须提供 keywords 与 city_code")
|
||||
|
||||
task = RpaTask(
|
||||
user_id=current_user.id,
|
||||
task_type=req.task_type,
|
||||
params=json.dumps(req.params or {}, ensure_ascii=False),
|
||||
)
|
||||
db.add(task)
|
||||
db.commit()
|
||||
db.refresh(task)
|
||||
return _task_dict(task)
|
||||
|
||||
|
||||
@router.get("/tasks", response_model=dict)
|
||||
def list_tasks(
|
||||
limit: int = Query(20, ge=1, le=100),
|
||||
current_user: User = Depends(get_current_user),
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
"""控制端任务历史(倒序)"""
|
||||
rows = db.query(RpaTask).filter(RpaTask.user_id == current_user.id) \
|
||||
.order_by(RpaTask.id.desc()).limit(limit).all()
|
||||
return {"items": [_task_dict(t) for t in rows]}
|
||||
|
||||
|
||||
@router.get("/tasks/pending", response_model=dict)
|
||||
def fetch_pending_task(
|
||||
current_user: User = Depends(get_current_user),
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
"""客户端轮询:取走最早一条 pending 并标记 running(认领即占位,防重复拉取)"""
|
||||
# 顺带过期清理:pending 超时未认领 → expired
|
||||
cutoff = datetime.utcnow() - timedelta(minutes=PENDING_EXPIRE_MINUTES)
|
||||
stale = db.query(RpaTask).filter(
|
||||
RpaTask.user_id == current_user.id,
|
||||
RpaTask.status == "pending",
|
||||
RpaTask.created_at < cutoff,
|
||||
).all()
|
||||
for t in stale:
|
||||
t.status = "expired"
|
||||
t.result = f"超过 {PENDING_EXPIRE_MINUTES} 分钟未执行,自动过期"
|
||||
|
||||
task = db.query(RpaTask).filter(
|
||||
RpaTask.user_id == current_user.id,
|
||||
RpaTask.status == "pending",
|
||||
).order_by(RpaTask.id.asc()).first()
|
||||
if not task:
|
||||
db.commit()
|
||||
return {"task": None}
|
||||
task.status = "running"
|
||||
db.commit()
|
||||
db.refresh(task)
|
||||
return {"task": _task_dict(task)}
|
||||
|
||||
|
||||
@router.post("/tasks/{task_id}/finish", response_model=Message)
|
||||
def finish_task(
|
||||
task_id: int,
|
||||
req: RpaTaskFinishIn,
|
||||
current_user: User = Depends(get_current_user),
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
"""客户端执行完回调:更新任务终态与结果"""
|
||||
if req.status not in ("done", "failed"):
|
||||
raise HTTPException(status_code=422, detail="回调状态只能为 done/failed")
|
||||
task = db.query(RpaTask).filter(
|
||||
RpaTask.id == task_id,
|
||||
RpaTask.user_id == current_user.id,
|
||||
).first()
|
||||
if not task:
|
||||
raise HTTPException(status_code=404, detail="任务不存在")
|
||||
task.status = req.status
|
||||
task.result = (req.result or "")[:500]
|
||||
db.commit()
|
||||
return Message(msg="ok")
|
||||
@@ -172,6 +172,29 @@ class BlacklistOut(BaseModel):
|
||||
from_attributes = True
|
||||
|
||||
|
||||
# =======================================================
|
||||
# 远程控制(RPA 状态上报 + 任务下发)
|
||||
# =======================================================
|
||||
class HeartbeatIn(BaseModel):
|
||||
"""心跳携带的 RPA 全量状态(可选,老客户端不带体也兼容)"""
|
||||
boss_login: Optional[str] = None
|
||||
browser: Optional[str] = None
|
||||
apply_status: Optional[str] = None
|
||||
current: Optional[str] = None
|
||||
applied: int = 0
|
||||
skipped: int = 0
|
||||
|
||||
|
||||
class RpaTaskIn(BaseModel):
|
||||
task_type: str = Field(..., description="start_apply / stop_apply")
|
||||
params: Optional[dict] = None
|
||||
|
||||
|
||||
class RpaTaskFinishIn(BaseModel):
|
||||
status: str = Field(..., description="done / failed")
|
||||
result: Optional[str] = None
|
||||
|
||||
|
||||
# =======================================================
|
||||
# 通用
|
||||
# =======================================================
|
||||
|
||||
+96
-4
@@ -111,6 +111,7 @@
|
||||
<aside>
|
||||
<div class="menu-item active" data-page="data">投递数据</div>
|
||||
<div class="menu-item" data-page="blacklist">公司黑名单</div>
|
||||
<div class="menu-item" data-page="remote">远程控制</div>
|
||||
</aside>
|
||||
|
||||
<!-- 右侧内容 -->
|
||||
@@ -186,6 +187,35 @@
|
||||
<button id="blNext">下一页</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 远程控制 -->
|
||||
<div id="pageRemote" class="hidden">
|
||||
<div class="stats" id="remoteStatus">
|
||||
<div class="stat-card"><div class="num" id="rsOnline">-</div><div class="label">客户端在线</div></div>
|
||||
<div class="stat-card"><div class="num" id="rsBoss">-</div><div class="label">Boss 登录</div></div>
|
||||
<div class="stat-card"><div class="num" id="rsBrowser">-</div><div class="label">浏览器</div></div>
|
||||
<div class="stat-card"><div class="num" id="rsApply">-</div><div class="label">投递状态</div></div>
|
||||
</div>
|
||||
<div class="bl-tip" id="rsDetail">进度:- | 更新:-</div>
|
||||
|
||||
<div class="bl-add" style="flex-wrap:wrap;">
|
||||
<input type="text" id="rKeywords" placeholder="搜索关键词,多个用逗号分隔,如:java,后端" style="flex:2;min-width:220px;">
|
||||
<input type="text" id="rCity" placeholder="城市码(如 101010100=北京)" style="flex:1;min-width:150px;">
|
||||
<input type="number" id="rScore" placeholder="及格分" value="65" style="width:80px;">
|
||||
<input type="number" id="rLimit" placeholder="每日上限(0不限)" value="0" style="width:130px;">
|
||||
<label style="display:flex;align-items:center;gap:4px;font-size:13px;"><input type="checkbox" id="rOnlineOnly"> 只投在线Boss</label>
|
||||
<label style="display:flex;align-items:center;gap:4px;font-size:13px;"><input type="checkbox" id="rHunter"> 考虑猎头</label>
|
||||
<button id="btnStartRemote" style="background:#1890ff;">开始投递</button>
|
||||
<button id="btnStopRemote">结束投递</button>
|
||||
</div>
|
||||
<div class="bl-tip">任务下发后客户端 5 秒内认领执行;同类型任务未结束前不能重复下发。</div>
|
||||
|
||||
<table>
|
||||
<thead><tr><th style="width:150px">时间</th><th style="width:100px">类型</th><th style="width:90px">状态</th><th>结果</th></tr></thead>
|
||||
<tbody id="taskTbody"></tbody>
|
||||
</table>
|
||||
<div class="empty hidden" id="taskEmpty">暂无远程任务</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -348,13 +378,53 @@ async function removeBlacklist(id) {
|
||||
} catch (e) { alert('移除失败:' + (e.message || '')); }
|
||||
}
|
||||
|
||||
/* ---------- 远程控制 ---------- */
|
||||
const TASK_TXT = { start_apply: '开始投递', stop_apply: '结束投递' };
|
||||
const TASK_STATUS_TXT = { pending: '待认领', running: '执行中', done: '已完成', failed: '失败', expired: '已过期' };
|
||||
|
||||
async function loadRemote() {
|
||||
try {
|
||||
const st = await api('/api/rpa/status');
|
||||
const put = (id, txt, cls) => {
|
||||
const el = document.getElementById(id);
|
||||
el.textContent = txt;
|
||||
el.className = 'num ' + (cls || '');
|
||||
};
|
||||
put('rsOnline', st.online ? '在线' : '离线', st.online ? 'green' : 'orange');
|
||||
put('rsBoss', st.boss_login === 'logged_in' ? '已登录' : (st.boss_login === 'logging_in' ? '登录中' : '未登录'),
|
||||
st.boss_login === 'logged_in' ? 'green' : 'orange');
|
||||
put('rsBrowser', st.browser === 'running' ? '运行中' : '已停止', st.browser === 'running' ? 'green' : 'orange');
|
||||
put('rsApply', st.apply_status === 'running' ? '运行中' : '空闲', st.apply_status === 'running' ? 'blue' : 'green');
|
||||
document.getElementById('rsDetail').textContent =
|
||||
'进度:' + (st.apply_status === 'running' ? (st.current || '-') + ' 投' + st.applied + '/跳' + st.skipped : '-') +
|
||||
' | 状态更新:' + (st.updated_at || '-');
|
||||
} catch (e) { /* 401 已在 api 内处理 */ }
|
||||
try {
|
||||
const d = await api('/api/rpa/tasks?limit=15');
|
||||
const items = d.items || [];
|
||||
document.getElementById('taskTbody').innerHTML = items.map(t =>
|
||||
'<tr><td>' + esc(t.created_at) + '</td><td>' + (TASK_TXT[t.task_type] || t.task_type) + '</td><td>' +
|
||||
(TASK_STATUS_TXT[t.status] || t.status) + '</td><td>' + esc(t.result || '-') + '</td></tr>'
|
||||
).join('');
|
||||
document.getElementById('taskEmpty').classList.toggle('hidden', items.length > 0);
|
||||
} catch (e) { /* ignore */ }
|
||||
}
|
||||
|
||||
async function sendTask(taskType, params) {
|
||||
try {
|
||||
await api('/api/rpa/tasks', { method: 'POST', body: JSON.stringify({ task_type: taskType, params }) });
|
||||
await loadRemote();
|
||||
} catch (e) { alert('下发失败:' + (e.message || '')); }
|
||||
}
|
||||
|
||||
/* ---------- 页面切换 ---------- */
|
||||
function switchPage(page) {
|
||||
document.querySelectorAll('aside .menu-item').forEach(el =>
|
||||
el.classList.toggle('active', el.dataset.page === page));
|
||||
document.getElementById('pageData').classList.toggle('hidden', page !== 'data');
|
||||
document.getElementById('pageBlacklist').classList.toggle('hidden', page !== 'blacklist');
|
||||
if (page === 'data') load(); else loadBlacklist();
|
||||
document.getElementById('pageRemote').classList.toggle('hidden', page !== 'remote');
|
||||
if (page === 'data') load(); else if (page === 'blacklist') loadBlacklist(); else loadRemote();
|
||||
}
|
||||
|
||||
/* ---------- 事件绑定 ---------- */
|
||||
@@ -405,6 +475,26 @@ document.getElementById('blCompany').addEventListener('keydown', e => {
|
||||
});
|
||||
document.getElementById('blPrev').onclick = () => { if (blState.page > 1) { blState.page--; loadBlacklist(); } };
|
||||
document.getElementById('blNext').onclick = () => { blState.page++; loadBlacklist(); };
|
||||
|
||||
// 远程控制
|
||||
document.getElementById('btnStartRemote').onclick = () => {
|
||||
const keywords = (document.getElementById('rKeywords').value || '').split(/[,,\s]+/).filter(Boolean);
|
||||
const cityCode = (document.getElementById('rCity').value || '').trim();
|
||||
if (!keywords.length) { alert('请填写搜索关键词'); return; }
|
||||
if (!cityCode) { alert('请填写城市码'); return; }
|
||||
if (!confirm('确认远程启动投递任务?')) return;
|
||||
sendTask('start_apply', {
|
||||
keywords, city_code: cityCode,
|
||||
min_score: parseInt(document.getElementById('rScore').value, 10) || 65,
|
||||
daily_limit: parseInt(document.getElementById('rLimit').value, 10) || 0,
|
||||
boss_online_only: document.getElementById('rOnlineOnly').checked,
|
||||
allow_headhunter: document.getElementById('rHunter').checked,
|
||||
});
|
||||
};
|
||||
document.getElementById('btnStopRemote').onclick = () => {
|
||||
if (!confirm('确认远程结束投递任务?')) return;
|
||||
sendTask('stop_apply', null);
|
||||
};
|
||||
document.getElementById('blTbody').addEventListener('click', e => {
|
||||
const btn = e.target.closest('.bl-remove');
|
||||
if (btn) removeBlacklist(btn.dataset.id);
|
||||
@@ -428,9 +518,11 @@ async function enter() {
|
||||
|
||||
if (token()) enter(); else showLogin();
|
||||
setInterval(() => {
|
||||
if (token() && !document.getElementById('dataView').classList.contains('hidden')
|
||||
&& !document.getElementById('pageData').classList.contains('hidden')) load();
|
||||
}, 30000);
|
||||
if (token() && !document.getElementById('dataView').classList.contains('hidden')) {
|
||||
if (!document.getElementById('pageData').classList.contains('hidden')) load();
|
||||
if (!document.getElementById('pageRemote').classList.contains('hidden')) loadRemote();
|
||||
}
|
||||
}, 5000);
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
Reference in New Issue
Block a user