mirror of
https://github.com/fastapiadmin/FastapiAdmin.git
synced 2026-09-24 05:26:58 +00:00
zhangtao
6a5f8cf0dd
这是一次综合性的项目迭代，包含以下核心变更：
1. **目录与模块重构**
- 调整工作流节点类型模块目录结构，迁移节点类型相关代码
- 重命名platform模块为system模块，更新插件配置信息
- 重构代码生成模块导入路径
2. **数据库与CRUD优化**
- 统一所有CRUD类构造函数，新增数据库会话参数
- 修复权限过滤器数据库会话使用问题
- 更新模板生成器的CRUD代码模板
3. **认证与安全改进**
- 重构JWT密钥配置，移除默认密钥强制要求环境变量
- 重命名密码工具类，统一密码加密校验逻辑
- 优化OAuth认证流程，修复匿名认证使用问题
4. **前端与静态资源**
- 重构前端挂载逻辑，增加目录存在性校验
- 使用标准StaticFiles替换自定义前端挂载实现
5. **工具类与依赖更新**
- 修复导入工具的表名重复检测逻辑
- 优化限流回调代码，移除冗余依赖
- 更新用户、租户等模块的响应模型字段
6. **数据与配置修正**
- 修复系统版本数据字段命名不统一问题
- 简化枚举类校验逻辑，移除冗余注释
- 修复测试用例中的密码工具类导入错误
111 lines
4.6 KiB
Python
111 lines
4.6 KiB
Python
from typing import Any
|
|
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
|
|
from app.core.base_schema import AuthSchema, BatchSetAvailable, PageResultSchema
|
|
from app.core.exceptions import CustomException
|
|
from app.utils.excel_util import ExcelUtil
|
|
|
|
from .crud import PositionCRUD
|
|
from .schema import (
|
|
PositionCreateSchema,
|
|
PositionOutSchema,
|
|
PositionQueryParam,
|
|
PositionUpdateSchema,
|
|
)
|
|
|
|
|
|
class PositionService:
|
|
"""岗位管理服务
|
|
|
|
提供岗位 CRUD、批量启/禁用、Excel 导出等业务能力。
|
|
"""
|
|
|
|
def __init__(self, auth: AuthSchema, db: AsyncSession) -> None:
|
|
self.auth = auth
|
|
self.db = db
|
|
|
|
async def detail(self, id: int) -> PositionOutSchema:
|
|
obj = await PositionCRUD(self.auth, self.db).get_or_404(id=id)
|
|
return PositionOutSchema.model_validate(obj)
|
|
|
|
async def get_options(self) -> list[dict[str, Any]]:
|
|
"""获取岗位下拉选项，委托给 PositionCRUD"""
|
|
return await PositionCRUD(self.auth, self.db).get_options()
|
|
|
|
async def get_list(
|
|
self,
|
|
search: PositionQueryParam | None = None,
|
|
order_by: list[dict] | None = None,
|
|
) -> list[PositionOutSchema]:
|
|
position_list = await PositionCRUD(self.auth, self.db).get_list(search=vars(search) if search else None, order_by=order_by)
|
|
return [PositionOutSchema.model_validate(position) for position in position_list]
|
|
|
|
async def page(
|
|
self,
|
|
page_no: int,
|
|
page_size: int,
|
|
search: PositionQueryParam | None = None,
|
|
order_by: list[dict[str, str]] | None = None,
|
|
) -> PageResultSchema[PositionOutSchema]:
|
|
offset = (page_no - 1) * page_size
|
|
return await PositionCRUD(self.auth, self.db).page(
|
|
offset=offset,
|
|
limit=page_size,
|
|
order_by=order_by or [{"id": "asc"}],
|
|
search=vars(search) if search else None,
|
|
out_schema=PositionOutSchema,
|
|
)
|
|
|
|
async def create(self, data: PositionCreateSchema) -> PositionOutSchema:
|
|
position = await PositionCRUD(self.auth, self.db).get(name=data.name)
|
|
if position:
|
|
raise CustomException(msg="创建失败，该数据已存在")
|
|
new_position = await PositionCRUD(self.auth, self.db).create(data=data)
|
|
return PositionOutSchema.model_validate(new_position)
|
|
|
|
async def update(self, id: int, data: PositionUpdateSchema) -> PositionOutSchema:
|
|
_ = await PositionCRUD(self.auth, self.db).get_or_404(id=id, msg="更新失败，该数据不存在")
|
|
exist_position = await PositionCRUD(self.auth, self.db).get(name=data.name)
|
|
if exist_position and exist_position.id != id:
|
|
raise CustomException(msg="更新失败，名称已存在")
|
|
updated_position = await PositionCRUD(self.auth, self.db).update(id=id, data=data)
|
|
return PositionOutSchema.model_validate(updated_position)
|
|
|
|
async def delete(self, ids: list[int]) -> None:
|
|
if len(ids) < 1:
|
|
raise CustomException(msg="删除失败，删除对象不能为空")
|
|
positions = await PositionCRUD(self.auth, self.db).get_list(search={"id": ("in", ids)})
|
|
position_map = {p.id: p for p in positions}
|
|
for pid in ids:
|
|
if pid not in position_map:
|
|
raise CustomException(msg="删除失败，该数据不存在")
|
|
await PositionCRUD(self.auth, self.db).delete(ids=ids)
|
|
|
|
async def set_available(self, data: BatchSetAvailable) -> None:
|
|
positions = await PositionCRUD(self.auth, self.db).get_list(search={"id": ("in", data.ids)})
|
|
position_map = {p.id: p for p in positions}
|
|
for pid in data.ids:
|
|
if pid not in position_map:
|
|
raise CustomException(msg="该数据不存在")
|
|
await PositionCRUD(self.auth, self.db).set(ids=data.ids, status=data.status)
|
|
|
|
@staticmethod
|
|
def export_list(position_list: list[dict]) -> bytes:
|
|
mapping_dict = {
|
|
"id": "编号",
|
|
"name": "岗位名称",
|
|
"order": "显示顺序",
|
|
"status": "状态",
|
|
"description": "备注",
|
|
"created_time": "创建时间",
|
|
"updated_time": "更新时间",
|
|
"created_id": "创建者ID",
|
|
"updated_id": "更新者ID",
|
|
}
|
|
data = position_list.copy()
|
|
for item in data:
|
|
item["status"] = "启用" if item.get("status") == 0 else "停用"
|
|
item["creator"] = item.get("created_by", {}).get("name", "未知") if isinstance(item.get("created_by"), dict) else "未知"
|
|
return ExcelUtil.export_list2excel(list_data=data, mapping_dict=mapping_dict)
|