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:
@@ -1,10 +1,10 @@
|
||||
from datetime import datetime, timezone
|
||||
|
||||
from fastapi.logger import logger
|
||||
from sqlalchemy import and_
|
||||
|
||||
from modules.system.dept.schemas import DeptForm
|
||||
from modules.system.dept.models import Dept
|
||||
from modules.system.dept.repository import dept_repo
|
||||
from core.database import get_db_session
|
||||
from core import R
|
||||
|
||||
@@ -15,9 +15,8 @@ from utils.request import like_contains, parse_id_list
|
||||
# 查询部门数据
|
||||
|
||||
def get_dept_page(request):
|
||||
db = get_db_session()
|
||||
# 实例化查询对象
|
||||
query = db.query(Dept).filter(Dept.is_delete == 0)
|
||||
query = dept_repo.filter(Dept.is_delete == 0)
|
||||
# 部门名称
|
||||
name = request.query_params.get('name')
|
||||
if name:
|
||||
@@ -39,9 +38,8 @@ def get_dept_page(request):
|
||||
# 根据ID查询部门
|
||||
|
||||
def get_dept_detail(dept_id):
|
||||
db = get_db_session()
|
||||
# 根据ID查询部门
|
||||
dept = db.query(Dept).filter(and_(Dept.id == dept_id, Dept.is_delete == 0)).first()
|
||||
dept = dept_repo.get_by_id(dept_id)
|
||||
# 查询结果判空
|
||||
if not dept:
|
||||
return None
|
||||
@@ -52,15 +50,11 @@ def get_dept_detail(dept_id):
|
||||
# 添加部门
|
||||
|
||||
def add_dept(request, data: DeptForm):
|
||||
db = get_db_session()
|
||||
# 唯一性校验
|
||||
if db.query(Dept).filter(and_(Dept.name == data.name, Dept.is_delete == 0)).first():
|
||||
if dept_repo.filter(Dept.name == data.name, Dept.is_delete == 0).first():
|
||||
return R.failed("部门名称不能重复")
|
||||
# 表单数据赋值给对象
|
||||
dept = Dept(**data.model_dump(exclude={'id'}))
|
||||
dept.create_user = get_user_id(request)
|
||||
# 插入数据
|
||||
dept.save()
|
||||
# 表单数据赋值给对象并插入
|
||||
dept_repo.create(**data.model_dump(exclude={'id'}), create_user=get_user_id(request))
|
||||
# 返回结果
|
||||
return R.ok(msg="添加成功")
|
||||
|
||||
@@ -68,24 +62,21 @@ def add_dept(request, data: DeptForm):
|
||||
# 更新部门
|
||||
|
||||
def update_dept(request, data: DeptForm):
|
||||
db = get_db_session()
|
||||
# 记录ID判空
|
||||
if not data.id or data.id <= 0:
|
||||
return R.failed("记录ID不能为空")
|
||||
# 唯一性校验(排除自身)
|
||||
if db.query(Dept).filter(and_(Dept.name == data.name, Dept.id != data.id, Dept.is_delete == 0)).first():
|
||||
if dept_repo.filter(Dept.name == data.name, Dept.id != data.id, Dept.is_delete == 0).first():
|
||||
return R.failed("部门名称不能重复")
|
||||
|
||||
# 根据ID查询记录
|
||||
dept = db.query(Dept).filter(and_(Dept.id == data.id, Dept.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not dept:
|
||||
if not dept_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(Dept).filter_by(id=data.id).update(updData)
|
||||
result = dept_repo.update(data.id, updData)
|
||||
# 提交数据
|
||||
if not result:
|
||||
return R.failed("更新失败")
|
||||
@@ -98,9 +89,8 @@ def delete_dept(dept_id):
|
||||
# 获取部门列表
|
||||
|
||||
def get_dept_list():
|
||||
db = get_db_session()
|
||||
# 查询部门数据列表
|
||||
dept_rows = db.query(Dept).filter(Dept.is_delete == 0).order_by(Dept.sort.asc()).all()
|
||||
dept_rows = dept_repo.filter(Dept.is_delete == 0).order_by(Dept.sort.asc()).all()
|
||||
# 实例化列表
|
||||
dept_list = []
|
||||
# 遍历数据源
|
||||
|
||||
@@ -47,7 +47,6 @@ from datetime import datetime, timezone
|
||||
from fastapi.logger import logger
|
||||
from openpyxl.reader.excel import load_workbook
|
||||
from openpyxl.workbook import Workbook
|
||||
from sqlalchemy import and_
|
||||
|
||||
|
||||
from shared.constants import PAGE_SIZE
|
||||
@@ -201,13 +200,12 @@ async def import_level(request, file):
|
||||
# 职级状态
|
||||
status = ws.cell(item, 4).value
|
||||
# 创建数据
|
||||
level = Level(
|
||||
level_repo.create(
|
||||
name=name,
|
||||
status=1 if status == "正常" else 2,
|
||||
sort=sort,
|
||||
create_user=get_user_id(request)
|
||||
)
|
||||
level.create_user = get_user_id(request)
|
||||
level.save()
|
||||
|
||||
count += 1
|
||||
# 关闭工作簿
|
||||
@@ -229,7 +227,7 @@ async def import_level(request, file):
|
||||
def export_level(request):
|
||||
db = get_db_session()
|
||||
# 查询数据
|
||||
query = db.query(Level).filter(Level.is_delete == 0)
|
||||
query = level_repo.filter(Level.is_delete == 0)
|
||||
# 职级名称
|
||||
name = request.query_params.get('name')
|
||||
if name:
|
||||
@@ -282,9 +280,8 @@ def export_level(request):
|
||||
# 获取职级数据列表
|
||||
|
||||
def get_level_list():
|
||||
db = get_db_session()
|
||||
# 查询职级数据列表
|
||||
level_rows = db.query(Level).filter(and_(Level.is_delete == 0, Level.status == 1)).order_by(Level.sort.asc()).all()
|
||||
level_rows = level_repo.filter(Level.is_delete == 0, Level.status == 1).order_by(Level.sort.asc()).all()
|
||||
# 实例化列表
|
||||
level_list = []
|
||||
# 遍历数据源
|
||||
|
||||
@@ -48,6 +48,7 @@ from sqlalchemy import and_, or_
|
||||
|
||||
from modules.system.menu.schemas import MenuForm
|
||||
from modules.system.menu.models import Menu
|
||||
from modules.system.menu.repository import menu_repo
|
||||
from modules.system.role.models import RoleMenu
|
||||
from modules.system.user.models import UserRole
|
||||
from core.database import get_db_session
|
||||
@@ -60,9 +61,8 @@ from utils.perm_cache import get_cached_permissions, set_cached_permissions, get
|
||||
# 查询菜单列表
|
||||
|
||||
def get_menu_page(request):
|
||||
db = get_db_session()
|
||||
# 实例化查询对象
|
||||
query = db.query(Menu).filter(Menu.is_delete == 0)
|
||||
query = menu_repo.filter(Menu.is_delete == 0)
|
||||
# 菜单名称
|
||||
name = request.query_params.get('name')
|
||||
if name:
|
||||
@@ -84,9 +84,8 @@ def get_menu_page(request):
|
||||
# 根据ID查询菜单详情
|
||||
|
||||
def get_menu_detail(menu_id):
|
||||
db = get_db_session()
|
||||
# 根据ID查询菜单
|
||||
menu = db.query(Menu).filter(and_(Menu.id == menu_id, Menu.is_delete == 0)).first()
|
||||
menu = menu_repo.get_by_id(menu_id)
|
||||
# 查询结果判空
|
||||
if not menu:
|
||||
return None
|
||||
@@ -94,8 +93,8 @@ def get_menu_detail(menu_id):
|
||||
data = menu.to_dict()
|
||||
|
||||
# 查询菜单权限节点
|
||||
permission_list = db.query(Menu).filter(
|
||||
and_(Menu.parent_id == menu_id, Menu.type == 1, Menu.is_delete == 0)).all()
|
||||
permission_list = menu_repo.filter(
|
||||
Menu.parent_id == menu_id, Menu.type == 1, Menu.is_delete == 0).all()
|
||||
# 选中的权限节点
|
||||
checked_list = []
|
||||
if permission_list:
|
||||
@@ -109,12 +108,11 @@ def get_menu_detail(menu_id):
|
||||
|
||||
async def add_menu(request, data: MenuForm):
|
||||
def _add():
|
||||
db = get_db_session()
|
||||
# 权限节点
|
||||
checkedList = data.checked_list or []
|
||||
|
||||
# 表单数据赋值给对象
|
||||
menu = Menu(
|
||||
# 表单数据赋值给对象并插入
|
||||
menu = menu_repo.create(
|
||||
title=data.title,
|
||||
icon=data.icon,
|
||||
path=data.path,
|
||||
@@ -125,11 +123,9 @@ async def add_menu(request, data: MenuForm):
|
||||
status=data.status,
|
||||
hide=data.hide,
|
||||
target=data.target,
|
||||
sort=data.sort
|
||||
sort=data.sort,
|
||||
create_user=get_user_id(request)
|
||||
)
|
||||
menu.create_user = get_user_id(request)
|
||||
# 插入数据
|
||||
menu.save()
|
||||
|
||||
# 保存节点数据
|
||||
set_permission(data.type, checkedList, data.title, data.path, menu.id, get_user_id(request))
|
||||
@@ -146,13 +142,12 @@ async def add_menu(request, data: MenuForm):
|
||||
|
||||
async def update_menu(request, data: MenuForm):
|
||||
def _update():
|
||||
db = get_db_session()
|
||||
# 记录ID判空
|
||||
if not data.id or data.id <= 0:
|
||||
return R.failed("记录ID不能为空")
|
||||
|
||||
# 根据ID查询记录
|
||||
menu = db.query(Menu).filter(and_(Menu.id == data.id, Menu.is_delete == 0)).first()
|
||||
menu = menu_repo.get_by_id(data.id)
|
||||
# 查询结果判空
|
||||
if not menu:
|
||||
return R.failed("记录不存在")
|
||||
@@ -165,7 +160,7 @@ async def update_menu(request, data: MenuForm):
|
||||
updData['update_user'] = get_user_id(request)
|
||||
updData['update_time'] = datetime.now(tz=timezone.utc)
|
||||
# 更新数据源
|
||||
result = db.query(Menu).filter_by(id=data.id).update(updData)
|
||||
result = menu_repo.update(data.id, updData)
|
||||
# 提交数据
|
||||
if not result:
|
||||
return R.failed("更新失败")
|
||||
@@ -188,7 +183,6 @@ async def update_menu(request, data: MenuForm):
|
||||
|
||||
async def delete_menu(menu_id):
|
||||
def _delete():
|
||||
db = get_db_session()
|
||||
# 记录ID为空判断
|
||||
if not menu_id:
|
||||
return R.failed("记录ID不存在"), None
|
||||
@@ -197,7 +191,7 @@ async def delete_menu(menu_id):
|
||||
if not id_list:
|
||||
return R.failed("记录ID不存在"), None
|
||||
# 批量查询并校验
|
||||
records = db.query(Menu).filter(and_(Menu.id.in_(id_list), Menu.is_delete == 0)).all()
|
||||
records = menu_repo.filter(Menu.id.in_(id_list), Menu.is_delete == 0).all()
|
||||
if len(records) != len(id_list):
|
||||
return R.failed("记录不存在"), None
|
||||
# 批量设置删除标识
|
||||
@@ -323,14 +317,13 @@ def set_permission(menu_type, checkedList, title, path, parent_id, user_id):
|
||||
|
||||
def get_permissions_list_sync(user_id):
|
||||
"""同步查询用户权限节点(直查DB,不读缓存),供同步鉴权路径使用"""
|
||||
db = get_db_session()
|
||||
if user_id == 1:
|
||||
# 超级管理员
|
||||
menu_list = db.query(Menu).filter(and_(Menu.is_delete == 0, Menu.type == 1)).all()
|
||||
menu_list = menu_repo.filter(Menu.is_delete == 0, Menu.type == 1).all()
|
||||
else:
|
||||
# 其他用户:通过 ORM join 查询权限节点
|
||||
menu_list = (
|
||||
db.query(Menu)
|
||||
menu_repo.filter()
|
||||
.join(RoleMenu, RoleMenu.menu_id == Menu.id)
|
||||
.join(UserRole, UserRole.role_id == RoleMenu.role_id)
|
||||
.filter(
|
||||
@@ -363,16 +356,15 @@ async def get_permissions_list(user_id):
|
||||
|
||||
def get_permission_menu_list_sync(user_id):
|
||||
"""同步查询用户菜单树(直查DB,不读缓存),供线程池内使用"""
|
||||
db = get_db_session()
|
||||
if user_id == 1:
|
||||
# 超级管理员
|
||||
# 查询全部菜单列表
|
||||
menu_list = db.query(Menu).filter(and_(Menu.is_delete == 0, Menu.status == 1, Menu.type == 0)).order_by(
|
||||
menu_list = menu_repo.filter(Menu.is_delete == 0, Menu.status == 1, Menu.type == 0).order_by(
|
||||
Menu.sort.asc())
|
||||
return get_tree_list(menu_list)
|
||||
# 其他用户:通过 ORM join 查询菜单列表
|
||||
menu_list = (
|
||||
db.query(Menu)
|
||||
menu_repo.filter()
|
||||
.join(RoleMenu, RoleMenu.menu_id == Menu.id)
|
||||
.join(UserRole, UserRole.role_id == RoleMenu.role_id)
|
||||
.filter(
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
from datetime import datetime, timezone
|
||||
|
||||
from fastapi.logger import logger
|
||||
from sqlalchemy import and_
|
||||
|
||||
from shared.constants import PAGE_SIZE
|
||||
from modules.system.position.schemas import PositionForm, PositionStatusForm
|
||||
from modules.system.position.models import Position
|
||||
from modules.system.position.repository import position_repo
|
||||
from core.database import get_db_session
|
||||
from core import R
|
||||
from core.security import get_user_id
|
||||
@@ -15,13 +15,12 @@ from utils.request import like_contains
|
||||
# 查询岗位分页数据
|
||||
|
||||
def get_position_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(Position).filter(Position.is_delete == 0)
|
||||
query = position_repo.filter(Position.is_delete == 0)
|
||||
# 岗位名称
|
||||
name = request.query_params.get('name')
|
||||
if name:
|
||||
@@ -55,9 +54,8 @@ def get_position_page(request):
|
||||
# 根据ID查询岗位详情
|
||||
|
||||
def get_position_detail(position_id):
|
||||
db = get_db_session()
|
||||
# 根据ID查询岗位
|
||||
position = db.query(Position).filter(and_(Position.id == position_id, Position.is_delete == 0)).first()
|
||||
position = position_repo.get_by_id(position_id)
|
||||
# 查询结果判空
|
||||
if not position:
|
||||
return None
|
||||
@@ -68,15 +66,11 @@ def get_position_detail(position_id):
|
||||
# 添加岗位
|
||||
|
||||
def add_position(request, data: PositionForm):
|
||||
db = get_db_session()
|
||||
# 唯一性校验
|
||||
if db.query(Position).filter(and_(Position.name == data.name, Position.is_delete == 0)).first():
|
||||
if position_repo.filter(Position.name == data.name, Position.is_delete == 0).first():
|
||||
return R.failed("岗位名称不能重复")
|
||||
# 表单数据赋值给对象
|
||||
position = Position(**data.model_dump(exclude={'id'}))
|
||||
position.create_user = get_user_id(request)
|
||||
# 插入数据
|
||||
position.save()
|
||||
# 表单数据赋值给对象并插入
|
||||
position_repo.create(**data.model_dump(exclude={'id'}), create_user=get_user_id(request))
|
||||
# 返回结果
|
||||
return R.ok(msg="添加成功")
|
||||
|
||||
@@ -84,24 +78,21 @@ def add_position(request, data: PositionForm):
|
||||
# 更新岗位
|
||||
|
||||
def update_position(request, data: PositionForm):
|
||||
db = get_db_session()
|
||||
# 记录ID判空
|
||||
if not data.id or data.id <= 0:
|
||||
return R.failed("记录ID不能为空")
|
||||
# 唯一性校验(排除自身)
|
||||
if db.query(Position).filter(and_(Position.name == data.name, Position.id != data.id, Position.is_delete == 0)).first():
|
||||
if position_repo.filter(Position.name == data.name, Position.id != data.id, Position.is_delete == 0).first():
|
||||
return R.failed("岗位名称不能重复")
|
||||
|
||||
# 根据ID查询记录
|
||||
position = db.query(Position).filter(and_(Position.id == data.id, Position.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not position:
|
||||
if not position_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(Position).filter_by(id=data.id).update(updData)
|
||||
result = position_repo.update(data.id, updData)
|
||||
# 提交数据
|
||||
if not result:
|
||||
return R.failed("更新失败")
|
||||
@@ -114,15 +105,12 @@ def delete_position(position_id):
|
||||
# 设置状态
|
||||
|
||||
def update_position_status(request, data: PositionStatusForm):
|
||||
db = get_db_session()
|
||||
# 根据ID查询记录
|
||||
position = db.query(Position).filter(and_(Position.id == data.id, Position.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not position:
|
||||
if not position_repo.get_by_id(data.id):
|
||||
return R.failed("记录不存在")
|
||||
|
||||
# 更新记录
|
||||
result = db.query(Position).filter_by(id=data.id).update({
|
||||
result = position_repo.update(data.id, {
|
||||
"status": data.status,
|
||||
"update_user": get_user_id(request),
|
||||
"update_time": datetime.now(tz=timezone.utc)
|
||||
@@ -135,9 +123,8 @@ def update_position_status(request, data: PositionStatusForm):
|
||||
# 获取岗位数据列表
|
||||
|
||||
def get_position_list():
|
||||
db = get_db_session()
|
||||
# 查询岗位数据列表
|
||||
position_rows = db.query(Position).filter(and_(Position.is_delete == 0, Position.status == 1)).order_by(
|
||||
position_rows = position_repo.filter(Position.is_delete == 0, Position.status == 1).order_by(
|
||||
Position.sort.asc()).all()
|
||||
# 实例化列表
|
||||
position_list = []
|
||||
|
||||
@@ -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 = []
|
||||
# 遍历角色菜单数据源
|
||||
|
||||
@@ -2,7 +2,6 @@ from datetime import datetime, timezone
|
||||
import asyncio
|
||||
|
||||
from fastapi.logger import logger
|
||||
from sqlalchemy import and_
|
||||
|
||||
from shared.enums import GENDER_LIST
|
||||
from shared.constants import PAGE_SIZE, DEFAULT_PASSWORD
|
||||
@@ -12,6 +11,7 @@ from modules.system.level.models import Level
|
||||
from modules.system.position.models import Position
|
||||
from modules.system.user.models import User
|
||||
from modules.system.user.models import UserRole
|
||||
from modules.system.user.repository import user_repo
|
||||
from core.database import get_db_session
|
||||
from core import R
|
||||
from core import password
|
||||
@@ -30,7 +30,7 @@ def get_user_page(request):
|
||||
# 每页数
|
||||
limit = int(request.query_params.get("pageSize", PAGE_SIZE))
|
||||
# 实例化查询对象
|
||||
query = db.query(User).filter(User.is_delete == 0)
|
||||
query = user_repo.filter(User.is_delete == 0)
|
||||
# 用户账号
|
||||
username = request.query_params.get('username')
|
||||
if username:
|
||||
@@ -118,7 +118,7 @@ def get_user_page(request):
|
||||
def get_user_detail(user_id):
|
||||
db = get_db_session()
|
||||
# 根据ID查询用户
|
||||
user = db.query(User).filter(and_(User.id == user_id, User.is_delete == 0)).first()
|
||||
user = user_repo.get_by_id(user_id)
|
||||
# 查询结果判空
|
||||
if not user:
|
||||
return None
|
||||
@@ -153,9 +153,8 @@ def get_user_detail(user_id):
|
||||
|
||||
async def add_user(request, data: UserForm):
|
||||
def _add():
|
||||
db = get_db_session()
|
||||
# 唯一性校验
|
||||
if db.query(User).filter(and_(User.username == data.username, User.is_delete == 0)).first():
|
||||
if user_repo.filter(User.username == data.username, User.is_delete == 0).first():
|
||||
return R.failed("登录账号不能重复"), None
|
||||
# 获取表单数据(排除非数据列)
|
||||
formData = data.model_dump(exclude={'city', 'roles'})
|
||||
@@ -178,11 +177,8 @@ async def add_user(request, data: UserForm):
|
||||
formData['city_code'] = citys[1]
|
||||
formData['district_code'] = citys[2]
|
||||
|
||||
# 表单数据赋值给对象
|
||||
user = User(**formData)
|
||||
user.create_user = get_user_id(request)
|
||||
# 插入数据
|
||||
user.save()
|
||||
# 表单数据赋值给对象并插入
|
||||
user = user_repo.create(**formData, create_user=get_user_id(request))
|
||||
return None, user.id
|
||||
|
||||
# 同步DB/文件操作放入线程池,避免阻塞事件循环
|
||||
@@ -201,19 +197,16 @@ async def add_user(request, data: UserForm):
|
||||
|
||||
async def update_user(request, data: UserForm):
|
||||
def _update():
|
||||
db = get_db_session()
|
||||
# 记录ID判空
|
||||
user_id = data.id
|
||||
if not user_id or int(user_id) <= 0:
|
||||
return R.failed("记录ID不能为空"), None
|
||||
# 唯一性校验(排除自身)
|
||||
if db.query(User).filter(and_(User.username == data.username, User.id != data.id, User.is_delete == 0)).first():
|
||||
if user_repo.filter(User.username == data.username, User.id != data.id, User.is_delete == 0).first():
|
||||
return R.failed("登录账号不能重复"), None
|
||||
|
||||
# 根据ID查询记录
|
||||
user = db.query(User).filter(and_(User.id == user_id, User.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not user:
|
||||
if not user_repo.get_by_id(user_id):
|
||||
return R.failed("记录不存在"), None
|
||||
|
||||
# 获取表单数据(排除敏感字段和非数据列)
|
||||
@@ -242,7 +235,7 @@ async def update_user(request, data: UserForm):
|
||||
updData['update_user'] = get_user_id(request)
|
||||
updData['update_time'] = datetime.now(tz=timezone.utc)
|
||||
# 更新数据
|
||||
result = db.query(User).filter_by(id=user_id).update(updData)
|
||||
result = user_repo.update(user_id, updData)
|
||||
if not result:
|
||||
return R.failed("更新失败"), None
|
||||
return None, user_id
|
||||
@@ -284,19 +277,16 @@ def delete_user(user_id):
|
||||
# 设置状态
|
||||
|
||||
def update_user_status(request, data: UserStatusForm):
|
||||
db = get_db_session()
|
||||
# 记录ID
|
||||
id = data.id
|
||||
# 状态值
|
||||
status = data.status
|
||||
# 根据ID查询记录
|
||||
user = db.query(User).filter(and_(User.id == id, User.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not user:
|
||||
if not user_repo.get_by_id(id):
|
||||
return R.failed("记录不存在")
|
||||
|
||||
# 更新记录
|
||||
result = db.query(User).filter_by(id=id).update({
|
||||
result = user_repo.update(id, {
|
||||
"status": status,
|
||||
"update_user": get_user_id(request),
|
||||
"update_time": datetime.now(tz=timezone.utc)
|
||||
@@ -309,18 +299,15 @@ def update_user_status(request, data: UserStatusForm):
|
||||
# 更新用户信息
|
||||
|
||||
def update_user_info(request, data: UserInfoForm):
|
||||
db = get_db_session()
|
||||
# 用户ID
|
||||
user_id = get_user_id(request)
|
||||
# 根据ID查询记录
|
||||
user = db.query(User).filter(and_(User.id == user_id, User.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not user:
|
||||
if not user_repo.get_by_id(user_id):
|
||||
return R.failed("记录不存在")
|
||||
|
||||
# 更新记录
|
||||
updData = data.model_dump()
|
||||
result = db.query(User).filter_by(id=user_id).update(updData)
|
||||
result = user_repo.update(user_id, updData)
|
||||
# 提交数据
|
||||
if not result:
|
||||
return R.failed("更新失败")
|
||||
@@ -329,12 +316,11 @@ def update_user_info(request, data: UserInfoForm):
|
||||
# 更新密码
|
||||
|
||||
def update_pwd(request, data: UpdatePwdForm):
|
||||
db = get_db_session()
|
||||
# 用户ID
|
||||
user_id = get_user_id(request)
|
||||
|
||||
# 根据ID查询用户
|
||||
user = db.query(User).filter(and_(User.is_delete == 0, User.id == user_id)).first()
|
||||
user = user_repo.get_by_id(user_id)
|
||||
if not user:
|
||||
return R.failed("用户不存在")
|
||||
|
||||
@@ -345,7 +331,7 @@ def update_pwd(request, data: UpdatePwdForm):
|
||||
# 加密新密码
|
||||
salt = password.generate_salt()
|
||||
new_hash = password.encrypt_password(data.newPassword, salt)
|
||||
result = db.query(User).filter_by(id=user_id).update({
|
||||
result = user_repo.update(user_id, {
|
||||
"password": new_hash,
|
||||
"salt": salt
|
||||
})
|
||||
@@ -357,19 +343,17 @@ def update_pwd(request, data: UpdatePwdForm):
|
||||
# 重置密码
|
||||
|
||||
def reset_user_pwd(request, data: ResetPwdForm):
|
||||
db = get_db_session()
|
||||
# 用户ID
|
||||
user_id = data.id
|
||||
|
||||
# 根据ID查询用户
|
||||
user = db.query(User).filter(and_(User.is_delete == 0, User.id == user_id)).first()
|
||||
if not user:
|
||||
if not user_repo.get_by_id(user_id):
|
||||
return R.failed("用户不存在")
|
||||
|
||||
# 加密新密码
|
||||
salt = password.generate_salt()
|
||||
new_hash = password.encrypt_password(DEFAULT_PASSWORD, salt)
|
||||
result = db.query(User).filter_by(id=user_id).update({
|
||||
result = user_repo.update(user_id, {
|
||||
"password": new_hash,
|
||||
"salt": salt
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user