Skip to content
Merged
4 changes: 2 additions & 2 deletions backend/app/api/v1/models/system/dict_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class DictTypeModel(ModelBase):
id = Column(Integer, primary_key=True, autoincrement=True, comment='字典主键')
dict_name = Column(String(100), nullable=True, unique=True, default='', comment='字典名称')
dict_type = Column(String(100), nullable=True, unique=True, default='', comment='字典类型')
status = Column(Boolean, nullable=True, default='0', comment='状态(0正常 1停用)')
status = Column(Boolean, nullable=True, default='1', comment='状态(1正常 0停用)')

# 审计字段
description = Column(Text, nullable=True, comment="备注说明")
Expand Down Expand Up @@ -56,7 +56,7 @@ class DictDataModel(ModelBase):
css_class = Column(String(100), nullable=True, default=None, comment='样式属性(其他样式扩展)')
list_class = Column(String(100), nullable=True, default=None, comment='表格回显样式')
is_default = Column(Boolean, nullable=True, default='N', comment='是否默认(Y是 N否)')
status = Column(Boolean, nullable=True, default='0', comment='状态(0正常 1停用)')
status = Column(Boolean, nullable=True, default='1', comment='状态(1正常 0停用)')

# 审计字段
description = Column(Text, nullable=True, comment="备注说明")
Expand Down
4 changes: 2 additions & 2 deletions backend/app/api/v1/params/system/dict_param.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def __init__(
self,
dict_name: Optional[str] = Query(None, description="字典名称"),
dict_type: Optional[str] = Query(None, description="字典类型"),
status: Optional[bool] = Query(None, description="状态(0正常 1停用)"),
status: Optional[bool] = Query(None, description="状态(1正常 0停用)"),
creator: Optional[int] = Query(None, description="创建人"),
start_time: Optional[DateTimeStr] = Query(None, description="开始时间", example="2023-01-01 00:00:00"),
end_time: Optional[DateTimeStr] = Query(None, description="结束时间", example="2023-12-31 23:59:59"),
Expand Down Expand Up @@ -43,7 +43,7 @@ def __init__(
self,
dict_label: Optional[str] = Query(None, description="字典标签"),
dict_type: Optional[str] = Query(None, description="字典类型"),
status: Optional[bool] = Query(None, description="状态(0正常 1停用)"),
status: Optional[bool] = Query(None, description="状态(1正常 0停用)"),
creator: Optional[int] = Query(None, description="创建人"),
start_time: Optional[DateTimeStr] = Query(None, description="开始时间", example="2023-01-01 00:00:00"),
end_time: Optional[DateTimeStr] = Query(None, description="结束时间", example="2023-12-31 23:59:59"),
Expand Down
4 changes: 2 additions & 2 deletions backend/app/api/v1/schemas/monitor/cache_schema.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class CacheInfoSchema(BaseModel):
"""缓存对象信息模型"""
model_config = ConfigDict(from_attributes=True)

cache_key: str = Field(default='', description='缓存键名')
cache_name: str = Field(default='', description='缓存名称')
cache_key: str = Field(..., description='缓存键名')
cache_name: str = Field(..., description='缓存名称')
cache_value: Any = Field(default=None, description='缓存值')
remark: Optional[str] = Field(default=None, description='备注说明')
15 changes: 5 additions & 10 deletions backend/app/api/v1/schemas/monitor/job_schema.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,41 +2,36 @@

from pydantic import BaseModel, ConfigDict, Field
from typing import Optional
from datetime import datetime

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='任务名称')
name: Optional[str] = Field(..., 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='是否合并运行:是否在多个运行时间到期时仅运行作业一次')
coalesce: Optional[bool] = Field(..., 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='任务执行器:将运行此作业的执行程序的名称')
jobstore: Optional[str] = Field(..., max_length=64, description='任务存储')
executor: Optional[str] = Field(..., max_length=64, description='任务执行器:将运行此作业的执行程序的名称')
trigger_args: Optional[str] = Field(default=None, description='触发器参数')
start_date: Optional[str] = Field(default=None, description='开始时间')
end_date: 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)
...

8 changes: 4 additions & 4 deletions backend/app/api/v1/schemas/monitor/online_schema.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ class OnlineOutSchema(BaseModel):

model_config = ConfigDict(from_attributes=True)

name: Optional[str] = Field(default=None, description='用户名称')
session_id: Optional[str] = Field(default=None, description='会话编号')
user_id: Optional[int] = Field(default=None, description='用户ID')
user_name: Optional[str] = Field(default=None, description='用户名')
name: str = Field(..., description='用户名称')
session_id: str = Field(..., description='会话编号')
user_id: int = Field(..., description='用户ID')
user_name: str = Field(..., description='用户名')
ipaddr: Optional[str] = Field(default=None, description='登陆IP地址')
login_location: Optional[str] = Field(default=None, description='登录所属地')
os: Optional[str] = Field(default=None, description='操作系统')
Expand Down
13 changes: 7 additions & 6 deletions backend/app/api/v1/schemas/system/auth_schema.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from typing import Optional, Union
from datetime import datetime
from pydantic import ConfigDict, Field, BaseModel, model_validator
from pydantic import ConfigDict, Field, BaseModel, field_validator
from sqlalchemy.ext.asyncio import AsyncSession
from sqlalchemy.orm import Session

Expand All @@ -15,7 +15,7 @@ class AuthSchema(BaseModel):

user: Optional[UserOutSchema] = Field(default=None, description='用户信息')
check_data_scope: bool = Field(default=True, description='是否检查数据权限')
db: AsyncSession | Session = Field(default=None, description='数据库会话')
db: AsyncSession | Session | None = Field(default=None, description='数据库会话')


class JWTPayloadSchema(BaseModel):
Expand All @@ -24,11 +24,12 @@ class JWTPayloadSchema(BaseModel):
is_refresh: bool = Field(default=False, description='是否刷新token')
exp: Union[datetime, int] = Field(..., description='过期时间')

@model_validator(mode='after')
def validate_fields(cls, data):
if not data.sub or len(data.sub.strip()) == 0:
@field_validator('sub')
@classmethod
def validate_sub(cls, value: str):
if not value or len(value.strip()) == 0:
raise ValueError("会话编号不能为空")
return data
return value


class JWTOutSchema(BaseModel):
Expand Down
12 changes: 6 additions & 6 deletions backend/app/api/v1/schemas/system/config_schema.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,23 @@ class ConfigCreateSchema(BaseModel):

class ConfigUpdateSchema(ConfigCreateSchema):
"""配置更新模型"""
id: int = Field(description="主键ID")
id: int = Field(..., description="主键ID")


class ConfigOutSchema(ConfigCreateSchema, BaseSchema):
"""配置响应模型"""
model_config = ConfigDict(from_attributes=True)
id: int = Field(description="主键ID")
id: int = Field(..., description="主键ID")


class UpdataSystemConfigSchema(BaseSchema):
class UpdataSystemConfigSchema(BaseModel):
"""更新系统配置"""
sys_web_title: str = Field(description="网站标题")
sys_web_description: str = Field(description="网站描述")
sys_web_description: str = Field(description="网站描述")
sys_web_favicon: str = Field(description="网站图标")
sys_web_logo: str = Field(description="网站logo")
sys_login_background: str = Field(description="登录背景")
sys_web_copyright: str = Field(description="版权信息")
sys_login_background: str = Field(description="登录背景")
sys_web_copyright: str = Field(description="版权信息")
sys_keep_record: str = Field(description="备案号")
sys_help_doc: str = Field(description="帮助文档")
sys_web_privacy: str = Field(description="隐私条款")
Expand Down
19 changes: 10 additions & 9 deletions backend/app/api/v1/schemas/system/dept_schema.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
# -*- coding: utf-8 -*-

from typing import Any, Optional
from pydantic import BaseModel, ConfigDict, Field, field_validator, model_validator, validator
from pydantic import BaseModel, ConfigDict, Field, field_validator

from app.core.base_schema import BaseSchema
from app.core.validator import DateTimeStr
from app.core.logger import logger


class DeptCreateSchema(BaseModel):
"""部门创建模型"""
Expand All @@ -15,20 +14,22 @@ class DeptCreateSchema(BaseModel):
parent_id: Optional[int] = Field(default=None, ge=0, description="父部门ID")
description: Optional[str] = Field(default=None, max_length=500, description="备注说明")

@model_validator(mode='after')
def validate_fields(self):
if not self.name or len(self.name.strip()) == 0:
@field_validator('name')
@classmethod
def validate_name(cls, value: str):
if not value or len(value.strip()) == 0:
raise ValueError("部门名称不能为空")
self.name = self.name.replace(" ", "")
return self
value = value.replace(" ", "")
return value


class DeptUpdateSchema(DeptCreateSchema):
"""部门更新模型"""
id: int = Field(..., gt=0, description="部门ID")
id: int = Field(..., ge=1, description="部门ID")


class DeptOutSchema(DeptCreateSchema, BaseSchema):
"""部门响应模型"""
model_config = ConfigDict(from_attributes=True)

parent_name: Optional[str] = Field(default=None, max_length=40, description="父部门名称")
97 changes: 42 additions & 55 deletions backend/app/api/v1/schemas/system/dict_schema.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from pydantic import BaseModel, ConfigDict, Field
from pydantic_validation_decorator import NotBlank, Pattern, Size
from typing import Literal, Optional
import re
from pydantic import BaseModel, ConfigDict, Field, field_validator
from typing import Optional

from app.core.base_schema import BaseSchema

Expand All @@ -10,29 +10,25 @@ class DictTypeCreateSchema(BaseModel):
字典类型表对应pydantic模型
"""

dict_name: Optional[str] = Field(default=None, description='字典名称')
dict_type: Optional[str] = Field(default=None, description='字典类型')
status: Optional[bool] = Field(default=None, description='状态(0正常 1停用)')
dict_name: str = Field(..., min_length=1, max_length=100, description='字典名称')
dict_type: str = Field(..., min_length=1, max_length=100, description='字典类型')
status: Optional[bool] = Field(default=None, description='状态(1正常 0停用)')
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
@field_validator('dict_name')
def validate_dict_name(cls, value: str):
if not value or value.strip() == '':
raise ValueError('字典名称不能为空')
return value

@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()
@field_validator('dict_type')
def validate_dict_type(cls, value: str):
if not value or value.strip() == '':
raise ValueError('字典类型不能为空')
regexp = r'^[a-z][a-z0-9_]*$'
if not re.match(regexp, value):
raise ValueError('字典类型必须以字母开头,且只能为(小写字母,数字,下滑线)')
return value


class DictTypeUpdateSchema(DictTypeCreateSchema):
Expand All @@ -45,46 +41,37 @@ 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='样式属性(其他样式扩展)')
dict_sort: int = Field(..., gt=0, description='字典排序')
dict_label: str = Field(..., max_length=100, description='字典标签')
dict_value: str = Field(..., max_length=100, description='字典键值')
dict_type: str = Field(..., max_length=100, description='字典类型')
css_class: Optional[str] = Field(default=None, max_length=100, description='样式属性(其他样式扩展)')
list_class: Optional[str] = Field(default=None, description='表格回显样式')
is_default: Optional[bool] = Field(default=None, description='是否默认(Y是 N否)')
status: Optional[bool] = Field(default=None, description='状态(0正常 1停用)')
status: Optional[bool] = Field(default=None, description='状态(1正常 0停用)')
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()
@field_validator('dict_label')
def validate_dict_label(cls, value: str):
if not value or value.strip() == '':
raise ValueError('字典标签不能为空')
return value

@field_validator('dict_value')
def validate_dict_value(cls, value: str):
if not value or value.strip() == '':
raise ValueError('字典键值不能为空')
return value

@field_validator('dict_type')
def validate_dict_type(cls, value: str):
if not value or value.strip() == '':
raise ValueError('字典类型不能为空')
return value


class DictDataUpdateSchema(DictDataCreateSchema):
Expand Down
14 changes: 7 additions & 7 deletions backend/app/api/v1/schemas/system/menu_schema.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
class MenuCreateSchema(BaseModel):
"""菜单创建模型"""
name: str = Field(..., max_length=50, description="菜单名称")
type: int = Field(..., ge=1, le=4, description="菜单类型(1:目录 2:菜单 3:按钮 4:外链)")
type: Optional[int] = Field(default=None, ge=1, le=4, description="菜单类型(1:目录 2:菜单 3:按钮 4:外链)")
icon: Optional[str] = Field(default=None, max_length=100, description="菜单图标")
order: int = Field(default=1, ge=0, description="显示顺序")
order: int = Field(..., ge=1, description="显示顺序")
permission: Optional[str] = Field(default=None, max_length=100, description="权限标识")
route_name: Optional[str] = Field(default=None, max_length=100, description="路由名称")
route_path: Optional[str] = Field(default=None, max_length=200, description="路由地址")
Expand All @@ -25,22 +25,22 @@ class MenuCreateSchema(BaseModel):
title: Optional[str] = Field(default=None, max_length=50, description="菜单标题")
params: Optional[list[dict[str, str]]] = Field(default=None, description="路由参数,格式为[{key: string, value: string}]")
affix: bool = Field(default=False, description="是否固定标签页(True:是 False:否)")
parent_id: Optional[int] = Field(default=None, ge=0, description="父菜单ID")
parent_id: Optional[int] = Field(default=None, ge=1, description="父菜单ID")
description: Optional[str] = Field(default=None, max_length=500, description="备注说明")

@classmethod
@model_validator(mode='after')
def validate_fields(cls, data):
return menu_request_validator(data)
def validate_fields(self):
return menu_request_validator(self)


class MenuUpdateSchema(MenuCreateSchema):
"""菜单更新模型"""
id: int = Field(..., gt=0, description="菜单ID")
id: int = Field(..., ge=1, description="菜单ID")
parent_name: Optional[str] = Field(default=None, max_length=50, description="父菜单名称")


class MenuOutSchema(MenuCreateSchema, BaseSchema):
"""菜单响应模型"""
model_config = ConfigDict(from_attributes=True)

parent_name: Optional[str] = Field(default=None, max_length=50, description="父菜单名称")
Loading