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_TYPE_LIST
|
||||
from shared.constants import PAGE_SIZE
|
||||
from modules.cms.ad.schemas import AdForm, AdStatusForm
|
||||
from modules.cms.ad.models import Ad
|
||||
from modules.cms.ad.repository import ad_repo
|
||||
from modules.cms.ad_sort.models import AdSort
|
||||
from config import FASTAPI_IMAGE_URL
|
||||
from core.database import get_db_session
|
||||
@@ -26,7 +27,7 @@ def get_ad_page(request):
|
||||
# 每页数
|
||||
limit = int(request.query_params.get("pageSize", PAGE_SIZE))
|
||||
# 实例化查询对象
|
||||
query = db.query(Ad).filter(Ad.is_delete == 0)
|
||||
query = ad_repo.filter(Ad.is_delete == 0)
|
||||
# 广告标题
|
||||
title = request.query_params.get('title')
|
||||
if title:
|
||||
@@ -72,9 +73,8 @@ def get_ad_page(request):
|
||||
# 根据广告ID查询详情
|
||||
|
||||
def get_ad_detail(ad_id):
|
||||
db = get_db_session()
|
||||
# 根据广告ID查询信息
|
||||
ad = db.query(Ad).filter(and_(Ad.id == ad_id, Ad.is_delete == 0)).first()
|
||||
ad = ad_repo.get_by_id(ad_id)
|
||||
# 查询结果为空判断
|
||||
if not ad:
|
||||
return None
|
||||
@@ -92,7 +92,6 @@ def get_ad_detail(ad_id):
|
||||
# 添加广告
|
||||
|
||||
def add_ad(request, data: AdForm):
|
||||
db = get_db_session()
|
||||
# 广告封面
|
||||
cover = data.cover
|
||||
if data.type == 1 and cover:
|
||||
@@ -107,12 +106,8 @@ def add_ad(request, data: AdForm):
|
||||
# # 处理富文本内容
|
||||
# content = save_content(content, title, "ad")
|
||||
|
||||
# 表单数据赋值给对象
|
||||
ad = Ad(**data.model_dump(exclude={'id'}))
|
||||
ad.cover = cover
|
||||
ad.create_user = get_user_id(request)
|
||||
# 插入数据
|
||||
ad.save()
|
||||
# 表单数据赋值给对象并插入(cover 用处理后的文件路径,排除表单原值避免重复传参)
|
||||
ad_repo.create(**data.model_dump(exclude={'id', 'cover'}), cover=cover, create_user=get_user_id(request))
|
||||
# 返回结果
|
||||
return R.ok(msg="添加成功")
|
||||
|
||||
@@ -120,12 +115,11 @@ def add_ad(request, data: AdForm):
|
||||
# 更新广告
|
||||
|
||||
def update_ad(request, data: AdForm):
|
||||
db = get_db_session()
|
||||
# 记录ID判空
|
||||
if not data.id or data.id <= 0:
|
||||
return R.failed("记录ID不能为空")
|
||||
# 根据ID查询记录
|
||||
ad = db.query(Ad).filter(and_(Ad.id == data.id, Ad.is_delete == 0)).first()
|
||||
ad = ad_repo.get_by_id(data.id)
|
||||
# 查询结果判空
|
||||
if not ad:
|
||||
return R.failed("记录不存在")
|
||||
@@ -150,7 +144,7 @@ def update_ad(request, data: AdForm):
|
||||
updData['update_user'] = get_user_id(request)
|
||||
updData['update_time'] = datetime.now(tz=timezone.utc)
|
||||
# 更新记录
|
||||
result = db.query(Ad).filter_by(id=data.id).update(updData)
|
||||
result = ad_repo.update(data.id, updData)
|
||||
# 提交数据
|
||||
# 返回结果
|
||||
if not result:
|
||||
@@ -164,15 +158,14 @@ def delete_ad(ad_id):
|
||||
# 设置状态
|
||||
|
||||
def update_ad_status(request, data: AdStatusForm):
|
||||
db = get_db_session()
|
||||
# 根据ID查询记录
|
||||
ad = db.query(Ad).filter(and_(Ad.id == data.id, Ad.is_delete == 0)).first()
|
||||
ad = ad_repo.get_by_id(data.id)
|
||||
# 查询结果判空
|
||||
if not ad:
|
||||
return R.failed("记录不存在")
|
||||
|
||||
# 更新记录
|
||||
result = db.query(Ad).filter_by(id=data.id).update({
|
||||
result = ad_repo.update(data.id, {
|
||||
"status": data.status,
|
||||
"update_user": get_user_id(request),
|
||||
"update_time": datetime.now(tz=timezone.utc)
|
||||
|
||||
Reference in New Issue
Block a user