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:
@@ -1,14 +1,13 @@
|
||||
from datetime import datetime, timezone
|
||||
|
||||
from fastapi.logger import logger
|
||||
from sqlalchemy import and_
|
||||
|
||||
from shared.enums import NOTICE_SOURCE_LIST
|
||||
from shared.constants import PAGE_SIZE
|
||||
from modules.notice.schemas import NoticeForm
|
||||
from modules.notice.models import Notice
|
||||
from modules.notice.repository import notice_repo
|
||||
from config import FASTAPI_IMAGE_URL
|
||||
from core.database import get_db_session
|
||||
from core import R
|
||||
from utils.rich_text import save_content
|
||||
from utils.request import like_contains
|
||||
@@ -18,13 +17,12 @@ from core.security import get_user_id
|
||||
# 查询通知公告分页数据
|
||||
|
||||
def get_notice_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(Notice).filter(Notice.is_delete == 0)
|
||||
query = notice_repo.filter(Notice.is_delete == 0)
|
||||
# 通知公告标题
|
||||
title = request.query_params.get('title')
|
||||
if title:
|
||||
@@ -64,9 +62,8 @@ def get_notice_page(request):
|
||||
# 根据通知ID查询详情
|
||||
|
||||
def get_notice_detail(notice_id):
|
||||
db = get_db_session()
|
||||
# 根据ID查询通知公告
|
||||
notice = db.query(Notice).filter(and_(Notice.id == notice_id, Notice.is_delete == 0)).first()
|
||||
notice = notice_repo.get_by_id(notice_id)
|
||||
# 查询结果判空
|
||||
if not notice:
|
||||
return None
|
||||
@@ -82,7 +79,6 @@ def get_notice_detail(notice_id):
|
||||
# 添加通知公告
|
||||
|
||||
def add_notice(request, data: NoticeForm):
|
||||
db = get_db_session()
|
||||
# 通知标题
|
||||
title = data.title
|
||||
# 通知内容
|
||||
@@ -90,12 +86,8 @@ def add_notice(request, data: NoticeForm):
|
||||
# 处理富文本内容
|
||||
content = save_content(content, title, "notice")
|
||||
|
||||
# 表单数据赋值给对象
|
||||
notice = Notice(**data.model_dump(exclude={'id'}))
|
||||
notice.content = content
|
||||
notice.create_user = get_user_id(request)
|
||||
# 插入数据
|
||||
notice.save()
|
||||
# 表单数据赋值给对象并插入(content 用处理后的富文本,排除表单原值避免重复传参)
|
||||
notice_repo.create(**data.model_dump(exclude={'id', 'content'}), content=content, create_user=get_user_id(request))
|
||||
# 返回结果
|
||||
return R.ok(msg="添加成功")
|
||||
|
||||
@@ -103,13 +95,12 @@ def add_notice(request, data: NoticeForm):
|
||||
# 更新通知公告
|
||||
|
||||
def update_notice(request, data: NoticeForm):
|
||||
db = get_db_session()
|
||||
# 记录ID判空
|
||||
if not data.id or data.id <= 0:
|
||||
return R.failed("记录ID不能为空")
|
||||
|
||||
# 根据ID查询记录
|
||||
notice = db.query(Notice).filter(and_(Notice.id == data.id, Notice.is_delete == 0)).first()
|
||||
notice = notice_repo.get_by_id(data.id)
|
||||
# 查询结果判空
|
||||
if not notice:
|
||||
return R.failed("记录不存在")
|
||||
@@ -126,7 +117,7 @@ def update_notice(request, data: NoticeForm):
|
||||
updData['update_user'] = get_user_id(request)
|
||||
updData['update_time'] = datetime.now(tz=timezone.utc)
|
||||
# 更新记录
|
||||
result = db.query(Notice).filter_by(id=data.id).update(updData)
|
||||
result = notice_repo.update(data.id, updData)
|
||||
# 提交数据
|
||||
if not result:
|
||||
return R.failed("更新失败")
|
||||
|
||||
Reference in New Issue
Block a user