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/system/position 数据访问层。"""
|
||||
from modules.system.position.models import Position
|
||||
from shared.base_repository import BaseRepository
|
||||
|
||||
class PositionRepository(BaseRepository[Position]):
|
||||
pass
|
||||
|
||||
position_repo = PositionRepository(Position)
|
||||
@@ -0,0 +1,90 @@
|
||||
import asyncio
|
||||
|
||||
from fastapi import APIRouter, Request
|
||||
|
||||
from modules.system.position.schemas import PositionForm, PositionStatusForm
|
||||
from core.middleware import check_demo
|
||||
from core.middleware import permission_required
|
||||
from modules.system.position import service as position
|
||||
|
||||
from core import R
|
||||
from utils.request import parse_batch_ids
|
||||
|
||||
# 创建路由
|
||||
router = APIRouter()
|
||||
|
||||
|
||||
# 查询分页数据
|
||||
@router.get('/page', summary='查询分页数据')
|
||||
@permission_required("sys:position:page")
|
||||
def page(request: Request):
|
||||
result = position.get_position_page(request)
|
||||
return result
|
||||
|
||||
|
||||
# 查询岗位详情
|
||||
@router.get('/detail/{id}', summary='查询岗位详情')
|
||||
@permission_required("sys:position:detail")
|
||||
def detail(request: Request, id):
|
||||
data = position.get_position_detail(id)
|
||||
return R.ok(data=data)
|
||||
|
||||
|
||||
# 添加岗位
|
||||
@router.post('/add', summary='添加岗位')
|
||||
@permission_required("sys:position:add")
|
||||
@check_demo
|
||||
def add(request: Request, data: PositionForm):
|
||||
result = position.add_position(request, data)
|
||||
return result
|
||||
|
||||
|
||||
# 更新岗位
|
||||
@router.put('/update', summary='更新职级')
|
||||
@permission_required("sys:position:update")
|
||||
@check_demo
|
||||
def update(request: Request, data: PositionForm):
|
||||
result = position.update_position(request, data)
|
||||
return result
|
||||
|
||||
|
||||
# 删除岗位
|
||||
@router.delete('/delete/{id}', summary='删除岗位')
|
||||
@permission_required("sys:position:delete")
|
||||
@check_demo
|
||||
def delete(request: Request, id):
|
||||
result = position.delete_position(id)
|
||||
return result
|
||||
|
||||
|
||||
# 设置岗位状态
|
||||
@router.put('/status', summary='设置岗位状态')
|
||||
@permission_required("sys:position:status")
|
||||
@check_demo
|
||||
def status(request: Request, data: PositionStatusForm):
|
||||
result = position.update_position_status(request, data)
|
||||
return result
|
||||
|
||||
|
||||
# 获取岗位列表
|
||||
@router.get('/getPositionList', summary='获取岗位列表')
|
||||
def get_position_list():
|
||||
result = position.get_position_list()
|
||||
return R.ok(data=result)
|
||||
|
||||
|
||||
# 批量删除岗位
|
||||
@router.delete('/batchDelete', summary='批量删除岗位')
|
||||
@permission_required("sys:position: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(position.delete_position, id_str)
|
||||
@@ -0,0 +1,15 @@
|
||||
from typing import Optional
|
||||
|
||||
from pydantic import BaseModel, Field
|
||||
|
||||
# 岗位表单验证
|
||||
class PositionForm(BaseModel):
|
||||
id: Optional[int] = Field(None, description="岗位ID")
|
||||
name: str = Field(..., min_length=1, max_length=150, description="岗位名称")
|
||||
status: int = Field(..., ge=1, le=2, description="岗位状态")
|
||||
sort: int = Field(..., ge=0, le=99999, description="岗位排序")
|
||||
|
||||
# 设置状态表单
|
||||
class PositionStatusForm(BaseModel):
|
||||
id: int = Field(..., gt=0, description="岗位ID")
|
||||
status: int = Field(..., ge=1, le=2, description="岗位状态")
|
||||
@@ -0,0 +1,152 @@
|
||||
from datetime import datetime, timezone
|
||||
|
||||
from fastapi.logger import logger
|
||||
from sqlalchemy import and_
|
||||
|
||||
from shared.constants import PAGE_SIZE
|
||||
from modules.system.position.schemas import PositionForm, PositionStatusForm
|
||||
from modules.system.position.models import Position
|
||||
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_position_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(Position).filter(Position.is_delete == 0)
|
||||
# 岗位名称
|
||||
name = request.query_params.get('name')
|
||||
if name:
|
||||
query = query.filter(Position.name.like(like_contains(name), escape='\\'))
|
||||
# 岗位状态筛选
|
||||
status = request.query_params.get('status')
|
||||
if status:
|
||||
query = query.filter(Position.status == status)
|
||||
# 排序
|
||||
query = query.order_by(Position.sort.asc())
|
||||
# 记录总数
|
||||
count = query.count()
|
||||
# 分页查询
|
||||
position_list = query.limit(limit).offset((page - 1) * limit).all()
|
||||
# 若当前页超出末页(数据被并发删除),自动回退到第一页
|
||||
if page > 1 and not position_list:
|
||||
page = 1
|
||||
count = query.count()
|
||||
position_list = query.limit(limit).offset(0).all()
|
||||
# 实例化结果
|
||||
result = []
|
||||
# 遍历数据源
|
||||
if len(position_list) > 0:
|
||||
for item in position_list:
|
||||
# 对象转字典
|
||||
data = item.to_dict()
|
||||
# 加入列表
|
||||
result.append(data)
|
||||
# 返回结果
|
||||
return R.ok(data=result, count=count)
|
||||
# 根据ID查询岗位详情
|
||||
|
||||
def get_position_detail(position_id):
|
||||
db = get_db_session()
|
||||
# 根据ID查询岗位
|
||||
position = db.query(Position).filter(and_(Position.id == position_id, Position.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not position:
|
||||
return None
|
||||
# 对象转字典
|
||||
data = position.to_dict()
|
||||
# 返回结果
|
||||
return data
|
||||
# 添加岗位
|
||||
|
||||
def add_position(request, data: PositionForm):
|
||||
db = get_db_session()
|
||||
# 唯一性校验
|
||||
if db.query(Position).filter(and_(Position.name == data.name, Position.is_delete == 0)).first():
|
||||
return R.failed("岗位名称不能重复")
|
||||
# 表单数据赋值给对象
|
||||
position = Position(**data.model_dump(exclude={'id'}))
|
||||
position.create_user = get_user_id(request)
|
||||
# 插入数据
|
||||
position.save()
|
||||
# 返回结果
|
||||
return R.ok(msg="添加成功")
|
||||
|
||||
|
||||
# 更新岗位
|
||||
|
||||
def update_position(request, data: PositionForm):
|
||||
db = get_db_session()
|
||||
# 记录ID判空
|
||||
if not data.id or data.id <= 0:
|
||||
return R.failed("记录ID不能为空")
|
||||
# 唯一性校验(排除自身)
|
||||
if db.query(Position).filter(and_(Position.name == data.name, Position.id != data.id, Position.is_delete == 0)).first():
|
||||
return R.failed("岗位名称不能重复")
|
||||
|
||||
# 根据ID查询记录
|
||||
position = db.query(Position).filter(and_(Position.id == data.id, Position.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not position:
|
||||
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(Position).filter_by(id=data.id).update(updData)
|
||||
# 提交数据
|
||||
if not result:
|
||||
return R.failed("更新失败")
|
||||
# 返回结果
|
||||
return R.ok(msg="更新成功")
|
||||
# 删除岗位
|
||||
|
||||
def delete_position(position_id):
|
||||
return Position.batch_delete_r(position_id)
|
||||
# 设置状态
|
||||
|
||||
def update_position_status(request, data: PositionStatusForm):
|
||||
db = get_db_session()
|
||||
# 根据ID查询记录
|
||||
position = db.query(Position).filter(and_(Position.id == data.id, Position.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not position:
|
||||
return R.failed("记录不存在")
|
||||
|
||||
# 更新记录
|
||||
result = db.query(Position).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="设置成功")
|
||||
# 获取岗位数据列表
|
||||
|
||||
def get_position_list():
|
||||
db = get_db_session()
|
||||
# 查询岗位数据列表
|
||||
position_rows = db.query(Position).filter(and_(Position.is_delete == 0, Position.status == 1)).order_by(
|
||||
Position.sort.asc()).all()
|
||||
# 实例化列表
|
||||
position_list = []
|
||||
# 遍历数据源
|
||||
if position_rows:
|
||||
for v in position_rows:
|
||||
# 对象转字典
|
||||
item = v.to_dict()
|
||||
# 加入数组
|
||||
position_list.append(item)
|
||||
# 返回结果
|
||||
return position_list
|
||||
Reference in New Issue
Block a user