feat(phase4): 全部业务模块迁移到 modules/（结构迁移）
- 21 个模块目录（auth/system/dictionary/configuration/cms/member/region/link/notice/job/log/upload/index） - 每个模块 router.py（合并模块导出多个 router）/schemas.py/service.py/repository.py/models.py - routers/v1.py 与 routers/__init__.py 改为直接引用 modules，前缀与权限串原样保留 - core/middleware.py 懒加载指向 modules.system.menu / modules.log；core/redis_client.py 指向 modules.job.scheduler - apps/views|services|forms 全部改为 re-export 垫片 - 迁移后 grep 守门通过：modules/core 无 apps/extensions 残留引用 - 实测登录、27+ 模块接口、写操作 commit、操作日志落库均正常 Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
Claude
@@ -0,0 +1,14 @@
|
||||
# +========== 迁移新增：本模块 Repository 层
|
||||
"""modules/system/role 数据访问层。"""
|
||||
from modules.system.role.models import Role, RoleMenu
|
||||
from shared.base_repository import BaseRepository
|
||||
|
||||
class RoleRepository(BaseRepository[Role]):
|
||||
pass
|
||||
|
||||
role_repo = RoleRepository(Role)
|
||||
|
||||
class RoleMenuRepository(BaseRepository[RoleMenu]):
|
||||
pass
|
||||
|
||||
rolemenu_repo = RoleMenuRepository(RoleMenu)
|
||||
@@ -0,0 +1,130 @@
|
||||
from fastapi import APIRouter, Request
|
||||
|
||||
from modules.system.role.schemas import RoleForm, RoleStatusForm
|
||||
from core.middleware import check_demo
|
||||
from core.middleware import permission_required
|
||||
from modules.system.role import service as role
|
||||
from core import R
|
||||
from utils.request import parse_batch_ids
|
||||
|
||||
# 创建路由
|
||||
role_router = APIRouter()
|
||||
|
||||
|
||||
# 查询分页数据
|
||||
@role_router.get('/page', summary='查询分页数据')
|
||||
@permission_required("sys:role:page")
|
||||
def page(request: Request):
|
||||
# 调用查询分页数据服务方法
|
||||
result = role.get_role_page(request)
|
||||
# 返回结果
|
||||
return result
|
||||
|
||||
|
||||
# 查询角色详情
|
||||
@role_router.get('/detail/{id}', summary='查询角色详情')
|
||||
@permission_required("sys:role:detail")
|
||||
def detail(request: Request, id):
|
||||
# 调用查询角色详情服务方法
|
||||
data = role.get_role_detail(id)
|
||||
# 返回结果
|
||||
return R.ok(data=data)
|
||||
|
||||
|
||||
# 添加角色
|
||||
@role_router.post('/add', summary='添加角色')
|
||||
@permission_required("sys:role:add")
|
||||
@check_demo
|
||||
def add(request: Request, data: RoleForm):
|
||||
# 调用添加角色服务
|
||||
result = role.add_role(request, data)
|
||||
# 返回结果
|
||||
return result
|
||||
|
||||
|
||||
# 更新角色
|
||||
@role_router.put('/update', summary='更新角色')
|
||||
@permission_required("sys:role:update")
|
||||
@check_demo
|
||||
def update(request: Request, data: RoleForm):
|
||||
# 调用更新角色服务方法
|
||||
result = role.update_role(request, data)
|
||||
# 返回结果
|
||||
return result
|
||||
|
||||
|
||||
# 删除角色
|
||||
@role_router.delete('/delete/{id}', summary='删除角色')
|
||||
@permission_required("sys:role:delete")
|
||||
@check_demo
|
||||
async def delete(request: Request, id):
|
||||
# 调用删除角色服务方法
|
||||
result = await role.delete_role(id)
|
||||
# 返回结果
|
||||
return result
|
||||
|
||||
|
||||
# 设置角色状态
|
||||
@role_router.put('/status', summary='设置角色状态')
|
||||
@permission_required("sys:role:status")
|
||||
@check_demo
|
||||
def status(request: Request, data: RoleStatusForm):
|
||||
# 调用设置角色状态服务方法
|
||||
result = role.update_role_status(request, data)
|
||||
# 返回结果
|
||||
return result
|
||||
|
||||
|
||||
# 获取角色列表
|
||||
@role_router.get('/getRoleList', summary='获取角色列表')
|
||||
def get_role_list(request: Request):
|
||||
# 调用获取角色列表方法
|
||||
result = role.get_role_list()
|
||||
# 返回结果
|
||||
return R.ok(data=result)
|
||||
|
||||
|
||||
# 批量删除角色
|
||||
@role_router.delete('/batchDelete', summary='批量删除角色')
|
||||
@permission_required("sys:role:batch_delete")
|
||||
@check_demo
|
||||
async def batch_delete(request: Request):
|
||||
"""
|
||||
批量删除角色
|
||||
|
||||
Request Body:
|
||||
[1, 2, 3] # 角色ID数组
|
||||
"""
|
||||
id_str, err = await parse_batch_ids(request)
|
||||
if err:
|
||||
return err
|
||||
return await role.delete_role(id_str)
|
||||
|
||||
|
||||
from fastapi import APIRouter, Request
|
||||
|
||||
from modules.system.role.schemas import RoleMenuForm
|
||||
from core.middleware import check_demo
|
||||
from core.middleware import permission_required
|
||||
from modules.system.role import service as role_menu
|
||||
from core import R
|
||||
|
||||
# 创建路由
|
||||
role_menu_router = APIRouter()
|
||||
|
||||
|
||||
# 查询角色菜单列表
|
||||
@role_menu_router.get('/index/{role_id}', summary='查询角色菜单列表')
|
||||
@permission_required("sys:rolemenu:index")
|
||||
def index(request: Request, role_id):
|
||||
menu_list = role_menu.get_role_menu_list(role_id)
|
||||
return R.ok(data=menu_list)
|
||||
|
||||
|
||||
# 保存角色菜单数据
|
||||
@role_menu_router.post('/save', summary='保存角色菜单数据')
|
||||
@permission_required("sys:rolemenu:save")
|
||||
@check_demo
|
||||
async def save(request: Request, data: RoleMenuForm):
|
||||
result = await role_menu.save_role_menu(request, data)
|
||||
return result
|
||||
@@ -0,0 +1,28 @@
|
||||
from typing import Optional
|
||||
|
||||
from pydantic import BaseModel, Field
|
||||
|
||||
# 角色表单验证
|
||||
class RoleForm(BaseModel):
|
||||
id: Optional[int] = Field(None, description="角色ID")
|
||||
name: str = Field(..., min_length=1, max_length=150, description="角色名称")
|
||||
code: str = Field(..., min_length=1, max_length=30, description="角色编码")
|
||||
status: int = Field(..., ge=1, le=2, description="角色状态")
|
||||
sort: int = Field(..., ge=0, le=99999, description="角色排序")
|
||||
note: Optional[str] = Field(None, max_length=255, description="角色备注")
|
||||
|
||||
# 设置状态表单
|
||||
class RoleStatusForm(BaseModel):
|
||||
id: int = Field(..., gt=0, description="角色ID")
|
||||
status: int = Field(..., ge=1, le=2, description="角色状态")
|
||||
|
||||
|
||||
from typing import List, Optional
|
||||
|
||||
from pydantic import BaseModel, Field
|
||||
|
||||
|
||||
# 角色菜单表单
|
||||
class RoleMenuForm(BaseModel):
|
||||
role_id: int = Field(..., gt=0, description="角色ID")
|
||||
menu_id: Optional[List[int]] = Field(default=[], description="菜单ID列表")
|
||||
@@ -0,0 +1,259 @@
|
||||
import asyncio
|
||||
from datetime import datetime, timezone
|
||||
|
||||
from fastapi.logger import logger
|
||||
from sqlalchemy import and_
|
||||
|
||||
from shared.constants import PAGE_SIZE
|
||||
from modules.system.role.schemas import RoleForm, RoleStatusForm
|
||||
from modules.system.role.models import Role
|
||||
from core.database import get_db_session
|
||||
from core import R
|
||||
from core.security import get_user_id
|
||||
from utils.request import like_contains, parse_id_list
|
||||
from utils.perm_cache import invalidate_role_perms
|
||||
|
||||
|
||||
# 查询角色分页数据
|
||||
|
||||
def get_role_page(request):
|
||||
db = get_db_session()
|
||||
# 页码
|
||||
page = int(request.query_params.get("pageNo", 1))
|
||||
# 每页数
|
||||
limit = int(request.query_params.get("pageSize", PAGE_SIZE))
|
||||
# 分页查询
|
||||
query = db.query(Role).filter(Role.is_delete == 0)
|
||||
# 角色名称
|
||||
name = request.query_params.get('name')
|
||||
if name:
|
||||
query = query.filter(Role.name.like(like_contains(name), escape='\\'))
|
||||
# 排序
|
||||
query = query.order_by(Role.sort.asc())
|
||||
# 记录总数
|
||||
count = query.count()
|
||||
# 查询分页数据
|
||||
role_list = query.limit(limit).offset((page - 1) * limit).all()
|
||||
# 若当前页超出末页（数据被并发删除），自动回退到第一页
|
||||
if page > 1 and not role_list:
|
||||
page = 1
|
||||
count = query.count()
|
||||
role_list = query.limit(limit).offset(0).all()
|
||||
# 实例化返回对象
|
||||
result = []
|
||||
# 遍历数据源
|
||||
if len(role_list) > 0:
|
||||
for item in role_list:
|
||||
# 对象转字典
|
||||
data = item.to_dict()
|
||||
# 加入列表
|
||||
result.append(data)
|
||||
# 返回结果
|
||||
return R.ok(data=result, count=count)
|
||||
# 根据角色ID查询详情
|
||||
|
||||
def get_role_detail(role_id):
|
||||
db = get_db_session()
|
||||
# 根据ID查询角色
|
||||
role = db.query(Role).filter(and_(Role.id == role_id, Role.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not role:
|
||||
return None
|
||||
# 对象转字典
|
||||
data = role.to_dict()
|
||||
# 返回结果
|
||||
return data
|
||||
# 添加角色
|
||||
|
||||
def add_role(request, data: RoleForm):
|
||||
db = get_db_session()
|
||||
# 唯一性校验
|
||||
if db.query(Role).filter(and_(Role.name == data.name, Role.is_delete == 0)).first():
|
||||
return R.failed("角色名称不能重复")
|
||||
# 表单数据赋值给对象
|
||||
role = Role(**data.model_dump(exclude={'id'}))
|
||||
role.create_user = get_user_id(request)
|
||||
# 插入数据
|
||||
role.save()
|
||||
# 返回结果
|
||||
return R.ok(msg="添加成功")
|
||||
|
||||
|
||||
# 更新角色
|
||||
|
||||
def update_role(request, data: RoleForm):
|
||||
db = get_db_session()
|
||||
# 记录ID判空
|
||||
if not data.id or data.id <= 0:
|
||||
return R.failed("记录ID不能为空")
|
||||
# 唯一性校验（排除自身）
|
||||
if db.query(Role).filter(and_(Role.name == data.name, Role.id != data.id, Role.is_delete == 0)).first():
|
||||
return R.failed("角色名称不能重复")
|
||||
|
||||
# 根据ID查询记录
|
||||
role = db.query(Role).filter(and_(Role.id == data.id, Role.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not role:
|
||||
return R.failed("记录不存在")
|
||||
# 构造更新数据（排除 id）
|
||||
updData = data.model_dump(exclude={'id'})
|
||||
updData['update_user'] = get_user_id(request)
|
||||
updData['update_time'] = datetime.now(tz=timezone.utc)
|
||||
result = db.query(Role).filter_by(id=data.id).update(updData)
|
||||
# 提交数据
|
||||
if not result:
|
||||
return R.failed("更新失败")
|
||||
# 返回结果
|
||||
return R.ok(msg="更新成功")
|
||||
# 删除角色
|
||||
|
||||
async def delete_role(role_id):
|
||||
def _delete():
|
||||
db = get_db_session()
|
||||
# 记录ID为空判断
|
||||
if not role_id:
|
||||
return R.failed("记录ID不存在"), None
|
||||
# 分裂字符串
|
||||
id_list = parse_id_list(role_id)
|
||||
if not id_list:
|
||||
return R.failed("记录ID不存在"), None
|
||||
# 批量查询并校验
|
||||
records = db.query(Role).filter(and_(Role.id.in_(id_list), Role.is_delete == 0)).all()
|
||||
if len(records) != len(id_list):
|
||||
return R.failed("记录不存在"), None
|
||||
# 批量设置删除标识
|
||||
for record in records:
|
||||
record.is_delete = 1
|
||||
return None, (id_list, records)
|
||||
|
||||
# 同步DB操作放入线程池，避免阻塞事件循环
|
||||
err, result = await asyncio.to_thread(_delete)
|
||||
if err:
|
||||
return err
|
||||
id_list, records = result
|
||||
|
||||
# 清理被删角色下所有用户的权限缓存
|
||||
for rid in id_list:
|
||||
await invalidate_role_perms(rid)
|
||||
# 返回结果
|
||||
return R.ok(msg="本次共删除{0}条数据".format(len(records)))
|
||||
# 设置状态
|
||||
|
||||
def update_role_status(request, data: RoleStatusForm):
|
||||
db = get_db_session()
|
||||
# 根据ID查询记录
|
||||
role = db.query(Role).filter(and_(Role.id == data.id, Role.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not role:
|
||||
return R.failed("记录不存在")
|
||||
|
||||
# 更新记录
|
||||
result = db.query(Role).filter_by(id=data.id).update({
|
||||
"status": data.status,
|
||||
"update_user": get_user_id(request),
|
||||
"update_time": datetime.now(tz=timezone.utc)
|
||||
})
|
||||
# 提交数据
|
||||
if not result:
|
||||
return R.failed("设置失败")
|
||||
# 返回结果
|
||||
return R.ok(msg="设置成功")
|
||||
# 获取角色列表
|
||||
|
||||
def get_role_list():
|
||||
db = get_db_session()
|
||||
# 查询角色列表
|
||||
role_rows = db.query(Role).filter(and_(Role.is_delete == 0, Role.status == 1)).order_by(Role.sort.asc()).all()
|
||||
# 实例化角色列表
|
||||
role_list = []
|
||||
# 遍历数据源
|
||||
if role_rows:
|
||||
for v in role_rows:
|
||||
# 对象转字典
|
||||
item = v.to_dict()
|
||||
# 加入数组
|
||||
role_list.append(item)
|
||||
# 返回结果
|
||||
return role_list
|
||||
|
||||
|
||||
import asyncio
|
||||
|
||||
from fastapi.logger import logger
|
||||
from sqlalchemy import and_
|
||||
|
||||
from modules.system.role.schemas import RoleMenuForm
|
||||
from modules.system.menu.models import Menu
|
||||
from modules.system.role.models import RoleMenu
|
||||
from core.database import get_db_session
|
||||
from core import R
|
||||
from utils.perm_cache import invalidate_role_perms
|
||||
|
||||
|
||||
# 根据角色ID查询菜单列表
|
||||
|
||||
def get_role_menu_list(role_id):
|
||||
db = get_db_session()
|
||||
# 获取全部菜单列表（仅查询 id、title、parent_id，避免 SELECT * 全量拉取大字段）
|
||||
menuList = db.query(Menu.id, Menu.title, Menu.parent_id).filter(and_(Menu.is_delete == 0, Menu.status == 1)).order_by(Menu.sort.asc()).all()
|
||||
if len(menuList) == 0:
|
||||
return None
|
||||
# 根据角色ID查询角色菜单关系数据
|
||||
role_menu = db.query(RoleMenu).filter(RoleMenu.role_id == role_id).all()
|
||||
# 菜单ID集合
|
||||
idList = []
|
||||
# 遍历角色菜单数据源
|
||||
if role_menu:
|
||||
for v in role_menu:
|
||||
# 加入数组
|
||||
idList.append(v.menu_id)
|
||||
|
||||
# 实例化菜单列表
|
||||
menu_list = []
|
||||
# 遍历菜单数据
|
||||
for menu in menuList:
|
||||
# 菜单ID
|
||||
menu_id = menu.id
|
||||
data = {
|
||||
'id': menu_id,
|
||||
'title': menu.title,
|
||||
'open': True,
|
||||
'parentId': menu.parent_id,
|
||||
}
|
||||
if menu_id in idList:
|
||||
data['checked'] = True
|
||||
# 加入数组
|
||||
menu_list.append(data)
|
||||
# 返回结果
|
||||
return menu_list
|
||||
# 保存角色菜单数据
|
||||
|
||||
async def save_role_menu(request, data: RoleMenuForm):
|
||||
def _save():
|
||||
db = get_db_session()
|
||||
# 角色ID
|
||||
role_id = data.role_id
|
||||
# 菜单ID列表
|
||||
menuIdList = data.menu_id or []
|
||||
|
||||
# 删除当前角色ID相关菜单权限
|
||||
db.query(RoleMenu).filter(RoleMenu.role_id == role_id).delete()
|
||||
|
||||
# 处理菜单数据
|
||||
if menuIdList:
|
||||
new_menus = []
|
||||
for menu_id in menuIdList:
|
||||
if not menu_id:
|
||||
continue
|
||||
new_menus.append(RoleMenu(role_id=role_id, menu_id=menu_id))
|
||||
db.add_all(new_menus)
|
||||
return role_id
|
||||
|
||||
# 同步DB操作放入线程池，避免阻塞事件循环
|
||||
role_id = await asyncio.to_thread(_save)
|
||||
|
||||
# 清理该角色下所有用户的权限缓存
|
||||
await invalidate_role_perms(role_id)
|
||||
|
||||
# 返回结果
|
||||
return R.ok()
|
||||
Reference in New Issue
Block a user