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,14 @@
|
||||
# +========== 迁移新增：本模块 Repository 层
|
||||
"""modules/dictionary 数据访问层。"""
|
||||
from modules.dictionary.models import Dict, DictItem
|
||||
from shared.base_repository import BaseRepository
|
||||
|
||||
class DictRepository(BaseRepository[Dict]):
|
||||
pass
|
||||
|
||||
dict_repo = DictRepository(Dict)
|
||||
|
||||
class DictItemRepository(BaseRepository[DictItem]):
|
||||
pass
|
||||
|
||||
dictitem_repo = DictItemRepository(DictItem)
|
||||
@@ -0,0 +1,159 @@
|
||||
import asyncio
|
||||
|
||||
from fastapi import APIRouter, Request
|
||||
|
||||
from modules.dictionary.schemas import DictForm
|
||||
from core.middleware import check_demo
|
||||
from core.middleware import permission_required
|
||||
from modules.dictionary import service as dict_service
|
||||
|
||||
from core import R
|
||||
from utils.request import parse_batch_ids
|
||||
|
||||
# 创建路由
|
||||
dict_router = APIRouter()
|
||||
|
||||
|
||||
# 查询分页数据
|
||||
@dict_router.get('/page', summary='查询分页数据')
|
||||
@permission_required("sys:dict:page")
|
||||
def page(request: Request):
|
||||
result = dict_service.get_dict_page(request)
|
||||
return result
|
||||
|
||||
|
||||
# 查询字典详情
|
||||
@dict_router.get('/detail/{id}', summary='查询字典详情')
|
||||
@permission_required("sys:dict:detail")
|
||||
def detail(request: Request, id):
|
||||
data = dict_service.get_dict_detail(id)
|
||||
return R.ok(data=data)
|
||||
|
||||
|
||||
# 添加字典
|
||||
@dict_router.post('/add', summary='添加字典')
|
||||
@permission_required("sys:dict:add")
|
||||
@check_demo
|
||||
def add(request: Request, data: DictForm):
|
||||
result = dict_service.add_dict(request, data)
|
||||
return result
|
||||
|
||||
|
||||
# 更新字典
|
||||
@dict_router.put('/update', summary='更新字典')
|
||||
@permission_required("sys:dict:update")
|
||||
@check_demo
|
||||
def update(request: Request, data: DictForm):
|
||||
result = dict_service.update_dict(request, data)
|
||||
return result
|
||||
|
||||
|
||||
# 删除字典
|
||||
@dict_router.delete('/delete/{id}', summary='删除字典')
|
||||
@permission_required("sys:dict:delete")
|
||||
@check_demo
|
||||
def delete(request: Request, id):
|
||||
result = dict_service.delete_dict(id)
|
||||
return result
|
||||
|
||||
|
||||
# 批量删除字典
|
||||
@dict_router.delete('/batchDelete', summary='批量删除字典')
|
||||
@permission_required("sys:dict: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(dict_service.delete_dict, id_str)
|
||||
|
||||
|
||||
import asyncio
|
||||
|
||||
from fastapi import APIRouter, Request
|
||||
|
||||
from modules.dictionary.schemas import DictItemForm, DictItemStatusForm
|
||||
from core.middleware import check_demo
|
||||
from core.middleware import permission_required
|
||||
from modules.dictionary import service as dict_item
|
||||
|
||||
from core import R
|
||||
from utils.request import parse_batch_ids
|
||||
|
||||
# 创建路由
|
||||
dict_item_router = APIRouter()
|
||||
|
||||
|
||||
# 查询分页数据
|
||||
@dict_item_router.get('/page', summary='查询分页数据')
|
||||
@permission_required("sys:dictitem:page")
|
||||
def page(request: Request):
|
||||
result = dict_item.get_dict_item_page(request)
|
||||
return result
|
||||
|
||||
|
||||
# 查询字典项详情
|
||||
@dict_item_router.get('/detail/{id}', summary='查询字典项详情')
|
||||
@permission_required("sys:dictitem:detail")
|
||||
def detail(request: Request, id):
|
||||
data = dict_item.get_dict_item_detail(id)
|
||||
return R.ok(data=data)
|
||||
|
||||
|
||||
# 添加字典项
|
||||
@dict_item_router.post('/add', summary='添加字典项')
|
||||
@permission_required("sys:dictitem:add")
|
||||
@check_demo
|
||||
def add(request: Request, data: DictItemForm):
|
||||
result = dict_item.add_dict_item(request, data)
|
||||
return result
|
||||
|
||||
|
||||
# 更新字典项
|
||||
@dict_item_router.put('/update', summary='更新字典项')
|
||||
@permission_required("sys:dictitem:update")
|
||||
@check_demo
|
||||
def update(request: Request, data: DictItemForm):
|
||||
result = dict_item.update_dict_item(request, data)
|
||||
return result
|
||||
|
||||
|
||||
# 删除字典项
|
||||
@dict_item_router.delete('/delete/{id}', summary='删除字典项')
|
||||
@permission_required("sys:dictitem:delete")
|
||||
@check_demo
|
||||
def delete(request: Request, id):
|
||||
result = dict_item.delete_dict_item(id)
|
||||
return result
|
||||
|
||||
|
||||
# 设置字典项状态
|
||||
@dict_item_router.put('/status', summary='设置字典项状态')
|
||||
@permission_required("sys:dictitem:status")
|
||||
@check_demo
|
||||
def status(request: Request, data: DictItemStatusForm):
|
||||
result = dict_item.update_dict_item_status(request, data)
|
||||
return result
|
||||
|
||||
|
||||
# 批量删除字典项
|
||||
@dict_item_router.delete('/batchDelete', summary='批量删除字典项')
|
||||
@permission_required("sys:dictitem: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(dict_item.delete_dict_item, id_str)
|
||||
@@ -0,0 +1,31 @@
|
||||
from typing import Optional
|
||||
|
||||
from pydantic import BaseModel, Field
|
||||
|
||||
# 字典表单验证
|
||||
class DictForm(BaseModel):
|
||||
id: Optional[int] = Field(None, description="字典ID")
|
||||
name: str = Field(..., min_length=1, max_length=150, description="字典名称")
|
||||
code: str = Field(..., min_length=1, max_length=150, description="字典编码")
|
||||
sort: int = Field(..., ge=0, le=99999, description="字典排序")
|
||||
note: Optional[str] = Field(None, max_length=255, description="字典备注")
|
||||
|
||||
|
||||
|
||||
from typing import Optional
|
||||
|
||||
from pydantic import BaseModel, Field
|
||||
|
||||
# 字典项表单验证
|
||||
class DictItemForm(BaseModel):
|
||||
id: Optional[int] = Field(None, description="字典项ID")
|
||||
name: str = Field(..., min_length=1, max_length=150, description="字典项名称")
|
||||
value: str = Field(..., min_length=1, max_length=150, description="字典项值")
|
||||
dict_id: int = Field(..., ge=0, description="字典ID")
|
||||
note: Optional[str] = Field(None, max_length=255, description="字典项备注")
|
||||
sort: int = Field(..., ge=0, le=99999, description="字典项排序")
|
||||
|
||||
# 设置状态表单
|
||||
class DictItemStatusForm(BaseModel):
|
||||
id: int = Field(..., gt=0, description="字典项ID")
|
||||
status: int = Field(..., ge=1, le=2, description="字典项状态")
|
||||
@@ -0,0 +1,244 @@
|
||||
from datetime import datetime, timezone
|
||||
|
||||
from fastapi.logger import logger
|
||||
from sqlalchemy import and_
|
||||
|
||||
from shared.constants import PAGE_SIZE
|
||||
from modules.dictionary.schemas import DictForm
|
||||
from modules.dictionary.models import Dict
|
||||
from core.database import get_db_session
|
||||
from core import R
|
||||
from core.security import get_user_id
|
||||
from utils.request import like_contains
|
||||
|
||||
|
||||
# 查询字典分页数据
|
||||
|
||||
def get_dict_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(Dict).filter(Dict.is_delete == 0)
|
||||
# 字典名称
|
||||
name = request.query_params.get('name')
|
||||
if name:
|
||||
query = query.filter(Dict.name.like(like_contains(name), escape='\\'))
|
||||
# 排序
|
||||
query = query.order_by(Dict.sort.asc())
|
||||
# 记录总数
|
||||
count = query.count()
|
||||
# 分页查询
|
||||
dict_list = query.limit(limit).offset((page - 1) * limit).all()
|
||||
# 若当前页超出末页（数据被并发删除），自动回退到第一页
|
||||
if page > 1 and not dict_list:
|
||||
page = 1
|
||||
count = query.count()
|
||||
dict_list = query.limit(limit).offset(0).all()
|
||||
# 实例化结果
|
||||
result = []
|
||||
# 遍历数据源
|
||||
if len(dict_list) > 0:
|
||||
for item in dict_list:
|
||||
# 对象转字典
|
||||
data = item.to_dict()
|
||||
# 加入列表
|
||||
result.append(data)
|
||||
# 返回结果
|
||||
return R.ok(data=result, count=count)
|
||||
# 根据ID查询字典
|
||||
|
||||
def get_dict_detail(dict_id):
|
||||
db = get_db_session()
|
||||
# 根据ID查询字典
|
||||
dict = db.query(Dict).filter(and_(Dict.id == dict_id, Dict.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not dict:
|
||||
return None
|
||||
# 对象转字典
|
||||
data = dict.to_dict()
|
||||
# 返回结果
|
||||
return data
|
||||
# 添加字典
|
||||
|
||||
def add_dict(request, data: DictForm):
|
||||
db = get_db_session()
|
||||
# 唯一性校验
|
||||
if db.query(Dict).filter(and_(Dict.name == data.name, Dict.is_delete == 0)).first():
|
||||
return R.failed("字典名称不能重复")
|
||||
# 表单数据赋值给对象
|
||||
dict = Dict(**data.model_dump(exclude={'id'}))
|
||||
dict.create_user = get_user_id(request)
|
||||
# 插入数据
|
||||
dict.save()
|
||||
# 返回结果
|
||||
return R.ok(msg="添加成功")
|
||||
|
||||
|
||||
# 更新字典
|
||||
|
||||
def update_dict(request, data: DictForm):
|
||||
db = get_db_session()
|
||||
# 记录ID判空
|
||||
if not data.id or data.id <= 0:
|
||||
return R.failed("记录ID不能为空")
|
||||
# 唯一性校验（排除自身）
|
||||
if db.query(Dict).filter(and_(Dict.name == data.name, Dict.id != data.id, Dict.is_delete == 0)).first():
|
||||
return R.failed("字典名称不能重复")
|
||||
|
||||
# 根据ID查询记录
|
||||
dict = db.query(Dict).filter(and_(Dict.id == data.id, Dict.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not dict:
|
||||
return R.failed("记录不存在")
|
||||
# 构造更新数据（排除 id）
|
||||
updData = data.model_dump(exclude={'id'})
|
||||
updData['update_user'] = get_user_id(request)
|
||||
updData['update_time'] = datetime.now(tz=timezone.utc)
|
||||
result = db.query(Dict).filter_by(id=data.id).update(updData)
|
||||
# 提交数据
|
||||
if not result:
|
||||
return R.failed("更新失败")
|
||||
# 返回结果
|
||||
return R.ok(msg="更新成功")
|
||||
# 删除字典
|
||||
|
||||
def delete_dict(dict_id):
|
||||
return Dict.batch_delete_r(dict_id)
|
||||
|
||||
|
||||
from datetime import datetime, timezone
|
||||
|
||||
from fastapi.logger import logger
|
||||
from sqlalchemy import and_
|
||||
|
||||
from shared.constants import PAGE_SIZE
|
||||
from modules.dictionary.schemas import DictItemForm, DictItemStatusForm
|
||||
from modules.dictionary.models import DictItem
|
||||
from core.database import get_db_session
|
||||
from core import R
|
||||
from core.security import get_user_id
|
||||
from utils.request import like_contains
|
||||
|
||||
|
||||
# 查询字典项分页数据
|
||||
|
||||
def get_dict_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(DictItem).filter(DictItem.is_delete == 0)
|
||||
# 字典ID
|
||||
dict_id = request.query_params.get('dict_id', 0)
|
||||
query = query.filter(DictItem.dict_id == dict_id)
|
||||
# 字典项名称
|
||||
name = request.query_params.get('name')
|
||||
if name:
|
||||
query = query.filter(DictItem.name.like(like_contains(name), escape='\\'))
|
||||
# 排序
|
||||
query = query.order_by(DictItem.sort.asc())
|
||||
# 记录总数
|
||||
count = query.count()
|
||||
# 分页查询
|
||||
dict_list = query.limit(limit).offset((page - 1) * limit).all()
|
||||
# 若当前页超出末页（数据被并发删除），自动回退到第一页
|
||||
if page > 1 and not dict_list:
|
||||
page = 1
|
||||
count = query.count()
|
||||
dict_list = query.limit(limit).offset(0).all()
|
||||
# 实例化结果
|
||||
result = []
|
||||
# 遍历数据源
|
||||
if len(dict_list) > 0:
|
||||
for item in dict_list:
|
||||
# 对象转字典
|
||||
data = item.to_dict()
|
||||
# 加入列表
|
||||
result.append(data)
|
||||
# 返回结果
|
||||
return R.ok(data=result, count=count)
|
||||
# 根据ID查询字典项详情
|
||||
|
||||
def get_dict_item_detail(dict_id):
|
||||
db = get_db_session()
|
||||
# 根据ID查询字典项
|
||||
dict_data = db.query(DictItem).filter(and_(DictItem.id == dict_id, DictItem.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not dict_data:
|
||||
return None
|
||||
# 对象转字典
|
||||
data = dict_data.to_dict()
|
||||
# 返回结果
|
||||
return data
|
||||
# 添加字典项
|
||||
|
||||
def add_dict_item(request, data: DictItemForm):
|
||||
db = get_db_session()
|
||||
# 唯一性校验
|
||||
if db.query(DictItem).filter(and_(DictItem.name == data.name, DictItem.is_delete == 0)).first():
|
||||
return R.failed("字典项名称不能重复")
|
||||
# 表单数据赋值给对象
|
||||
dict_data = DictItem(**data.model_dump(exclude={'id'}))
|
||||
dict_data.create_user = get_user_id(request)
|
||||
# 插入数据
|
||||
dict_data.save()
|
||||
# 返回结果
|
||||
return R.ok(msg="添加成功")
|
||||
|
||||
|
||||
# 更新字典项
|
||||
|
||||
def update_dict_item(request, data: DictItemForm):
|
||||
db = get_db_session()
|
||||
# 记录ID判空
|
||||
if not data.id or data.id <= 0:
|
||||
return R.failed("记录ID不能为空")
|
||||
# 唯一性校验（排除自身）
|
||||
if db.query(DictItem).filter(and_(DictItem.name == data.name, DictItem.id != data.id, DictItem.is_delete == 0)).first():
|
||||
return R.failed("字典项名称不能重复")
|
||||
|
||||
# 根据ID查询记录
|
||||
dict_data = db.query(DictItem).filter(and_(DictItem.id == data.id, DictItem.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not dict_data:
|
||||
return R.failed("记录不存在")
|
||||
# 构造更新数据（排除 id）
|
||||
updData = data.model_dump(exclude={'id'})
|
||||
updData['update_user'] = get_user_id(request)
|
||||
updData['update_time'] = datetime.now(tz=timezone.utc)
|
||||
result = db.query(DictItem).filter_by(id=data.id).update(updData)
|
||||
# 提交数据
|
||||
if not result:
|
||||
return R.failed("更新失败")
|
||||
# 返回结果
|
||||
return R.ok(msg="更新成功")
|
||||
# 删除字典项
|
||||
|
||||
def delete_dict_item(dict_id):
|
||||
return DictItem.batch_delete_r(dict_id)
|
||||
# 设置状态
|
||||
|
||||
def update_dict_item_status(request, data: DictItemStatusForm):
|
||||
db = get_db_session()
|
||||
# 根据ID查询记录
|
||||
dict_data = db.query(DictItem).filter(and_(DictItem.id == data.id, DictItem.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not dict_data:
|
||||
return R.failed("记录不存在")
|
||||
|
||||
# 更新记录
|
||||
result = db.query(DictItem).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