mirror of
https://github.com/fastapiadmin/FastapiAdmin.git
synced 2026-10-04 17:14:21 +00:00
zhangtao
ef5f14e856
feat: 为模型添加租户配额字段和字典表关联关系 fix: 修复部门树查询未应用租户隔离的问题 perf: 优化操作日志中间件的拦截逻辑和日志记录 style: 清理无用导入和重复代码 test: 添加基础测试文件 docs: 更新模型注释和字段说明
90 lines
4.5 KiB
Python
90 lines
4.5 KiB
Python
# -*- coding: utf-8 -*-
|
|
|
|
from sqlalchemy import Boolean, String, Integer, Text, ForeignKey
|
|
from sqlalchemy.orm import Mapped, mapped_column, relationship
|
|
|
|
from app.core.base_model import ModelMixin, UserMixin, TenantMixin, CustomerMixin
|
|
|
|
|
|
class JobModel(ModelMixin, UserMixin, TenantMixin, CustomerMixin):
|
|
"""
|
|
定时任务调度表
|
|
|
|
数据隔离策略:
|
|
===========
|
|
- 系统级任务: tenant_id=1, customer_id=NULL (平台定时任务,如系统维护)
|
|
- 租户级任务: tenant_id>1, customer_id=NULL (租户定时任务,如数据统计)
|
|
- 客户级任务: tenant_id>1, customer_id>0 (客户专属定时任务)
|
|
|
|
任务状态:
|
|
- 0: 运行中
|
|
- 1: 暂停中
|
|
"""
|
|
__tablename__: str = 'app_job'
|
|
__table_args__: dict[str, str] = ({'comment': '定时任务调度表'})
|
|
__loader_options__: list[str] = ["job_logs", "created_by", "updated_by", "tenant", "customer"]
|
|
|
|
name: Mapped[str | None] = mapped_column(String(64), nullable=True, default='', comment='任务名称')
|
|
jobstore: Mapped[str | None] = mapped_column(String(64), nullable=True, default='default', comment='存储器')
|
|
executor: Mapped[str | None] = mapped_column(String(64), nullable=True, default='default', comment='执行器:将运行此作业的执行程序的名称')
|
|
trigger: Mapped[str] = mapped_column(String(64), nullable=False, comment='触发器:控制此作业计划的 trigger 对象')
|
|
trigger_args: Mapped[str | None] = mapped_column(Text, nullable=True, comment='触发器参数')
|
|
func: Mapped[str] = mapped_column(Text, nullable=False, comment='任务函数')
|
|
args: Mapped[str | None] = mapped_column(Text, nullable=True, comment='位置参数')
|
|
kwargs: Mapped[str | None] = mapped_column(Text, nullable=True, comment='关键字参数')
|
|
coalesce: Mapped[bool] = mapped_column(Boolean, nullable=True, default=False, comment='是否合并运行:是否在多个运行时间到期时仅运行作业一次')
|
|
max_instances: Mapped[int] = mapped_column(Integer, nullable=True, default=1, comment='最大实例数:允许的最大并发执行实例数')
|
|
start_date: Mapped[str | None] = mapped_column(String(64), nullable=True, comment='开始时间')
|
|
end_date: Mapped[str | None] = mapped_column(String(64), nullable=True, comment='结束时间')
|
|
|
|
# 关联关系
|
|
job_logs: Mapped[list['JobLogModel'] | None] = relationship(
|
|
back_populates="job",
|
|
lazy="selectin"
|
|
)
|
|
|
|
|
|
class JobLogModel(ModelMixin, TenantMixin):
|
|
"""
|
|
定时任务调度日志表
|
|
|
|
添加tenant_id字段以支持多租户隔离，提高查询性能
|
|
即使job记录被删除，日志仍然保留租户标识信息
|
|
"""
|
|
__tablename__: str = 'app_job_log'
|
|
__table_args__: dict[str, str] = ({'comment': '定时任务调度日志表'})
|
|
__loader_options__: list[str] = ["job"]
|
|
|
|
job_name: Mapped[str] = mapped_column(String(64), nullable=False, comment='任务名称')
|
|
job_group: Mapped[str] = mapped_column(String(64), nullable=False, comment='任务组名')
|
|
job_executor: Mapped[str] = mapped_column(String(64), nullable=False, comment='任务执行器')
|
|
invoke_target: Mapped[str] = mapped_column(String(500), nullable=False, comment='调用目标字符串')
|
|
job_args: Mapped[str | None] = mapped_column(String(255), nullable=True, default='', comment='位置参数')
|
|
job_kwargs: Mapped[str | None] = mapped_column(String(255), nullable=True, default='', comment='关键字参数')
|
|
job_trigger: Mapped[str | None] = mapped_column(String(255), nullable=True, default='', comment='任务触发器')
|
|
job_message: Mapped[str | None] = mapped_column(String(500), nullable=True, default='', comment='日志信息')
|
|
exception_info: Mapped[str | None] = mapped_column(String(2000), nullable=True, default='', comment='异常信息')
|
|
|
|
# 任务关联
|
|
job_id: Mapped[int | None] = mapped_column(
|
|
ForeignKey('app_job.id', ondelete="CASCADE"),
|
|
nullable=True,
|
|
index=True,
|
|
comment='任务ID'
|
|
)
|
|
|
|
# 索引优化 - 为租户ID创建索引
|
|
__table_args__ = ({
|
|
'comment': '定时任务调度日志表',
|
|
})
|
|
|
|
# 为多租户查询性能优化添加复合索引
|
|
# 注意：实际索引会在数据库迁移时创建
|
|
__indexes__ = [
|
|
'tenant_id_idx', # 租户ID索引
|
|
'job_id_tenant_id_idx' # 任务ID和租户ID的复合索引
|
|
]
|
|
job: Mapped["JobModel | None"] = relationship(
|
|
back_populates="job_logs",
|
|
lazy="selectin"
|
|
) |