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
@@ -0,0 +1,9 @@
|
||||
# +========== 迁移新增：本模块 Repository 层
|
||||
"""modules/link 数据访问层。"""
|
||||
from modules.link.models import Link
|
||||
from shared.base_repository import BaseRepository
|
||||
|
||||
class LinkRepository(BaseRepository[Link]):
|
||||
pass
|
||||
|
||||
link_repo = LinkRepository(Link)
|
||||
@@ -0,0 +1,95 @@
|
||||
import asyncio
|
||||
|
||||
from fastapi import APIRouter, Request
|
||||
|
||||
from modules.link.schemas import LinkForm, LinkStatusForm
|
||||
from core.middleware import check_demo
|
||||
from core.middleware import permission_required
|
||||
from modules.link import service as link
|
||||
|
||||
from core import R
|
||||
from utils.request import parse_batch_ids
|
||||
|
||||
# 创建路由
|
||||
router = APIRouter()
|
||||
|
||||
|
||||
# 查询分页数据
|
||||
@router.get('/page', summary='查询分页数据')
|
||||
@permission_required("sys:link:page")
|
||||
def page(request: Request):
|
||||
# 调用查询分页数据服务方法
|
||||
result = link.get_link_page(request)
|
||||
# 返回结果
|
||||
return result
|
||||
|
||||
|
||||
# 查询友链详情
|
||||
@router.get('/detail/{id}', summary='查询友链详情')
|
||||
@permission_required("sys:link:detail")
|
||||
def detail(request: Request, id):
|
||||
# 调用查询友链详情服务方法
|
||||
data = link.get_link_detail(id)
|
||||
# 返回结果
|
||||
return R.ok(data=data)
|
||||
|
||||
|
||||
# 添加友链
|
||||
@router.post('/add', summary='添加友链')
|
||||
@permission_required("sys:link:add")
|
||||
@check_demo
|
||||
def add(request: Request, data: LinkForm):
|
||||
# 调用添加友链服务
|
||||
result = link.add_link(request, data)
|
||||
# 返回结果
|
||||
return result
|
||||
|
||||
|
||||
# 更新友链
|
||||
@router.put('/update', summary='更新友链')
|
||||
@permission_required("sys:link:update")
|
||||
@check_demo
|
||||
def update(request: Request, data: LinkForm):
|
||||
# 调用更新友链服务方法
|
||||
result = link.update_link(request, data)
|
||||
# 返回结果
|
||||
return result
|
||||
|
||||
|
||||
# 删除友链
|
||||
@router.delete('/delete/{id}', summary='删除友链')
|
||||
@permission_required("sys:link:delete")
|
||||
@check_demo
|
||||
def delete(request: Request, id):
|
||||
# 调用删除友链服务方法
|
||||
result = link.delete_link(id)
|
||||
# 返回结果
|
||||
return result
|
||||
|
||||
|
||||
# 设置友链状态
|
||||
@router.put('/status', summary='设置友链状态')
|
||||
@permission_required("sys:link:status")
|
||||
@check_demo
|
||||
def status(request: Request, data: LinkStatusForm):
|
||||
# 调用设置友链状态服务方法
|
||||
result = link.update_link_status(request, data)
|
||||
# 返回结果
|
||||
return result
|
||||
|
||||
|
||||
# 批量删除友链
|
||||
@router.delete('/batchDelete', summary='批量删除友链')
|
||||
@permission_required("sys:link: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(link.delete_link, id_str)
|
||||
@@ -0,0 +1,29 @@
|
||||
from typing import Optional
|
||||
|
||||
from pydantic import BaseModel, ConfigDict, Field, field_validator
|
||||
|
||||
from modules.link.models import Link
|
||||
|
||||
|
||||
# 友链表单验证
|
||||
class LinkForm(BaseModel):
|
||||
model_config = ConfigDict(populate_by_name=True)
|
||||
|
||||
id: Optional[int] = Field(None, description="友链ID")
|
||||
name: str = Field(..., min_length=1, max_length=255, description="友链名称")
|
||||
type: int = Field(..., ge=1, le=2, description="友链类型")
|
||||
url: str = Field(..., min_length=1, max_length=255, description="友链URL")
|
||||
item_id: Optional[int] = Field(None, description="站点ID")
|
||||
cate_id: Optional[int] = Field(None, description="栏目ID")
|
||||
platform: int = Field(..., ge=1, le=4, description="投放平台")
|
||||
link_form: int = Field(..., ge=1, le=2, alias='form', description="友链形式")
|
||||
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="友链备注")
|
||||
|
||||
|
||||
# 设置状态表单
|
||||
class LinkStatusForm(BaseModel):
|
||||
id: int = Field(..., gt=0, description="友链ID")
|
||||
status: int = Field(..., ge=1, le=2, description="友链状态")
|
||||
@@ -0,0 +1,167 @@
|
||||
from datetime import datetime, timezone
|
||||
|
||||
from fastapi.logger import logger
|
||||
from sqlalchemy import and_
|
||||
|
||||
|
||||
from shared.enums import LINK_TYPE_LIST, LINK_PLATFORM_LIST, LINK_FORM_LIST
|
||||
from shared.constants import PAGE_SIZE
|
||||
from modules.link.schemas import LinkForm, LinkStatusForm
|
||||
from modules.link.models import Link
|
||||
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_link_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(Link).filter(Link.is_delete == 0)
|
||||
# 友链名称
|
||||
name = request.query_params.get('name')
|
||||
if name:
|
||||
query = query.filter(Link.name.like(like_contains(name), escape='\\'))
|
||||
# 友链类型：1-友情链接 2-合作伙伴
|
||||
type = request.query_params.get('type')
|
||||
if type:
|
||||
query = query.filter(Link.type == type)
|
||||
# 投放平台：1PC站 2WAP站 3微信小程序 4APP应用
|
||||
platform = request.query_params.get('platform')
|
||||
if platform:
|
||||
query = query.filter(Link.platform == platform)
|
||||
# 友链形式：1文字链接 2图片链接
|
||||
form = request.query_params.get('form')
|
||||
if form:
|
||||
query = query.filter(Link.form == form)
|
||||
# 状态筛选
|
||||
status = request.query_params.get('status')
|
||||
if status:
|
||||
query = query.filter(Link.status == status)
|
||||
# 排序
|
||||
query = query.order_by(Link.sort.desc())
|
||||
# 记录总数
|
||||
count = query.count()
|
||||
# 分页查询
|
||||
link_list = query.limit(limit).offset((page - 1) * limit).all()
|
||||
# 若当前页超出末页（数据被并发删除），自动回退到第一页
|
||||
if page > 1 and not link_list:
|
||||
page = 1
|
||||
count = query.count()
|
||||
link_list = query.limit(limit).offset(0).all()
|
||||
# 实例化结果
|
||||
result = []
|
||||
# 遍历数据源
|
||||
if len(link_list) > 0:
|
||||
for item in link_list:
|
||||
# 对象转字典
|
||||
data = item.to_dict()
|
||||
# 友链类型
|
||||
data['type_name'] = LINK_TYPE_LIST.get(item.type)
|
||||
# 投放平台
|
||||
data['platform_name'] = LINK_PLATFORM_LIST.get(item.platform)
|
||||
# 友链形式
|
||||
data['form_name'] = LINK_FORM_LIST.get(item.form)
|
||||
# 友链图片
|
||||
data['image'] = get_file_url(item.image) if item.image else None
|
||||
# 加入列表
|
||||
result.append(data)
|
||||
# 返回结果
|
||||
return R.ok(data=result, count=count)
|
||||
# 根据ID查看友链详情
|
||||
|
||||
def get_link_detail(link_id):
|
||||
db = get_db_session()
|
||||
# 根据ID查询友链
|
||||
link = db.query(Link).filter(and_(Link.id == link_id, Link.is_delete == 0)).first()
|
||||
# 查询结果为空判断
|
||||
if not link:
|
||||
return None
|
||||
# 对象转字典
|
||||
data = link.to_dict()
|
||||
# 友链图片
|
||||
data['image'] = get_file_url(link.image) if link.image else None
|
||||
# 返回结果
|
||||
return data
|
||||
# 添加友链
|
||||
|
||||
def add_link(request, data: LinkForm):
|
||||
db = get_db_session()
|
||||
# 表单数据转字典
|
||||
form_data = data.model_dump(exclude={'id'}, by_alias=True)
|
||||
|
||||
# 友链图片
|
||||
image = data.image
|
||||
if image:
|
||||
form_data['image'] = save_file(image, "link")
|
||||
|
||||
# 表单数据赋值给对象
|
||||
link = Link(**form_data)
|
||||
link.create_user = get_user_id(request)
|
||||
# 插入数据
|
||||
link.save()
|
||||
# 返回结果
|
||||
return R.ok(msg="添加成功")
|
||||
|
||||
|
||||
# 更新友链
|
||||
|
||||
def update_link(request, data: LinkForm):
|
||||
db = get_db_session()
|
||||
# 记录ID判空
|
||||
if not data.id or data.id <= 0:
|
||||
return R.failed("记录ID不能为空")
|
||||
|
||||
# 根据ID查询记录
|
||||
link = db.query(Link).filter(and_(Link.id == data.id, Link.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not link:
|
||||
return R.failed("记录不存在")
|
||||
|
||||
# 构造更新数据（排除 id，使用别名以匹配数据库字段）
|
||||
updData = data.model_dump(exclude={'id'}, by_alias=True)
|
||||
# 友链图片
|
||||
image = data.image
|
||||
if image:
|
||||
updData['image'] = save_file(image, "link")
|
||||
updData['update_user'] = get_user_id(request)
|
||||
updData['update_time'] = datetime.now(tz=timezone.utc)
|
||||
# 更新数据
|
||||
result = db.query(Link).filter_by(id=data.id).update(updData)
|
||||
# 提交数据
|
||||
if not result:
|
||||
return R.failed("更新失败")
|
||||
# 返回结果
|
||||
return R.ok(msg="更新成功")
|
||||
# 删除友链
|
||||
|
||||
def delete_link(link_id):
|
||||
return Link.batch_delete_r(link_id)
|
||||
# 设置状态
|
||||
|
||||
def update_link_status(request, data: LinkStatusForm):
|
||||
db = get_db_session()
|
||||
# 根据ID查询记录
|
||||
link = db.query(Link).filter(and_(Link.id == data.id, Link.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not link:
|
||||
return R.failed("记录不存在")
|
||||
|
||||
# 更新记录
|
||||
result = db.query(Link).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="设置成功")
|
||||
Reference in New Issue
Block a user