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>

modules/cms/ad/repository.py

@@ -0,0 +1,9 @@
+# +========== 迁移新增：本模块 Repository 层
+"""modules/cms/ad 数据访问层。"""
+from modules.cms.ad.models import Ad
+from shared.base_repository import BaseRepository
+
+class AdRepository(BaseRepository[Ad]):
+    pass
+
+ad_repo = AdRepository(Ad)

modules/cms/ad/router.py

@@ -0,0 +1,95 @@
+import asyncio
+
+from fastapi import APIRouter, Request
+
+from modules.cms.ad.schemas import AdForm, AdStatusForm
+from core.middleware import check_demo
+from core.middleware import permission_required
+from modules.cms.ad import service as ad
+
+from core import R
+from utils.request import parse_batch_ids
+
+# 创建路由
+router = APIRouter()
+
+
+# 查询分页数据
+@router.get('/page', summary='查询广告分页数据')
+@permission_required("sys:ad:page")
+def page(request: Request):
+    # 调用查询分页数据服务方法
+    result = ad.get_ad_page(request)
+    # 返回结果
+    return result
+
+
+# 查询广告详情
+@router.get('/detail/{id}', summary='查询广告详情')
+@permission_required("sys:ad:detail")
+def detail(request: Request, id):
+    # 调用查询广告详情服务方法
+    data = ad.get_ad_detail(id)
+    # 返回结果
+    return R.ok(data=data)
+
+
+# 添加广告
+@router.post('/add', summary='添加广告')
+@permission_required("sys:ad:add")
+@check_demo
+def add(request: Request, data: AdForm):
+    # 调用添加广告服务
+    result = ad.add_ad(request, data)
+    # 返回结果
+    return result
+
+
+# 更新广告
+@router.put('/update', summary='更新广告')
+@permission_required("sys:ad:update")
+@check_demo
+def update(request: Request, data: AdForm):
+    # 调用更新广告服务方法
+    result = ad.update_ad(request, data)
+    # 返回结果
+    return result
+
+
+# 删除广告
+@router.delete('/delete/{id}', summary='删除广告')
+@permission_required("sys:ad:delete")
+@check_demo
+def delete(request: Request, id):
+    # 调用删除广告服务方法
+    result = ad.delete_ad(id)
+    # 返回结果
+    return result
+
+
+# 设置广告状态
+@router.put('/status', summary='设置广告状态')
+@permission_required("sys:ad:status")
+@check_demo
+def status(request: Request, data: AdStatusForm):
+    # 调用设置广告状态服务方法
+    result = ad.update_ad_status(request, data)
+    # 返回结果
+    return result
+
+
+# 批量删除广告
+@router.delete('/batchDelete', summary='批量删除广告')
+@permission_required("sys:ad: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(ad.delete_ad, id_str)

modules/cms/ad/schemas.py

@@ -0,0 +1,44 @@
+from datetime import datetime
+from typing import Optional
+
+from pydantic import BaseModel, Field
+
+
+# 广告表单验证
+class AdForm(BaseModel):
+    # 广告ID
+    id: Optional[int] = Field(None, description="广告ID")
+    # 广告标题
+    title: str = Field(..., min_length=1, max_length=255, description="广告标题")
+    # 广告位ID
+    sort_id: int = Field(..., ge=0, description="广告位ID")
+    # 广告类型：1-图片 2-文字 3-视频 4-推荐
+    type: int = Field(..., ge=1, le=4, description="广告类型")
+    # 广告封面
+    cover: Optional[str] = Field(None, max_length=255, description="广告封面")
+    # 广告URL
+    url: str = Field(..., min_length=1, max_length=255, description="广告URL")
+    # 广告宽度
+    width: int = Field(..., ge=0, description="广告宽度")
+    # 广告高度
+    height: int = Field(..., ge=0, description="广告高度")
+    # 开始时间
+    start_time: datetime = Field(..., description="开始时间")
+    # 结束时间
+    end_time: datetime = Field(..., description="结束时间")
+    # 广告状态
+    status: int = Field(..., ge=1, le=2, description="广告状态")
+    # 广告排序
+    sort: int = Field(..., ge=0, le=99999, description="广告排序")
+    # 广告备注
+    note: Optional[str] = Field(None, max_length=255, description="广告备注")
+    # 广告内容
+    content: Optional[str] = Field(None, description="广告内容")
+
+
+# 设置状态表单
+class AdStatusForm(BaseModel):
+    # 广告ID
+    id: int = Field(..., gt=0, description="广告ID")
+    # 广告状态
+    status: int = Field(..., ge=1, le=2, description="广告状态")

modules/cms/ad/service.py

@@ -0,0 +1,184 @@
+from datetime import datetime, timezone
+
+from fastapi.logger import logger
+from sqlalchemy import and_
+
+
+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_sort.models import AdSort
+from config import FASTAPI_IMAGE_URL
+from core.database import get_db_session
+from core import R
+from utils.rich_text import get_file_url, save_file, save_content
+from utils.request import like_contains
+from core.security import get_user_id
+
+
+# 查询广告分页数据
+
+def get_ad_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(Ad).filter(Ad.is_delete == 0)
+    # 广告标题
+    title = request.query_params.get('title')
+    if title:
+        query = query.filter(Ad.title.like(like_contains(title), escape='\\'))
+    # 广告类型：1-图片 2-文字 3-视频 4-推荐
+    type = request.query_params.get('type')
+    if type:
+        query = query.filter(Ad.type == type)
+    # 广告状态
+    status = request.query_params.get('status')
+    if status:
+        query = query.filter(Ad.status == status)
+    # 排序
+    query = query.order_by(Ad.sort.desc())
+    # 记录总数
+    count = query.count()
+    # 分页查询
+    ad_list = query.limit(limit).offset((page - 1) * limit).all()
+    # 若当前页超出末页（数据被并发删除），自动回退到第一页
+    if page > 1 and not ad_list:
+        page = 1
+        count = query.count()
+        ad_list = query.limit(limit).offset(0).all()
+    # 实例化结果
+    result = []
+    # 遍历数据源
+    if len(ad_list) > 0:
+        for item in ad_list:
+            # 对象转字典
+            data = item.to_dict()
+            # 广告类型
+            data['type_name'] = AD_TYPE_LIST.get(item.type)
+            # 广告封面
+            data['cover'] = get_file_url(item.cover) if item.cover else None
+            # 查询广告位信息
+            ad_sort = db.query(AdSort).filter(and_(AdSort.id == item.sort_id, AdSort.is_delete == 0)).first()
+            # 广告位描述
+            data['sort_desc'] = ad_sort.name + "=>" + str(ad_sort.loc_id) if ad_sort else None
+            # 加入列表
+            result.append(data)
+    # 返回结果
+    return R.ok(data=result, count=count)
+# 根据广告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()
+    # 查询结果为空判断
+    if not ad:
+        return None
+    # 对象转字典
+    data = ad.to_dict()
+    # 广告类型描述
+    data['type_name'] = AD_TYPE_LIST.get(ad.type)
+    # 广告封面
+    data['cover'] = get_file_url(ad.cover) if ad.cover else ""
+    # # 富文本内容
+    # content = ad.content.replace("[IMG_URL]", FASTAPI_IMAGE_URL)
+    # data['content'] = content
+    # 返回结果
+    return data
+# 添加广告
+
+def add_ad(request, data: AdForm):
+    db = get_db_session()
+    # 广告封面
+    cover = data.cover
+    if data.type == 1 and cover:
+        cover = save_file(cover, "ad")
+    else:
+        cover = None
+
+    # # 广告标题
+    # title = data.title
+    # # 广告内容
+    # content = data.content
+    # # 处理富文本内容
+    # 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()
+    # 返回结果
+    return R.ok(msg="添加成功")
+
+
+# 更新广告
+
+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()
+    # 查询结果判空
+    if not ad:
+        return R.failed("记录不存在")
+
+    # 广告封面
+    cover = data.cover
+    if data.type == 1 and cover:
+        cover = save_file(cover, "ad")
+    else:
+        cover = None
+
+    # # 广告标题
+    # title = data.title
+    # # 广告内容
+    # content = data.content
+    # # 处理富文本内容
+    # content = save_content(content, title, "ad")
+
+    # 构造更新数据（排除 id）
+    updData = data.model_dump(exclude={'id'})
+    updData['cover'] = cover
+    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)
+    # 提交数据
+    # 返回结果
+    if not result:
+        return R.failed("更新失败")
+    # 返回结果
+    return R.ok(msg="更新成功")
+# 删除广告
+
+def delete_ad(ad_id):
+    return Ad.batch_delete_r(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()
+    # 查询结果判空
+    if not ad:
+        return R.failed("记录不存在")
+
+    # 更新记录
+    result = db.query(Ad).filter_by(id=data.id).update({
+        "status": data.status,
+        "update_user": get_user_id(request),
+        "update_time": datetime.now(tz=timezone.utc)
+    })
+    # 提交数据
+    if not result:
+        return R.failed("设置失败")
+    # 返回结果
+    return R.ok(msg="设置成功")