Browse Source

feat&perf: 参数管理模块vo层优化,新增字段校验

master
insistence 7 months ago
parent
commit
d98d5e8c41
  1. 53
      ruoyi-fastapi-backend/module_admin/entity/vo/config_vo.py

53
ruoyi-fastapi-backend/module_admin/entity/vo/config_vo.py

@ -1,7 +1,8 @@
from pydantic import BaseModel, ConfigDict from pydantic import BaseModel, ConfigDict, Field
from pydantic.alias_generators import to_camel from pydantic.alias_generators import to_camel
from typing import Union, Optional, List from typing import Union, Optional, List
from datetime import datetime from datetime import datetime
from module_admin.annotation.check_annotation import NotBlank, Size
from module_admin.annotation.pydantic_annotation import as_query, as_form from module_admin.annotation.pydantic_annotation import as_query, as_form
@ -11,24 +12,44 @@ class ConfigModel(BaseModel):
""" """
model_config = ConfigDict(alias_generator=to_camel, from_attributes=True) model_config = ConfigDict(alias_generator=to_camel, from_attributes=True)
config_id: Optional[int] = None config_id: Optional[int] = Field(default=None, description='参数主键')
config_name: Optional[str] = None config_name: Optional[str] = Field(default=None, description='参数名称')
config_key: Optional[str] = None config_key: Optional[str] = Field(default=None, description='参数键名')
config_value: Optional[str] = None config_value: Optional[str] = Field(default=None, description='参数键值')
config_type: Optional[str] = None config_type: Optional[str] = Field(default=None, description='系统内置(Y是 N否)')
create_by: Optional[str] = None create_by: Optional[str] = Field(default=None, description='创建者')
create_time: Optional[datetime] = None create_time: Optional[datetime] = Field(default=None, description='创建时间')
update_by: Optional[str] = None update_by: Optional[str] = Field(default=None, description='更新者')
update_time: Optional[datetime] = None update_time: Optional[datetime] = Field(default=None, description='更新时间')
remark: Optional[str] = None remark: Optional[str] = Field(default=None, description='备注')
@NotBlank(field_name='config_key', message='参数名称不能为空')
@Size(field_name='config_key', min_length=0, max_length=100, message='参数名称长度不能超过100个字符')
def get_config_key(self):
return self.config_key
@NotBlank(field_name='config_name', message='参数键名不能为空')
@Size(field_name='config_name', min_length=0, max_length=100, message='参数键名长度不能超过100个字符')
def get_config_name(self):
return self.config_name
@NotBlank(field_name='config_value', message='参数键值不能为空')
@Size(field_name='config_value', min_length=0, max_length=500, message='参数键值长度不能超过500个字符')
def get_config_value(self):
return self.config_value
def validate_fields(self):
self.get_config_key()
self.get_config_name()
self.get_config_value()
class ConfigQueryModel(ConfigModel): class ConfigQueryModel(ConfigModel):
""" """
参数配置管理不分页查询模型 参数配置管理不分页查询模型
""" """
begin_time: Optional[str] = None begin_time: Optional[str] = Field(default=None, description='开始时间')
end_time: Optional[str] = None end_time: Optional[str] = Field(default=None, description='结束时间')
@as_query @as_query
@ -37,8 +58,8 @@ class ConfigPageQueryModel(ConfigQueryModel):
""" """
参数配置管理分页查询模型 参数配置管理分页查询模型
""" """
page_num: int = 1 page_num: int = Field(default=1, description='当前页码')
page_size: int = 10 page_size: int = Field(default=10, description='每页记录数')
class DeleteConfigModel(BaseModel): class DeleteConfigModel(BaseModel):
@ -47,4 +68,4 @@ class DeleteConfigModel(BaseModel):
""" """
model_config = ConfigDict(alias_generator=to_camel) model_config = ConfigDict(alias_generator=to_camel)
config_ids: str config_ids: str = Field(description='需要删除的参数主键')

Loading…
Cancel
Save