feat(phase4): 全部业务模块迁移到 modules/（结构迁移）

- 21 个模块目录（auth/system/dictionary/configuration/cms/member/region/link/notice/job/log/upload/index） - 每个模块 router.py（合并模块导出多个 router）/schemas.py/service.py/repository.py/models.py - routers/v1.py 与 routers/__init__.py 改为直接引用 modules，前缀与权限串原样保留 - core/middleware.py 懒加载指向 modules.system.menu / modules.log；core/redis_client.py 指向 modules.job.scheduler - apps/views|services|forms 全部改为 re-export 垫片 - 迁移后 grep 守门通过：modules/core 无 apps/extensions 残留引用 - 实测登录、27+ 模块接口、写操作 commit、操作日志落库均正常 Co-Authored-By: Claude <noreply@anthropic.com>
2026-08-07 10:13:30 +08:00
parent b2c7b93786
commit 64a5504396
156 changed files with 7977 additions and 7533 deletions
@@ -0,0 +1,9 @@
+# +========== 迁移新增：本模块 Repository 层
+"""modules/notice 数据访问层。"""
+from modules.notice.models import Notice
+from shared.base_repository import BaseRepository
+
+class NoticeRepository(BaseRepository[Notice]):
+    pass
+
+notice_repo = NoticeRepository(Notice)
@@ -0,0 +1,84 @@
+import asyncio
+
+from fastapi import APIRouter, Request
+
+from modules.notice.schemas import NoticeForm
+from core.middleware import permission_required
+from core.middleware import check_demo
+from modules.notice import service as notice
+
+from core import R
+from utils.request import parse_batch_ids
+
+# 创建路由
+router = APIRouter()
+
+
+# 查询分页数据
+@router.get('/page', summary='查询分页数据')
+@permission_required("sys:notice:page")
+def page(request: Request):
+    # 调用查询分页数据服务方法
+    result = notice.get_notice_page(request)
+    # 返回结果
+    return result
+
+
+# 查询通知详情
+@router.get('/detail/{id}', summary='查询通知详情')
+@permission_required("sys:notice:detail")
+def detail(request: Request, id):
+    # 调用查询通知详情服务方法
+    data = notice.get_notice_detail(id)
+    # 返回结果
+    return R.ok(data=data)
+
+
+# 添加通知
+@router.post('/add', summary='添加通知')
+@permission_required("sys:notice:add")
+@check_demo
+def add(request: Request, data: NoticeForm):
+    # 调用添加通知服务
+    result = notice.add_notice(request, data)
+    # 返回结果
+    return result
+
+
+# 更新通知
+@router.put('/update', summary='更新通知')
+@permission_required("sys:notice:update")
+@check_demo
+def update(request: Request, data: NoticeForm):
+    # 调用更新通知服务方法
+    result = notice.update_notice(request, data)
+    # 返回结果
+    return result
+
+
+# 删除通知
+@router.delete('/delete/{id}', summary='删除通知')
+@permission_required("sys:notice:delete")
+@check_demo
+def delete(request: Request, id):
+    # 调用删除通知服务方法
+    result = notice.delete_notice(id)
+    # 返回结果
+    return result
+
+
+# 批量删除通知
+@router.delete('/batchDelete', summary='批量删除通知')
+@permission_required("sys:notice:batch_delete")
+@check_demo
+async def batch_delete(request: Request):
+    """
+    批量删除通知
+
+    Request Body:
+        [1, 2, 3]  # 通知ID数组
+    """
+    id_str, err = await parse_batch_ids(request)
+    if err:
+        return err
+    return await asyncio.to_thread(notice.delete_notice, id_str)
@@ -0,0 +1,15 @@
+from typing import Optional
+
+from pydantic import BaseModel, Field
+
+
+# 通知表单验证
+class NoticeForm(BaseModel):
+    id: Optional[int] = Field(None, description="通知ID")
+    title: str = Field(..., min_length=1, max_length=255, description="通知标题")
+    source: int = Field(..., ge=1, le=4, description="通知来源")
+    url: str = Field(..., min_length=1, max_length=255, description="通知地址")
+    status: int = Field(..., ge=1, le=2, description="通知状态")
+    is_top: int = Field(..., ge=1, le=2, description="是否置顶")
+    click: int = Field(..., ge=0, description="点击率")
+    content: Optional[str] = Field(None, description="通知内容")
@@ -0,0 +1,138 @@
+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 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
+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)
+    # 通知公告标题
+    title = request.query_params.get('title')
+    if title:
+        query = query.filter(Notice.title.like(like_contains(title), escape='\\'))
+    # 通知来源：1官方平台 2开源中国 3CSDN官方 4新浪微博
+    source = request.query_params.get('source')
+    if source:
+        query = query.filter(Notice.source == source)
+    # 通知状态：1-正常 2-停用
+    status = request.query_params.get('status')
+    if status:
+        query = query.filter(Notice.status == status)
+    # 排序
+    query = query.order_by(Notice.id.desc())
+    # 记录总数
+    count = query.count()
+    # 分页查询
+    notice_list = query.limit(limit).offset((page - 1) * limit).all()
+    # 若当前页超出末页（数据被并发删除），自动回退到第一页
+    if page > 1 and not notice_list:
+        page = 1
+        count = query.count()
+        notice_list = query.limit(limit).offset(0).all()
+    # 实例化结果
+    result = []
+    # 遍历数据源
+    if len(notice_list) > 0:
+        for item in notice_list:
+            # 对象转字典
+            data = item.to_dict()
+            # 通知来源描述
+            data['source_name'] = NOTICE_SOURCE_LIST.get(item.source)
+            # 加入列表
+            result.append(data)
+    # 返回结果
+    return R.ok(data=result, count=count)
+# 根据通知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()
+    # 查询结果判空
+    if not notice:
+        return None
+    # 对象转字典
+    data = notice.to_dict()
+    # 富文本内容
+    content = (notice.content or "").replace("[IMG_URL]", FASTAPI_IMAGE_URL)
+    data['content'] = content
+    # 通知来源
+    data['source_name'] = NOTICE_SOURCE_LIST.get(notice.source)
+    # 返回结果
+    return data
+# 添加通知公告
+
+def add_notice(request, data: NoticeForm):
+    db = get_db_session()
+    # 通知标题
+    title = data.title
+    # 通知内容
+    content = data.content
+    # 处理富文本内容
+    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()
+    # 返回结果
+    return R.ok(msg="添加成功")
+
+
+# 更新通知公告
+
+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()
+    # 查询结果判空
+    if not notice:
+        return R.failed("记录不存在")
+
+    # 通知标题
+    title = data.title
+    # 通知内容
+    content = data.content
+    # 处理富文本内容
+    content = save_content(content, title, "notice")
+    # 构造更新数据（排除 id）
+    updData = data.model_dump(exclude={'id'})
+    updData['content'] = content
+    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)
+    # 提交数据
+    if not result:
+        return R.failed("更新失败")
+    # 返回结果
+    return R.ok(msg="更新成功")
+# 删除通知公告
+
+def delete_notice(notice_id):
+    return Notice.batch_delete_r(notice_id)