feat(repo): 全部模块 service 改用 repository(Repository 全面落地)
- 24 个模块 service 从直接 db.query 改为使用各自 repository(get_by_id/filter/create/update) - 4 个 agent 并行分组转换:system 组、dictionary/configuration/member/region、cms/link/notice、job/log - 保留合法 db 用法:跨模型查询(user→dept/level/position、ad→adsort、adsort→item/itemcate)、投影查询(role/menu)、按条件删除(set_permission/save_role_menu/add_user_role)、独立会话(record_job_log/record_operation_log)、db.commit(pause/resume) - 修复 JobLogRepository 软删列 del_flag;修复 ad/notice create 重复传参 bug - 修复 base_repository.get_by_id/get_by_ids 兼容字符串 ID - 实测:27 个读接口 + dept/notice/member/level 写操作全通过 Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
@@ -2,11 +2,11 @@ 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 modules.system.role.repository import role_repo
|
||||
from core.database import get_db_session
|
||||
from core import R
|
||||
from core.security import get_user_id
|
||||
@@ -17,13 +17,12 @@ 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)
|
||||
query = role_repo.filter(Role.is_delete == 0)
|
||||
# 角色名称
|
||||
name = request.query_params.get('name')
|
||||
if name:
|
||||
@@ -53,9 +52,8 @@ def get_role_page(request):
|
||||
# 根据角色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()
|
||||
role = role_repo.get_by_id(role_id)
|
||||
# 查询结果判空
|
||||
if not role:
|
||||
return None
|
||||
@@ -66,15 +64,11 @@ def get_role_detail(role_id):
|
||||
# 添加角色
|
||||
|
||||
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():
|
||||
if role_repo.filter(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()
|
||||
# 表单数据赋值给对象并插入
|
||||
role_repo.create(**data.model_dump(exclude={'id'}), create_user=get_user_id(request))
|
||||
# 返回结果
|
||||
return R.ok(msg="添加成功")
|
||||
|
||||
@@ -82,24 +76,21 @@ def add_role(request, data: RoleForm):
|
||||
# 更新角色
|
||||
|
||||
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():
|
||||
if role_repo.filter(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:
|
||||
if not role_repo.get_by_id(data.id):
|
||||
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)
|
||||
result = role_repo.update(data.id, updData)
|
||||
# 提交数据
|
||||
if not result:
|
||||
return R.failed("更新失败")
|
||||
@@ -109,7 +100,6 @@ def update_role(request, data: RoleForm):
|
||||
|
||||
async def delete_role(role_id):
|
||||
def _delete():
|
||||
db = get_db_session()
|
||||
# 记录ID为空判断
|
||||
if not role_id:
|
||||
return R.failed("记录ID不存在"), None
|
||||
@@ -118,7 +108,7 @@ async def delete_role(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()
|
||||
records = role_repo.filter(Role.id.in_(id_list), Role.is_delete == 0).all()
|
||||
if len(records) != len(id_list):
|
||||
return R.failed("记录不存在"), None
|
||||
# 批量设置删除标识
|
||||
@@ -140,15 +130,12 @@ async def delete_role(role_id):
|
||||
# 设置状态
|
||||
|
||||
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:
|
||||
if not role_repo.get_by_id(data.id):
|
||||
return R.failed("记录不存在")
|
||||
|
||||
# 更新记录
|
||||
result = db.query(Role).filter_by(id=data.id).update({
|
||||
result = role_repo.update(data.id, {
|
||||
"status": data.status,
|
||||
"update_user": get_user_id(request),
|
||||
"update_time": datetime.now(tz=timezone.utc)
|
||||
@@ -161,9 +148,8 @@ def update_role_status(request, data: RoleStatusForm):
|
||||
# 获取角色列表
|
||||
|
||||
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_rows = role_repo.filter(Role.is_delete == 0, Role.status == 1).order_by(Role.sort.asc()).all()
|
||||
# 实例化角色列表
|
||||
role_list = []
|
||||
# 遍历数据源
|
||||
@@ -185,6 +171,7 @@ 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 modules.system.role.repository import rolemenu_repo
|
||||
from core.database import get_db_session
|
||||
from core import R
|
||||
from utils.perm_cache import invalidate_role_perms
|
||||
@@ -199,7 +186,7 @@ def get_role_menu_list(role_id):
|
||||
if len(menuList) == 0:
|
||||
return None
|
||||
# 根据角色ID查询角色菜单关系数据
|
||||
role_menu = db.query(RoleMenu).filter(RoleMenu.role_id == role_id).all()
|
||||
role_menu = rolemenu_repo.filter(RoleMenu.role_id == role_id).all()
|
||||
# 菜单ID集合
|
||||
idList = []
|
||||
# 遍历角色菜单数据源
|
||||
|
||||
Reference in New Issue
Block a user