mirror of
https://github.com/fastapiadmin/FastapiAdmin.git
synced 2026-09-21 12:52:26 +00:00
feat: 添加任务管理和字典管理功能,优化系统配置和代码结构
本次提交主要包含以下变更: 1. 新增任务管理模块,支持定时任务的创建、更新、删除和状态管理 2. 新增字典管理模块,用于维护系统中常用的固定数据 3. 优化系统配置,移除Celery,改用APScheduler进行任务调度 4. 修复部分前端组件的样式问题,统一输入框宽度 5. 更新文档和相关图片资源,完善系统功能描述 这些变更旨在增强系统的可维护性和功能性,提供更灵活的任务调度机制和更便捷的字典数据管理方式。
This commit is contained in:
@@ -4,6 +4,7 @@ from typing import Optional, Union
|
||||
from datetime import datetime
|
||||
from pydantic import ConfigDict, Field, BaseModel, model_validator
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.api.v1.schemas.system.user_schema import UserOutSchema
|
||||
|
||||
@@ -14,7 +15,7 @@ class AuthSchema(BaseModel):
|
||||
|
||||
user: Optional[UserOutSchema] = Field(default=None, description='用户信息')
|
||||
check_data_scope: bool = Field(default=True, description='是否检查数据权限')
|
||||
db: AsyncSession = Field(default=None, description='数据库会话')
|
||||
db: AsyncSession | Session = Field(default=None, description='数据库会话')
|
||||
|
||||
|
||||
class JWTPayloadSchema(BaseModel):
|
||||
|
||||
@@ -0,0 +1,97 @@
|
||||
from pydantic import BaseModel, ConfigDict, Field
|
||||
from pydantic_validation_decorator import NotBlank, Pattern, Size
|
||||
from typing import Literal, Optional
|
||||
|
||||
from app.core.base_schema import BaseSchema
|
||||
|
||||
|
||||
class DictTypeCreateSchema(BaseModel):
|
||||
"""
|
||||
字典类型表对应pydantic模型
|
||||
"""
|
||||
|
||||
dict_name: Optional[str] = Field(default=None, description='字典名称')
|
||||
dict_type: Optional[str] = Field(default=None, description='字典类型')
|
||||
available: Optional[bool] = Field(default=None, description='状态(0正常 1停用)')
|
||||
description: Optional[str] = Field(None, max_length=255, description="描述")
|
||||
|
||||
@NotBlank(field_name='dict_name', message='字典名称不能为空')
|
||||
@Size(field_name='dict_name', min_length=0, max_length=100, message='字典类型名称长度不能超过100个字符')
|
||||
def get_dict_name(self):
|
||||
return self.dict_name
|
||||
|
||||
@NotBlank(field_name='dict_type', message='字典类型不能为空')
|
||||
@Size(field_name='dict_type', min_length=0, max_length=100, message='字典类型类型长度不能超过100个字符')
|
||||
@Pattern(
|
||||
field_name='dict_type',
|
||||
regexp='^[a-z][a-z0-9_]*$',
|
||||
message='字典类型必须以字母开头,且只能为(小写字母,数字,下滑线)',
|
||||
)
|
||||
def get_dict_type(self):
|
||||
return self.dict_type
|
||||
|
||||
def validate_fields(self):
|
||||
self.get_dict_name()
|
||||
self.get_dict_type()
|
||||
|
||||
|
||||
class DictTypeUpdateSchema(DictTypeCreateSchema):
|
||||
"""字典类型更新模型"""
|
||||
id: int = Field(..., gt=0, description="字典类型ID")
|
||||
|
||||
|
||||
class DictTypeOutSchema(DictTypeCreateSchema, BaseSchema):
|
||||
"""字典类型响应模型"""
|
||||
model_config = ConfigDict(from_attributes=True)
|
||||
|
||||
|
||||
|
||||
class DictDataCreateSchema(BaseModel):
|
||||
"""
|
||||
字典数据表对应pydantic模型
|
||||
"""
|
||||
|
||||
dict_sort: Optional[int] = Field(default=None, description='字典排序')
|
||||
dict_label: Optional[str] = Field(default=None, description='字典标签')
|
||||
dict_value: Optional[str] = Field(default=None, description='字典键值')
|
||||
dict_type: Optional[str] = Field(default=None, description='字典类型')
|
||||
css_class: Optional[str] = Field(default=None, description='样式属性(其他样式扩展)')
|
||||
list_class: Optional[str] = Field(default=None, description='表格回显样式')
|
||||
is_default: Optional[bool] = Field(default=None, description='是否默认(Y是 N否)')
|
||||
available: Optional[bool] = Field(default=None, description='状态(0正常 1停用)')
|
||||
description: Optional[str] = Field(default=None, max_length=255, description="描述")
|
||||
|
||||
@NotBlank(field_name='dict_label', message='字典标签不能为空')
|
||||
@Size(field_name='dict_label', min_length=0, max_length=100, message='字典标签长度不能超过100个字符')
|
||||
def get_dict_label(self):
|
||||
return self.dict_label
|
||||
|
||||
@NotBlank(field_name='dict_value', message='字典键值不能为空')
|
||||
@Size(field_name='dict_value', min_length=0, max_length=100, message='字典键值长度不能超过100个字符')
|
||||
def get_dict_value(self):
|
||||
return self.dict_value
|
||||
|
||||
@NotBlank(field_name='dict_type', message='字典类型不能为空')
|
||||
@Size(field_name='dict_type', min_length=0, max_length=100, message='字典类型长度不能超过100个字符')
|
||||
def get_dict_type(self):
|
||||
return self.dict_type
|
||||
|
||||
@Size(field_name='css_class', min_length=0, max_length=100, message='样式属性长度不能超过100个字符')
|
||||
def get_css_class(self):
|
||||
return self.css_class
|
||||
|
||||
def validate_fields(self):
|
||||
self.get_dict_label()
|
||||
self.get_dict_value()
|
||||
self.get_dict_type()
|
||||
self.get_css_class()
|
||||
|
||||
|
||||
class DictDataUpdateSchema(DictDataCreateSchema):
|
||||
"""字典数据更新模型"""
|
||||
id: int = Field(..., gt=0, description="字典数据ID")
|
||||
|
||||
|
||||
class DictDataOutSchema(DictDataCreateSchema, BaseSchema):
|
||||
"""字典数据响应模型"""
|
||||
model_config = ConfigDict(from_attributes=True)
|
||||
@@ -0,0 +1,39 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
from pydantic import BaseModel, ConfigDict, Field
|
||||
from typing import Optional
|
||||
|
||||
from app.core.validator import DateTimeStr
|
||||
from app.core.base_schema import BaseSchema
|
||||
|
||||
|
||||
class JobCreateSchema(BaseModel):
|
||||
"""
|
||||
定时任务调度表对应pydantic模型
|
||||
"""
|
||||
|
||||
name: Optional[str] = Field(default=None, max_length=64, description='任务名称')
|
||||
func: str = Field(..., description='任务函数')
|
||||
trigger: str = Field(..., description='触发器:控制此作业计划的 trigger 对象')
|
||||
args: Optional[str] = Field(default=None, description='位置参数')
|
||||
kwargs: Optional[str] = Field(default=None, description='关键字参数')
|
||||
coalesce: Optional[bool] = Field(default=False, description='是否合并运行:是否在多个运行时间到期时仅运行作业一次')
|
||||
max_instances: Optional[int] = Field(default=1, ge=1, description='最大实例数:允许的最大并发执行实例数')
|
||||
jobstore: Optional[str] = Field(default='default', max_length=64, description='任务存储')
|
||||
executor: Optional[str] = Field(default='default', max_length=64, description='任务执行器:将运行此作业的执行程序的名称')
|
||||
trigger_args: Optional[str] = Field(default=None, description='触发器参数')
|
||||
description: Optional[str] = Field(default=None, description='备注说明')
|
||||
status: Optional[bool] = Field(default=False, description='任务状态:启动,停止')
|
||||
message: Optional[str] = Field(default=None, max_length=500, description='日志信息')
|
||||
|
||||
class JobUpdateSchema(JobCreateSchema):
|
||||
"""定时任务更新模型"""
|
||||
...
|
||||
id: int = Field(..., gt=0, description="ID")
|
||||
|
||||
|
||||
class JobOutSchema(JobCreateSchema, BaseSchema):
|
||||
"""定时任务响应模型"""
|
||||
model_config = ConfigDict(from_attributes=True)
|
||||
...
|
||||
|
||||
Reference in New Issue
Block a user