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 = []
|
||||
# 遍历数据源
|
||||
|
||||
Reference in New Issue
Block a user