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:
@@ -0,0 +1,9 @@
|
||||
# +========== 迁移新增:本模块 Repository 层
|
||||
"""modules/cms/item 数据访问层。"""
|
||||
from modules.cms.item.models import Item
|
||||
from shared.base_repository import BaseRepository
|
||||
|
||||
class ItemRepository(BaseRepository[Item]):
|
||||
pass
|
||||
|
||||
item_repo = ItemRepository(Item)
|
||||
@@ -0,0 +1,93 @@
|
||||
import asyncio
|
||||
|
||||
from fastapi import APIRouter, Request
|
||||
|
||||
from modules.cms.item.schemas import ItemForm
|
||||
from core.middleware import check_demo
|
||||
from core.middleware import permission_required
|
||||
from modules.cms.item import service as item
|
||||
|
||||
from core import R
|
||||
from utils.request import parse_batch_ids
|
||||
|
||||
# 创建路由
|
||||
router = APIRouter()
|
||||
|
||||
|
||||
# 查询分页数据
|
||||
@router.get('/page', summary='查询分页数据')
|
||||
@permission_required("sys:item:page")
|
||||
def page(request: Request):
|
||||
# 调用查询分页数据服务方法
|
||||
result = item.get_item_page(request)
|
||||
# 返回结果
|
||||
return result
|
||||
|
||||
|
||||
# 查询站点详情
|
||||
@router.get('/detail/{id}', summary='查询站点详情')
|
||||
@permission_required("sys:item:detail")
|
||||
def detail(request: Request, id):
|
||||
# 调用查询站点详情服务方法
|
||||
data = item.get_item_detail(id)
|
||||
# 返回结果
|
||||
return R.ok(data=data)
|
||||
|
||||
|
||||
# 添加站点
|
||||
@router.post('/add', summary='添加站点')
|
||||
@permission_required("sys:item:add")
|
||||
@check_demo
|
||||
def add(request: Request, data: ItemForm):
|
||||
# 调用添加站点服务
|
||||
result = item.add_item(request, data)
|
||||
# 返回结果
|
||||
return result
|
||||
|
||||
|
||||
# 更新站点
|
||||
@router.put('/update', summary='更新站点')
|
||||
@permission_required("sys:item:update")
|
||||
@check_demo
|
||||
def update(request: Request, data: ItemForm):
|
||||
# 调用更新站点服务方法
|
||||
result = item.update_item(request, data)
|
||||
# 返回结果
|
||||
return result
|
||||
|
||||
|
||||
# 删除站点
|
||||
@router.delete('/delete/{id}', summary='删除站点')
|
||||
@permission_required("sys:item:delete")
|
||||
@check_demo
|
||||
def delete(request: Request, id):
|
||||
# 调用删除站点服务方法
|
||||
result = item.delete_item(id)
|
||||
# 返回结果
|
||||
return result
|
||||
|
||||
|
||||
# 获取站点列表
|
||||
@router.get('/getItemList', summary='获取站点列表')
|
||||
def get_item_list():
|
||||
# 调用查询站点数据列表服务方法
|
||||
data = item.get_item_list()
|
||||
# 返回结果
|
||||
return R.ok(data=data)
|
||||
|
||||
|
||||
# 批量删除站点
|
||||
@router.delete('/batchDelete', summary='批量删除站点')
|
||||
@permission_required("sys:item: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.delete_item, id_str)
|
||||
@@ -0,0 +1,15 @@
|
||||
from typing import Optional
|
||||
|
||||
from pydantic import BaseModel, Field
|
||||
|
||||
# 站点表单验证
|
||||
class ItemForm(BaseModel):
|
||||
id: Optional[int] = Field(None, description="站点ID")
|
||||
name: str = Field(..., min_length=1, max_length=150, description="站点名称")
|
||||
type: int = Field(..., ge=1, le=2, description="站点类型")
|
||||
url: str = Field(..., min_length=1, max_length=255, description="站点URL")
|
||||
image: str = Field(..., min_length=1, 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="站点备注")
|
||||
|
||||
@@ -0,0 +1,154 @@
|
||||
from datetime import datetime, timezone
|
||||
|
||||
from fastapi.logger import logger
|
||||
from sqlalchemy import and_
|
||||
|
||||
|
||||
from shared.enums import ITEM_TYPE_LIST
|
||||
from shared.constants import PAGE_SIZE
|
||||
from modules.cms.item.schemas import ItemForm
|
||||
from modules.cms.item.models import 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_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(Item).filter(Item.is_delete == 0)
|
||||
# 站点名称
|
||||
name = request.query_params.get('name')
|
||||
if name:
|
||||
query = query.filter(Item.name.like(like_contains(name), escape='\\'))
|
||||
# 站点类型
|
||||
type = request.query_params.get('type')
|
||||
if type:
|
||||
query = query.filter(Item.type == type)
|
||||
# 站点状态筛选
|
||||
status = request.query_params.get('status')
|
||||
if status:
|
||||
query = query.filter(Item.status == status)
|
||||
# 排序
|
||||
query = query.order_by(Item.sort.asc())
|
||||
# 记录总数
|
||||
count = query.count()
|
||||
# 分页查询
|
||||
item_list = query.limit(limit).offset((page - 1) * limit).all()
|
||||
# 若当前页超出末页(数据被并发删除),自动回退到第一页
|
||||
if page > 1 and not item_list:
|
||||
page = 1
|
||||
count = query.count()
|
||||
item_list = query.limit(limit).offset(0).all()
|
||||
# 实例化结果
|
||||
result = []
|
||||
# 遍历数据源
|
||||
if len(item_list) > 0:
|
||||
for item in item_list:
|
||||
# 对象转字典
|
||||
data = item.to_dict()
|
||||
# 站点图片
|
||||
data['image'] = get_file_url(item.image)
|
||||
# 站点类型描述
|
||||
data['type_name'] = ITEM_TYPE_LIST.get(item.type)
|
||||
# 加入列表
|
||||
result.append(data)
|
||||
# 返回结果
|
||||
return R.ok(data=result, count=count)
|
||||
# 根据ID查询站点详情
|
||||
|
||||
def get_item_detail(item_id):
|
||||
db = get_db_session()
|
||||
# 根据ID查询站点
|
||||
item = db.query(Item).filter(and_(Item.id == item_id, Item.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not item:
|
||||
return None
|
||||
# 对象转字典
|
||||
data = item.to_dict()
|
||||
# 站点图片
|
||||
data['image'] = get_file_url(item.image)
|
||||
# 返回结果
|
||||
return data
|
||||
# 添加站点
|
||||
|
||||
def add_item(request, data: ItemForm):
|
||||
db = get_db_session()
|
||||
# 唯一性校验
|
||||
if db.query(Item).filter(and_(Item.name == data.name, Item.is_delete == 0)).first():
|
||||
return R.failed("站点名称不能重复")
|
||||
# 表单数据转字典
|
||||
form_data = data.model_dump(exclude={'id'})
|
||||
# 站点图片
|
||||
image = data.image
|
||||
if image:
|
||||
form_data['image'] = save_file(image, "item")
|
||||
|
||||
# 表单数据赋值给对象
|
||||
item = Item(**form_data)
|
||||
item.create_user = get_user_id(request)
|
||||
# 插入数据
|
||||
item.save()
|
||||
# 返回结果
|
||||
return R.ok(msg="添加成功")
|
||||
|
||||
|
||||
# 更新站点
|
||||
|
||||
def update_item(request, data: ItemForm):
|
||||
db = get_db_session()
|
||||
# 记录ID判空
|
||||
if not data.id or data.id <= 0:
|
||||
return R.failed("记录ID不能为空")
|
||||
# 唯一性校验(排除自身)
|
||||
if db.query(Item).filter(and_(Item.name == data.name, Item.id != data.id, Item.is_delete == 0)).first():
|
||||
return R.failed("站点名称不能重复")
|
||||
|
||||
# 根据ID查询记录
|
||||
item = db.query(Item).filter(and_(Item.id == data.id, Item.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not item:
|
||||
return R.failed("记录不存在")
|
||||
|
||||
# 构造更新数据(排除 id)
|
||||
updData = data.model_dump(exclude={'id'})
|
||||
# 站点图片
|
||||
image = data.image
|
||||
if image:
|
||||
updData['image'] = save_file(image, "item")
|
||||
updData['update_user'] = get_user_id(request)
|
||||
updData['update_time'] = datetime.now(tz=timezone.utc)
|
||||
# 更新数据
|
||||
result = db.query(Item).filter_by(id=data.id).update(updData)
|
||||
# 提交数据
|
||||
if not result:
|
||||
return R.failed("更新失败")
|
||||
# 返回结果
|
||||
return R.ok(msg="更新成功")
|
||||
# 删除站点
|
||||
|
||||
def delete_item(item_id):
|
||||
return Item.batch_delete_r(item_id)
|
||||
# 获取站点列表
|
||||
|
||||
def get_item_list():
|
||||
db = get_db_session()
|
||||
item_rows = db.query(Item).filter(and_(Item.status == 1, Item.is_delete == 0)).order_by(Item.sort.asc()).all()
|
||||
# 实例化站点列表
|
||||
item_list = []
|
||||
# 遍历数据源
|
||||
for v in item_rows:
|
||||
# 对象转字典
|
||||
item = v.to_dict()
|
||||
# 加入列表
|
||||
item_list.append(item)
|
||||
# 返回结果
|
||||
return item_list
|
||||
Reference in New Issue
Block a user