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:
+10
-18
@@ -8,7 +8,7 @@ from shared.enums import ITEM_TYPE_LIST
|
||||
from shared.constants import PAGE_SIZE
|
||||
from modules.cms.item.schemas import ItemForm
|
||||
from modules.cms.item.models import Item
|
||||
from core.database import get_db_session
|
||||
from modules.cms.item.repository import item_repo
|
||||
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_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(Item).filter(Item.is_delete == 0)
|
||||
query = item_repo.filter(Item.is_delete == 0)
|
||||
# 站点名称
|
||||
name = request.query_params.get('name')
|
||||
if name:
|
||||
@@ -66,9 +65,8 @@ def get_item_page(request):
|
||||
# 根据ID查询站点详情
|
||||
|
||||
def get_item_detail(item_id):
|
||||
db = get_db_session()
|
||||
# 根据ID查询站点
|
||||
item = db.query(Item).filter(and_(Item.id == item_id, Item.is_delete == 0)).first()
|
||||
item = item_repo.get_by_id(item_id)
|
||||
# 查询结果判空
|
||||
if not item:
|
||||
return None
|
||||
@@ -81,9 +79,8 @@ def get_item_detail(item_id):
|
||||
# 添加站点
|
||||
|
||||
def add_item(request, data: ItemForm):
|
||||
db = get_db_session()
|
||||
# 唯一性校验
|
||||
if db.query(Item).filter(and_(Item.name == data.name, Item.is_delete == 0)).first():
|
||||
if item_repo.filter(and_(Item.name == data.name, Item.is_delete == 0)).first():
|
||||
return R.failed("站点名称不能重复")
|
||||
# 表单数据转字典
|
||||
form_data = data.model_dump(exclude={'id'})
|
||||
@@ -92,11 +89,8 @@ def add_item(request, data: ItemForm):
|
||||
if image:
|
||||
form_data['image'] = save_file(image, "item")
|
||||
|
||||
# 表单数据赋值给对象
|
||||
item = Item(**form_data)
|
||||
item.create_user = get_user_id(request)
|
||||
# 插入数据
|
||||
item.save()
|
||||
# 表单数据赋值给对象并插入
|
||||
item_repo.create(**form_data, create_user=get_user_id(request))
|
||||
# 返回结果
|
||||
return R.ok(msg="添加成功")
|
||||
|
||||
@@ -104,16 +98,15 @@ def add_item(request, data: ItemForm):
|
||||
# 更新站点
|
||||
|
||||
def update_item(request, data: ItemForm):
|
||||
db = get_db_session()
|
||||
# 记录ID判空
|
||||
if not data.id or data.id <= 0:
|
||||
return R.failed("记录ID不能为空")
|
||||
# 唯一性校验(排除自身)
|
||||
if db.query(Item).filter(and_(Item.name == data.name, Item.id != data.id, Item.is_delete == 0)).first():
|
||||
if item_repo.filter(and_(Item.name == data.name, Item.id != data.id, Item.is_delete == 0)).first():
|
||||
return R.failed("站点名称不能重复")
|
||||
|
||||
# 根据ID查询记录
|
||||
item = db.query(Item).filter(and_(Item.id == data.id, Item.is_delete == 0)).first()
|
||||
item = item_repo.get_by_id(data.id)
|
||||
# 查询结果判空
|
||||
if not item:
|
||||
return R.failed("记录不存在")
|
||||
@@ -127,7 +120,7 @@ def update_item(request, data: ItemForm):
|
||||
updData['update_user'] = get_user_id(request)
|
||||
updData['update_time'] = datetime.now(tz=timezone.utc)
|
||||
# 更新数据
|
||||
result = db.query(Item).filter_by(id=data.id).update(updData)
|
||||
result = item_repo.update(data.id, updData)
|
||||
# 提交数据
|
||||
if not result:
|
||||
return R.failed("更新失败")
|
||||
@@ -140,8 +133,7 @@ def delete_item(item_id):
|
||||
# 获取站点列表
|
||||
|
||||
def get_item_list():
|
||||
db = get_db_session()
|
||||
item_rows = db.query(Item).filter(and_(Item.status == 1, Item.is_delete == 0)).order_by(Item.sort.asc()).all()
|
||||
item_rows = item_repo.filter(and_(Item.status == 1, Item.is_delete == 0)).order_by(Item.sort.asc()).all()
|
||||
# 实例化站点列表
|
||||
item_list = []
|
||||
# 遍历数据源
|
||||
|
||||
Reference in New Issue
Block a user