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:
@@ -8,6 +8,7 @@ from shared.enums import AD_SORT_PLATFORM_LIST
|
||||
from shared.constants import PAGE_SIZE
|
||||
from modules.cms.ad_sort.schemas import AdSortForm
|
||||
from modules.cms.ad_sort.models import AdSort
|
||||
from modules.cms.ad_sort.repository import adsort_repo
|
||||
from modules.cms.item.models import Item
|
||||
from modules.cms.item_cate.models import ItemCate
|
||||
from core.database import get_db_session
|
||||
@@ -25,7 +26,7 @@ def get_ad_sort_page(request):
|
||||
# 每页数
|
||||
limit = int(request.query_params.get("pageSize", PAGE_SIZE))
|
||||
# 实例化查询对象
|
||||
query = db.query(AdSort).filter(AdSort.is_delete == 0)
|
||||
query = adsort_repo.filter(AdSort.is_delete == 0)
|
||||
# 名称
|
||||
name = request.query_params.get('name')
|
||||
if name:
|
||||
@@ -71,9 +72,8 @@ def get_ad_sort_page(request):
|
||||
# 根据ID查询广告位详情
|
||||
|
||||
def get_ad_sort_detail(adsort_id):
|
||||
db = get_db_session()
|
||||
# 根据ID查询广告位
|
||||
adsort = db.query(AdSort).filter(and_(AdSort.id == adsort_id, AdSort.is_delete == 0)).first()
|
||||
adsort = adsort_repo.get_by_id(adsort_id)
|
||||
# 查询结果为空判断
|
||||
if not adsort:
|
||||
return None
|
||||
@@ -84,12 +84,8 @@ def get_ad_sort_detail(adsort_id):
|
||||
# 添加广告位
|
||||
|
||||
def add_ad_sort(request, data: AdSortForm):
|
||||
db = get_db_session()
|
||||
# 表单数据赋值给对象
|
||||
adsort = AdSort(**data.model_dump(exclude={'id'}))
|
||||
adsort.create_user = get_user_id(request)
|
||||
# 插入数据
|
||||
adsort.save()
|
||||
# 表单数据赋值给对象并插入
|
||||
adsort_repo.create(**data.model_dump(exclude={'id'}), create_user=get_user_id(request))
|
||||
# 返回结果
|
||||
return R.ok(msg="添加成功")
|
||||
|
||||
@@ -97,13 +93,12 @@ def add_ad_sort(request, data: AdSortForm):
|
||||
# 更新广告位
|
||||
|
||||
def update_ad_sort(request, data: AdSortForm):
|
||||
db = get_db_session()
|
||||
# 记录ID判空
|
||||
if not data.id or data.id <= 0:
|
||||
return R.failed("记录ID不能为空")
|
||||
|
||||
# 根据ID查询记录
|
||||
adsort = db.query(AdSort).filter(and_(AdSort.id == data.id, AdSort.is_delete == 0)).first()
|
||||
adsort = adsort_repo.get_by_id(data.id)
|
||||
# 查询结果判空
|
||||
if not adsort:
|
||||
return R.failed("记录不存在")
|
||||
@@ -111,7 +106,7 @@ def update_ad_sort(request, data: AdSortForm):
|
||||
updData = data.model_dump(exclude={'id'})
|
||||
updData['update_user'] = get_user_id(request)
|
||||
updData['update_time'] = datetime.now(tz=timezone.utc)
|
||||
result = db.query(AdSort).filter_by(id=data.id).update(updData)
|
||||
result = adsort_repo.update(data.id, updData)
|
||||
# 提交数据
|
||||
if not result:
|
||||
return R.failed("更新失败")
|
||||
@@ -124,9 +119,8 @@ def delete_ad_sort(adsort_id):
|
||||
# 查询广告位列表
|
||||
|
||||
def get_ad_sort_list():
|
||||
db = get_db_session()
|
||||
# 查询全部广告位列表
|
||||
ad_sort_list = db.query(AdSort).filter(AdSort.is_delete == 0).all()
|
||||
ad_sort_list = adsort_repo.filter(AdSort.is_delete == 0).all()
|
||||
# 实例化广告位对象列表
|
||||
sortList = []
|
||||
if ad_sort_list:
|
||||
|
||||
Reference in New Issue
Block a user