1461a8d113
按 2026-11-02 需求补齐计划交付后端能力： - 角色授权：权限目录化，接口统一准入校验，未登记默认拒绝； 管理员判断改为按数据库角色重新判定，防止权限码持有者绕过 - 系统监控：单进程采集资源、请求与异常指标，分钟级聚合， 阈值配置化；敏感配置增加 repr 保护，Redis 密码 URL 转义 - 试用期计提：按回款日判定并写入快照，年度结清与调整单联动； 人员模型补试用期、离职日期与工资版本历史字段 - 计提模板：公式骨架受控，页面维护名称与参数绑定 - T+ 采集：自动化配置表与进度查询 内置角色禁停用保护对齐模块注释；核算规则版本提为常量并 补充批量核算失败堆栈日志。 影响范围：后端全部模块、数据库迁移 V22-V28 验证：uv run ruff check 通过；922 个单元测试全部通过； 集成测试因本机 MySQL 数据卷被其他容器锁定暂未运行
81 lines
3.5 KiB
Python
81 lines
3.5 KiB
Python
"""持久化任务执行者；获取连接级锁后才恢复或领取任务。"""
|
|
|
|
from datetime import datetime
|
|
from pathlib import Path
|
|
|
|
from app.core.tplus_db import get_tplus_session_factory, resolve_tplus_settings
|
|
from app.core.tplus_lock import TPlusBusyError, sync_lock
|
|
from app.repositories import tplus_repository as repository
|
|
from app.services.tplus import task_service
|
|
from app.services.tplus.automation import WorkerHeartbeat
|
|
from app.services.tplus.errors import classify_source_error
|
|
from app.services.tplus.relationship_audit import TPlusRelationshipAudit
|
|
from app.services.tplus.sync_service import TPlusSyncService
|
|
|
|
|
|
def run_once(session, source_factory=None, *, worker_owner=None):
|
|
"""返回本轮处理的批次号；忙锁或队列为空时不假称已执行。"""
|
|
try:
|
|
with sync_lock(session), WorkerHeartbeat(session, owner=worker_owner):
|
|
from sqlalchemy import inspect
|
|
|
|
from app.models import TPlusWorkRun
|
|
from app.services.tplus.workbench import execute_next
|
|
|
|
if inspect(session.connection()).has_table(TPlusWorkRun.__tablename__):
|
|
number = execute_next(session)
|
|
if number:
|
|
return number
|
|
task_service.recover_running(session)
|
|
batch = repository.next_queued(session)
|
|
if batch is None:
|
|
session.rollback()
|
|
return None
|
|
batch.status, batch.started_at = "RUNNING", datetime.now()
|
|
session.commit()
|
|
_execute(session, batch, source_factory)
|
|
return batch.batch_no
|
|
except TPlusBusyError:
|
|
session.rollback()
|
|
return None
|
|
|
|
|
|
def _execute(session, batch, source_factory):
|
|
configured = False
|
|
try:
|
|
if batch.requested_by is not None:
|
|
from app.models import User
|
|
from app.services.authorization_service import require_permission
|
|
|
|
require_permission(session, session.get(User, batch.requested_by),
|
|
"tplus:retry" if batch.parent_batch_no else "tplus:collect")
|
|
settings = resolve_tplus_settings(task_service.get_settings())
|
|
if batch.source_database and batch.source_database != settings.t_plus_database:
|
|
raise RuntimeError("任务排队后的源账套配置已改变")
|
|
configured = True
|
|
factory = source_factory or get_tplus_session_factory()
|
|
with factory() as source:
|
|
if batch.sync_mode == "AUDIT":
|
|
root = Path(settings.t_plus_query_dir) if settings.t_plus_query_dir else None
|
|
report = TPlusRelationshipAudit(source, root).run()
|
|
batch.audit_result_json = report
|
|
batch.source_record_count = sum(row["row_count"] for row in report["receipt_kinds"])
|
|
batch.finished_at, batch.status = datetime.now(), "SUCCEEDED"
|
|
if report["relationship_status"] != "OBSERVED":
|
|
task_service.fail_batch(session, batch, "TYPE_UNRESOLVED")
|
|
else:
|
|
session.commit()
|
|
else:
|
|
TPlusSyncService(source, session).execute_claimed(batch)
|
|
except BaseException as exc:
|
|
session.rollback()
|
|
task_service.fail_batch(
|
|
session,
|
|
batch,
|
|
"INTERRUPTED"
|
|
if isinstance(exc, (KeyboardInterrupt, SystemExit))
|
|
else classify_source_error(exc, "EXECUTION_ERROR" if configured else "SOURCE_CONFIG_ERROR"),
|
|
)
|
|
if isinstance(exc, (KeyboardInterrupt, SystemExit)):
|
|
raise
|