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:
+9
-18
@@ -1,14 +1,13 @@
|
||||
from datetime import datetime, timezone
|
||||
|
||||
from fastapi.logger import logger
|
||||
from sqlalchemy import and_
|
||||
|
||||
|
||||
from shared.enums import LINK_TYPE_LIST, LINK_PLATFORM_LIST, LINK_FORM_LIST
|
||||
from shared.constants import PAGE_SIZE
|
||||
from modules.link.schemas import LinkForm, LinkStatusForm
|
||||
from modules.link.models import Link
|
||||
from core.database import get_db_session
|
||||
from modules.link.repository import link_repo
|
||||
from core import R
|
||||
from utils.rich_text import get_file_url, save_file
|
||||
from utils.request import like_contains
|
||||
@@ -18,13 +17,12 @@ from core.security import get_user_id
|
||||
# 查看友链分页数据
|
||||
|
||||
def get_link_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(Link).filter(Link.is_delete == 0)
|
||||
query = link_repo.filter(Link.is_delete == 0)
|
||||
# 友链名称
|
||||
name = request.query_params.get('name')
|
||||
if name:
|
||||
@@ -78,9 +76,8 @@ def get_link_page(request):
|
||||
# 根据ID查看友链详情
|
||||
|
||||
def get_link_detail(link_id):
|
||||
db = get_db_session()
|
||||
# 根据ID查询友链
|
||||
link = db.query(Link).filter(and_(Link.id == link_id, Link.is_delete == 0)).first()
|
||||
link = link_repo.get_by_id(link_id)
|
||||
# 查询结果为空判断
|
||||
if not link:
|
||||
return None
|
||||
@@ -93,7 +90,6 @@ def get_link_detail(link_id):
|
||||
# 添加友链
|
||||
|
||||
def add_link(request, data: LinkForm):
|
||||
db = get_db_session()
|
||||
# 表单数据转字典
|
||||
form_data = data.model_dump(exclude={'id'}, by_alias=True)
|
||||
|
||||
@@ -102,11 +98,8 @@ def add_link(request, data: LinkForm):
|
||||
if image:
|
||||
form_data['image'] = save_file(image, "link")
|
||||
|
||||
# 表单数据赋值给对象
|
||||
link = Link(**form_data)
|
||||
link.create_user = get_user_id(request)
|
||||
# 插入数据
|
||||
link.save()
|
||||
# 表单数据赋值给对象并插入
|
||||
link_repo.create(**form_data, create_user=get_user_id(request))
|
||||
# 返回结果
|
||||
return R.ok(msg="添加成功")
|
||||
|
||||
@@ -114,13 +107,12 @@ def add_link(request, data: LinkForm):
|
||||
# 更新友链
|
||||
|
||||
def update_link(request, data: LinkForm):
|
||||
db = get_db_session()
|
||||
# 记录ID判空
|
||||
if not data.id or data.id <= 0:
|
||||
return R.failed("记录ID不能为空")
|
||||
|
||||
# 根据ID查询记录
|
||||
link = db.query(Link).filter(and_(Link.id == data.id, Link.is_delete == 0)).first()
|
||||
link = link_repo.get_by_id(data.id)
|
||||
# 查询结果判空
|
||||
if not link:
|
||||
return R.failed("记录不存在")
|
||||
@@ -134,7 +126,7 @@ def update_link(request, data: LinkForm):
|
||||
updData['update_user'] = get_user_id(request)
|
||||
updData['update_time'] = datetime.now(tz=timezone.utc)
|
||||
# 更新数据
|
||||
result = db.query(Link).filter_by(id=data.id).update(updData)
|
||||
result = link_repo.update(data.id, updData)
|
||||
# 提交数据
|
||||
if not result:
|
||||
return R.failed("更新失败")
|
||||
@@ -147,15 +139,14 @@ def delete_link(link_id):
|
||||
# 设置状态
|
||||
|
||||
def update_link_status(request, data: LinkStatusForm):
|
||||
db = get_db_session()
|
||||
# 根据ID查询记录
|
||||
link = db.query(Link).filter(and_(Link.id == data.id, Link.is_delete == 0)).first()
|
||||
link = link_repo.get_by_id(data.id)
|
||||
# 查询结果判空
|
||||
if not link:
|
||||
return R.failed("记录不存在")
|
||||
|
||||
# 更新记录
|
||||
result = db.query(Link).filter_by(id=data.id).update({
|
||||
result = link_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