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>
This commit is contained in:
Claude
2026-08-07 10:13:30 +08:00
co-authored by Claude
parent b2c7b93786
commit 64a5504396
156 changed files with 7977 additions and 7533 deletions
+9
View File
@@ -0,0 +1,9 @@
# +========== 迁移新增:本模块 Repository 层
"""modules/cms/item_cate 数据访问层。"""
from modules.cms.item_cate.models import ItemCate
from shared.base_repository import BaseRepository
class ItemCateRepository(BaseRepository[ItemCate]):
pass
itemcate_repo = ItemCateRepository(ItemCate)
+92
View File
@@ -0,0 +1,92 @@
import asyncio
from fastapi import APIRouter, Request
from modules.cms.item_cate.schemas import ItemCateForm
from core.middleware import check_demo
from core.middleware import permission_required
from modules.cms.item_cate import service as item_cate
from core import R
from utils.request import parse_batch_ids
# 创建路由
router = APIRouter()
# 查询分页数据
@router.get('/page', summary='查询分页数据')
@permission_required("sys:itemcate:page")
def page(request: Request):
# 调用查询分页数据服务方法
result = item_cate.get_item_cate_page(request)
# 返回结果
return result
# 查询栏目详情
@router.get('/detail/{id}', summary='查询栏目详情')
@permission_required("sys:itemcate:detail")
def detail(request: Request, id):
# 调用查询栏目详情服务方法
data = item_cate.get_item_cate_detail(id)
# 返回结果
return R.ok(data=data)
# 添加栏目
@router.post('/add', summary='添加栏目')
@permission_required("sys:itemcate:add")
@check_demo
def add(request: Request, data: ItemCateForm):
# 调用添加栏目服务
result = item_cate.add_item_cate(request, data)
# 返回结果
return result
# 更新栏目
@router.put('/update', summary='更新栏目')
@permission_required("sys:itemcate:update")
@check_demo
def update(request: Request, data: ItemCateForm):
# 调用更新栏目服务方法
result = item_cate.update_item_cate(request, data)
# 返回结果
return result
# 删除栏目
@router.delete('/delete/{id}', summary='删除栏目')
@permission_required("sys:itemcate:delete")
@check_demo
def delete(request: Request, id):
# 调用删除栏目服务方法
result = item_cate.delete_item_cate(id)
# 返回结果
return result
# 获取栏目列表
@router.get('/getCateList', summary='获取栏目列表')
def get_cate_list():
# 调用删除栏目服务方法
result = item_cate.get_cate_list()
# 返回结果
return R.ok(result)
# 批量删除栏目
@router.delete('/batchDelete', summary='批量删除栏目')
@permission_required("sys:itemcate: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(item_cate.delete_item_cate, id_str)
+18
View File
@@ -0,0 +1,18 @@
from typing import Optional
from pydantic import BaseModel, Field
# 栏目表单验证
class ItemCateForm(BaseModel):
id: Optional[int] = Field(None, description="栏目ID")
name: str = Field(..., min_length=1, max_length=150, description="栏目名称")
pid: Optional[int] = Field(None, description="上级ID")
item_id: int = Field(..., ge=0, description="站点ID")
pinyin: str = Field(..., min_length=1, max_length=150, description="拼音全称")
code: str = Field(..., min_length=1, max_length=150, description="拼音简称")
is_cover: int = Field(..., ge=1, le=2, description="是否有封面")
cover: Optional[str] = Field(None, max_length=255, 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="栏目备注")
+171
View File
@@ -0,0 +1,171 @@
from datetime import datetime, timezone
from fastapi.logger import logger
from sqlalchemy import and_
from shared.constants import PAGE_SIZE
from modules.cms.item_cate.schemas import ItemCateForm
from modules.cms.item_cate.models import ItemCate
from modules.cms.item import service as item
from core.database import get_db_session
from core import R
from utils.rich_text import get_file_url, save_file
from utils.request import like_contains
from core.security import get_user_id
# 查询栏目数据
def get_item_cate_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(ItemCate).filter(ItemCate.is_delete == 0)
# 栏目名称
name = request.query_params.get('name')
if name:
query = query.filter(ItemCate.name.like(like_contains(name), escape='\\'))
# 栏目状态筛选
status = request.query_params.get('status')
if status:
query = query.filter(ItemCate.status == status)
# 排序
query = query.order_by(ItemCate.sort.asc())
# 记录总数
count = query.count()
# 分页查询
item_cate_list = query.limit(limit).offset((page - 1) * limit).all()
# 若当前页超出末页(数据被并发删除),自动回退到第一页
if page > 1 and not item_cate_list:
page = 1
count = query.count()
item_cate_list = query.limit(limit).offset(0).all()
# 实例化结果
result = []
# 遍历数据源
if len(item_cate_list) > 0:
for v in item_cate_list:
# 对象转字典
data = v.to_dict()
# 栏目图片
data['cover'] = get_file_url(v.cover) if v.cover else None
# 查询站点信息
item_info = item.get_item_detail(v.id)
if item_info:
data['item_name'] = item_info.get('name') if item_info else None
# 加入列表
result.append(data)
# 返回结果
return R.ok(data=result, count=count)
# 根据栏目ID查询详情
def get_item_cate_detail(itemcate_id):
db = get_db_session()
# 根据ID查询栏目
cate = db.query(ItemCate).filter(and_(ItemCate.id == itemcate_id, ItemCate.is_delete == 0)).first()
# 查询结果判空
if not cate:
return None
# 对象转字典
data = cate.to_dict()
# 栏目图片
if cate.cover:
data['cover'] = get_file_url(cate.cover)
# 返回结果
return data
# 添加栏目
def add_item_cate(request, data: ItemCateForm):
db = get_db_session()
# 唯一性校验
if db.query(ItemCate).filter(and_(ItemCate.name == data.name, ItemCate.is_delete == 0)).first():
return R.failed("栏目名称不能重复")
# 表单数据转字典
form_data = data.model_dump(exclude={'id'})
# 是否有封面
is_cover = data.is_cover
if is_cover == 1:
# 栏目图片
cover = data.cover
# 图片处理
if cover:
form_data['cover'] = save_file(cover, "item_cate")
else:
form_data['cover'] = None
else:
form_data['cover'] = None
# 表单数据赋值给对象
cate = ItemCate(**form_data)
cate.create_user = get_user_id(request)
# 插入数据
cate.save()
# 返回结果
return R.ok(msg="添加成功")
# 更新栏目
def update_item_cate(request, data: ItemCateForm):
db = get_db_session()
# 记录ID判空
if not data.id or data.id <= 0:
return R.failed("记录ID不能为空")
# 唯一性校验(排除自身)
if db.query(ItemCate).filter(and_(ItemCate.name == data.name, ItemCate.id != data.id, ItemCate.is_delete == 0)).first():
return R.failed("栏目名称不能重复")
# 根据ID查询记录
cate = db.query(ItemCate).filter(and_(ItemCate.id == data.id, ItemCate.is_delete == 0)).first()
# 查询结果判空
if not cate:
return R.failed("记录不存在")
# 构造更新数据(排除 id)
updData = data.model_dump(exclude={'id'})
# 是否有封面
is_cover = data.is_cover
if is_cover == 1:
# 栏目图片
cover = data.cover
# 图片处理
if cover:
updData['cover'] = save_file(cover, "item_cate")
else:
updData['cover'] = None
else:
updData['cover'] = None
updData['update_user'] = get_user_id(request)
updData['update_time'] = datetime.now(tz=timezone.utc)
# 更新数据
result = db.query(ItemCate).filter_by(id=data.id).update(updData)
# 提交数据
if not result:
return R.failed("更新失败")
# 返回结果
return R.ok(msg="更新成功")
# 删除栏目
def delete_item_cate(cate_id):
return ItemCate.batch_delete_r(cate_id)
# 获取栏目列表
def get_cate_list():
db = get_db_session()
cate_rows = db.query(ItemCate).filter(and_(ItemCate.is_delete == 0, ItemCate.status == 1)).order_by(
ItemCate.sort.asc()).all()
# 实例化栏目列表
cate_list = []
# 遍历数据源
for v in cate_rows:
# 对象转字典
item = v.to_dict()
# 加入列表
cate_list.append(item)
# 返回结果
return cate_list