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:
@@ -7,8 +7,8 @@ from sqlalchemy import and_
|
||||
from shared.constants import PAGE_SIZE
|
||||
from modules.cms.item_cate.schemas import ItemCateForm
|
||||
from modules.cms.item_cate.models import ItemCate
|
||||
from modules.cms.item_cate.repository import itemcate_repo
|
||||
from modules.cms.item import service as item
|
||||
from core.database import get_db_session
|
||||
from core import R
|
||||
from utils.rich_text import get_file_url, save_file
|
||||
from utils.request import like_contains
|
||||
@@ -18,13 +18,12 @@ from core.security import get_user_id
|
||||
# 查询栏目数据
|
||||
|
||||
def get_item_cate_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(ItemCate).filter(ItemCate.is_delete == 0)
|
||||
query = itemcate_repo.filter(ItemCate.is_delete == 0)
|
||||
# 栏目名称
|
||||
name = request.query_params.get('name')
|
||||
if name:
|
||||
@@ -64,9 +63,8 @@ def get_item_cate_page(request):
|
||||
# 根据栏目ID查询详情
|
||||
|
||||
def get_item_cate_detail(itemcate_id):
|
||||
db = get_db_session()
|
||||
# 根据ID查询栏目
|
||||
cate = db.query(ItemCate).filter(and_(ItemCate.id == itemcate_id, ItemCate.is_delete == 0)).first()
|
||||
cate = itemcate_repo.get_by_id(itemcate_id)
|
||||
# 查询结果判空
|
||||
if not cate:
|
||||
return None
|
||||
@@ -80,9 +78,8 @@ def get_item_cate_detail(itemcate_id):
|
||||
# 添加栏目
|
||||
|
||||
def add_item_cate(request, data: ItemCateForm):
|
||||
db = get_db_session()
|
||||
# 唯一性校验
|
||||
if db.query(ItemCate).filter(and_(ItemCate.name == data.name, ItemCate.is_delete == 0)).first():
|
||||
if itemcate_repo.filter(and_(ItemCate.name == data.name, ItemCate.is_delete == 0)).first():
|
||||
return R.failed("栏目名称不能重复")
|
||||
# 表单数据转字典
|
||||
form_data = data.model_dump(exclude={'id'})
|
||||
@@ -100,11 +97,8 @@ def add_item_cate(request, data: ItemCateForm):
|
||||
else:
|
||||
form_data['cover'] = None
|
||||
|
||||
# 表单数据赋值给对象
|
||||
cate = ItemCate(**form_data)
|
||||
cate.create_user = get_user_id(request)
|
||||
# 插入数据
|
||||
cate.save()
|
||||
# 表单数据赋值给对象并插入
|
||||
itemcate_repo.create(**form_data, create_user=get_user_id(request))
|
||||
# 返回结果
|
||||
return R.ok(msg="添加成功")
|
||||
|
||||
@@ -112,16 +106,15 @@ def add_item_cate(request, data: ItemCateForm):
|
||||
# 更新栏目
|
||||
|
||||
def update_item_cate(request, data: ItemCateForm):
|
||||
db = get_db_session()
|
||||
# 记录ID判空
|
||||
if not data.id or data.id <= 0:
|
||||
return R.failed("记录ID不能为空")
|
||||
# 唯一性校验(排除自身)
|
||||
if db.query(ItemCate).filter(and_(ItemCate.name == data.name, ItemCate.id != data.id, ItemCate.is_delete == 0)).first():
|
||||
if itemcate_repo.filter(and_(ItemCate.name == data.name, ItemCate.id != data.id, ItemCate.is_delete == 0)).first():
|
||||
return R.failed("栏目名称不能重复")
|
||||
|
||||
# 根据ID查询记录
|
||||
cate = db.query(ItemCate).filter(and_(ItemCate.id == data.id, ItemCate.is_delete == 0)).first()
|
||||
cate = itemcate_repo.get_by_id(data.id)
|
||||
# 查询结果判空
|
||||
if not cate:
|
||||
return R.failed("记录不存在")
|
||||
@@ -143,7 +136,7 @@ def update_item_cate(request, data: ItemCateForm):
|
||||
updData['update_user'] = get_user_id(request)
|
||||
updData['update_time'] = datetime.now(tz=timezone.utc)
|
||||
# 更新数据
|
||||
result = db.query(ItemCate).filter_by(id=data.id).update(updData)
|
||||
result = itemcate_repo.update(data.id, updData)
|
||||
# 提交数据
|
||||
if not result:
|
||||
return R.failed("更新失败")
|
||||
@@ -156,8 +149,7 @@ def delete_item_cate(cate_id):
|
||||
# 获取栏目列表
|
||||
|
||||
def get_cate_list():
|
||||
db = get_db_session()
|
||||
cate_rows = db.query(ItemCate).filter(and_(ItemCate.is_delete == 0, ItemCate.status == 1)).order_by(
|
||||
cate_rows = itemcate_repo.filter(and_(ItemCate.is_delete == 0, ItemCate.status == 1)).order_by(
|
||||
ItemCate.sort.asc()).all()
|
||||
# 实例化栏目列表
|
||||
cate_list = []
|
||||
|
||||
Reference in New Issue
Block a user