From 1659a0b79d3f149f7e19bea95597037b26cddb73 Mon Sep 17 00:00:00 2001 From: lingyunxsh Date: Wed, 26 Aug 2026 11:49:01 +0800 Subject: [PATCH] =?UTF-8?q?PC=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/browser/applicant.py | 16 ++++ client/server_api.py | 7 ++ docs/schema.sql | 27 ++++++ server/main.py | 3 +- server/models.py | 21 +++++ server/routers/blacklist.py | 66 ++++++++++++++ server/schemas.py | 16 ++++ server/static/view.html | 172 ++++++++++++++++++++++++++++++------ 8 files changed, 300 insertions(+), 28 deletions(-) create mode 100644 server/routers/blacklist.py diff --git a/client/browser/applicant.py b/client/browser/applicant.py index 3e4d97d..7bbeba6 100644 --- a/client/browser/applicant.py +++ b/client/browser/applicant.py @@ -160,6 +160,8 @@ class Applicant: self._tab: dict | None = None self._sess: CDPSession | None = None self._salary_by_id: dict[str, str] = {} + # 公司黑名单(每次任务开始时从云端拉取) + self._blacklist: set[str] = set() # ------------------------------------------------------------------ # 启停控制 @@ -249,6 +251,15 @@ class Applicant: logger.info("已达当日投递上限,任务直接结束") return + # 公司黑名单:拉黑过的公司直接跳过(任务开始时拉取一次) + try: + self._blacklist = set(self.server.list_blacklist()) + if self._blacklist: + logger.info(f"已加载 {len(self._blacklist)} 家黑名单公司") + except Exception as e: + logger.warning(f"获取公司黑名单失败,黑名单过滤跳过:{e}") + self._blacklist = set() + city_name = CITY_NAMES.get(str(city_code), "") for keyword in keywords: if self._should_stop(): @@ -383,6 +394,11 @@ class Applicant: except Exception: pass + # 黑名单过滤:拉黑过的公司全部职位直接跳过 + if card.company and card.company in self._blacklist: + self._report_skip(card, "公司已拉黑") + return 0 + self.stats["current"] = f"评估:{card.company} - {card.title}" logger.debug(f"开始处理卡片:{card.company} - {card.title}" f" | 薪资={card.salary or '未知'} | Boss在线={card.boss_online}") diff --git a/client/server_api.py b/client/server_api.py index f79f608..671a376 100644 --- a/client/server_api.py +++ b/client/server_api.py @@ -246,6 +246,13 @@ class ServerAPI: resp.raise_for_status() return resp.json().get("applied", False) + def list_blacklist(self) -> list[str]: + """公司黑名单名单(公司名列表,拉黑后不再投递该公司)""" + resp = self._req("get", f"{self.base_url}/api/blacklist", + headers=self._headers(), timeout=15) + resp.raise_for_status() + return [i["company"] for i in resp.json()] + def get_stats(self) -> dict: resp = self._req("get", f"{self.base_url}/api/jobs/stats", headers=self._headers(), timeout=15) resp.raise_for_status() diff --git a/docs/schema.sql b/docs/schema.sql index f47c664..3862cbe 100644 --- a/docs/schema.sql +++ b/docs/schema.sql @@ -105,9 +105,36 @@ CREATE TABLE IF NOT EXISTS job_applications ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='投递记录'; +-- ------------------------------------------------------------ +-- 5. 公司黑名单(拉黑后 RPA 不再投递该公司) +-- ------------------------------------------------------------ +CREATE TABLE IF NOT EXISTS company_blacklist ( + id INT AUTO_INCREMENT PRIMARY KEY, + user_id INT NOT NULL, + company VARCHAR(128) NOT NULL COMMENT '公司名(与投递记录 company 精确匹配)', + created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '拉黑时间', + UNIQUE KEY uq_user_company (user_id, company), + KEY ix_blacklist_user_id (user_id), + CONSTRAINT fk_blacklist_user FOREIGN KEY (user_id) + REFERENCES users (id) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci + COMMENT='公司黑名单'; + -- ============================================================ -- 附:老库升级脚本(已建过表、缺少新增字段时执行) -- ============================================================ -- ALTER TABLE job_applications -- ADD COLUMN jd_text TEXT NULL COMMENT '职位JD全文', -- ADD COLUMN greeting VARCHAR(500) NULL COMMENT '实际发送的打招呼语'; +-- +-- 老库新增公司黑名单表: +-- CREATE TABLE IF NOT EXISTS company_blacklist ( +-- id INT AUTO_INCREMENT PRIMARY KEY, +-- user_id INT NOT NULL, +-- company VARCHAR(128) NOT NULL, +-- created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, +-- UNIQUE KEY uq_user_company (user_id, company), +-- KEY ix_blacklist_user_id (user_id), +-- CONSTRAINT fk_blacklist_user FOREIGN KEY (user_id) +-- REFERENCES users (id) ON DELETE CASCADE +-- ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; diff --git a/server/main.py b/server/main.py index 6a182b3..5a52264 100644 --- a/server/main.py +++ b/server/main.py @@ -14,7 +14,7 @@ from loguru import logger from .config import settings from .database import engine -from .routers import register, resumes, sessions, jobs +from .routers import register, resumes, sessions, jobs, blacklist @asynccontextmanager @@ -48,6 +48,7 @@ app.include_router(register.router) app.include_router(resumes.router) app.include_router(sessions.router) app.include_router(jobs.router) +app.include_router(blacklist.router) @app.get("/", tags=["健康检查"]) diff --git a/server/models.py b/server/models.py index e1fbcbf..f28b9d1 100644 --- a/server/models.py +++ b/server/models.py @@ -45,6 +45,7 @@ class User(Base): resumes = relationship("Resume", back_populates="user", cascade="all, delete-orphan") applications = relationship("JobApplication", back_populates="user", cascade="all, delete-orphan") sessions = relationship("ApplySession", back_populates="user", cascade="all, delete-orphan") + blacklist = relationship("CompanyBlacklist", back_populates="user", cascade="all, delete-orphan") class Resume(Base): @@ -135,3 +136,23 @@ class JobApplication(Base): user = relationship("User", back_populates="applications") session = relationship("ApplySession", back_populates="applications") + + +class CompanyBlacklist(Base): + """ + 公司黑名单 + 拉黑后 RPA 不再投递该公司的任何职位 + """ + __tablename__ = "company_blacklist" + __table_args__ = ( + # 同一用户不重复拉黑同一公司 + UniqueConstraint("user_id", "company", name="uq_user_company"), + ) + + id = Column(Integer, primary_key=True, autoincrement=True) + user_id = Column(Integer, ForeignKey("users.id", ondelete="CASCADE"), nullable=False, index=True) + # 公司名(与投递记录中的 company 精确匹配) + company = Column(String(128), nullable=False) + created_at = Column(DateTime, default=utcnow, nullable=False) + + user = relationship("User", back_populates="blacklist") diff --git a/server/routers/blacklist.py b/server/routers/blacklist.py new file mode 100644 index 0000000..b7d0b21 --- /dev/null +++ b/server/routers/blacklist.py @@ -0,0 +1,66 @@ +""" +公司黑名单路由:拉黑后 RPA 不再投递该公司的任何职位 +""" +from fastapi import APIRouter, Depends, HTTPException +from sqlalchemy.orm import Session + +from ..auth import get_current_user +from ..database import get_db +from ..models import User, CompanyBlacklist +from ..schemas import BlacklistIn, BlacklistOut, Message + +router = APIRouter(prefix="/api/blacklist", tags=["公司黑名单"]) + + +@router.get("", response_model=list[BlacklistOut]) +def list_blacklist( + current_user: User = Depends(get_current_user), + db: Session = Depends(get_db), +): + """查询当前用户的黑名单列表(按拉黑时间倒序)""" + return db.query(CompanyBlacklist).filter( + CompanyBlacklist.user_id == current_user.id, + ).order_by(CompanyBlacklist.created_at.desc()).all() + + +@router.post("", response_model=BlacklistOut) +def add_blacklist( + req: BlacklistIn, + current_user: User = Depends(get_current_user), + db: Session = Depends(get_db), +): + """拉黑一家公司(重复拉黑幂等返回已有记录)""" + company = req.company.strip() + if not company: + raise HTTPException(status_code=422, detail="公司名不能为空") + + existing = db.query(CompanyBlacklist).filter( + CompanyBlacklist.user_id == current_user.id, + CompanyBlacklist.company == company, + ).first() + if existing: + return existing + + item = CompanyBlacklist(user_id=current_user.id, company=company) + db.add(item) + db.commit() + db.refresh(item) + return item + + +@router.delete("/{item_id}", response_model=Message) +def remove_blacklist( + item_id: int, + current_user: User = Depends(get_current_user), + db: Session = Depends(get_db), +): + """移除一条黑名单记录""" + item = db.query(CompanyBlacklist).filter( + CompanyBlacklist.id == item_id, + CompanyBlacklist.user_id == current_user.id, + ).first() + if not item: + raise HTTPException(status_code=404, detail="黑名单记录不存在") + db.delete(item) + db.commit() + return Message(msg="已移除") diff --git a/server/schemas.py b/server/schemas.py index 6667652..141a509 100644 --- a/server/schemas.py +++ b/server/schemas.py @@ -156,6 +156,22 @@ class ApplicationOut(BaseModel): from_attributes = True +# ======================================================= +# 公司黑名单 +# ======================================================= +class BlacklistIn(BaseModel): + company: str = Field(..., min_length=1, max_length=128, description="公司名") + + +class BlacklistOut(BaseModel): + id: int + company: str + created_at: datetime + + class Config: + from_attributes = True + + # ======================================================= # 通用 # ======================================================= diff --git a/server/static/view.html b/server/static/view.html index 53546c4..48c1500 100644 --- a/server/static/view.html +++ b/server/static/view.html @@ -3,7 +3,7 @@ -今日投递数据 +投递数据中心 @@ -49,7 +70,7 @@