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:
@@ -1,130 +1,2 @@
|
||||
from datetime import datetime, timezone
|
||||
|
||||
from fastapi.logger import logger
|
||||
from sqlalchemy import and_
|
||||
|
||||
from apps.constants.constants import CONFIG_DATA_TYPE_LIST
|
||||
from apps.constants.message import PAGE_SIZE
|
||||
from apps.forms.config_item import ConfigItemForm, ConfigItemStatusForm
|
||||
from apps.models.config_item import ConfigItem
|
||||
from extensions import get_db_session
|
||||
from utils import R
|
||||
from utils.security import get_user_id
|
||||
from utils.request import like_contains
|
||||
|
||||
|
||||
# 查询配置项分页数据
|
||||
|
||||
def get_config_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(ConfigItem).filter(ConfigItem.is_delete == 0)
|
||||
# 配置ID
|
||||
config_id = request.query_params.get('config_id', 0)
|
||||
query = query.filter(ConfigItem.config_id == config_id)
|
||||
# 配置项项名称模糊筛选
|
||||
title = request.query_params.get('title')
|
||||
if title:
|
||||
query = query.filter(ConfigItem.title.like(like_contains(title), escape='\\'))
|
||||
# 排序
|
||||
query = query.order_by(ConfigItem.sort.asc())
|
||||
# 记录总数
|
||||
count = query.count()
|
||||
# 分页查询
|
||||
config_list = query.limit(limit).offset((page - 1) * limit).all()
|
||||
# 若当前页超出末页(数据被并发删除),自动回退到第一页
|
||||
if page > 1 and not config_list:
|
||||
page = 1
|
||||
count = query.count()
|
||||
config_list = query.limit(limit).offset(0).all()
|
||||
# 实例化结果
|
||||
result = []
|
||||
# 遍历数据源
|
||||
if len(config_list) > 0:
|
||||
for item in config_list:
|
||||
# 对象转字典
|
||||
data = item.to_dict()
|
||||
# 配置项类型
|
||||
data['type_name'] = CONFIG_DATA_TYPE_LIST.get(item.type)
|
||||
# 加入列表
|
||||
result.append(data)
|
||||
# 返回结果
|
||||
return R.ok(data=result, count=count)
|
||||
# 根据ID查询配置项详情
|
||||
|
||||
def get_config_item_detail(config_id):
|
||||
db = get_db_session()
|
||||
# 根据ID查询配置项
|
||||
config_data = db.query(ConfigItem).filter(and_(ConfigItem.id == config_id, ConfigItem.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not config_data:
|
||||
return None
|
||||
# 对象转字典
|
||||
data = config_data.to_dict()
|
||||
# 返回结果
|
||||
return data
|
||||
# 添加配置项
|
||||
|
||||
def add_config_item(request, data: ConfigItemForm):
|
||||
db = get_db_session()
|
||||
# 表单数据赋值给对象
|
||||
config_data = ConfigItem(**data.model_dump(exclude={'id'}))
|
||||
config_data.create_user = get_user_id(request)
|
||||
# 插入数据
|
||||
config_data.save()
|
||||
# 返回结果
|
||||
return R.ok(msg="添加成功")
|
||||
|
||||
|
||||
# 更新配置项
|
||||
|
||||
def update_config_item(request, data: ConfigItemForm):
|
||||
db = get_db_session()
|
||||
# 记录ID判空
|
||||
if not data.id or data.id <= 0:
|
||||
return R.failed("记录ID不能为空")
|
||||
|
||||
# 根据ID查询记录
|
||||
config_data = db.query(ConfigItem).filter(and_(ConfigItem.id == data.id, ConfigItem.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not config_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(ConfigItem).filter_by(id=data.id).update(updData)
|
||||
# 提交数据
|
||||
if not result:
|
||||
return R.failed("更新失败")
|
||||
# 返回结果
|
||||
return R.ok(msg="更新成功")
|
||||
# 删除配置项
|
||||
|
||||
def delete_config_item(config_id):
|
||||
return ConfigItem.batch_delete_r(config_id)
|
||||
# 设置状态
|
||||
|
||||
def update_config_item_status(request, data: ConfigItemStatusForm):
|
||||
db = get_db_session()
|
||||
# 根据ID查询记录
|
||||
config_data = db.query(ConfigItem).filter(and_(ConfigItem.id == data.id, ConfigItem.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not config_data:
|
||||
return R.failed("记录不存在")
|
||||
|
||||
# 更新记录
|
||||
result = db.query(ConfigItem).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="设置成功")
|
||||
# 兼容垫片:由 modules.configuration.service 迁移
|
||||
from modules.configuration.service import * # noqa: F401,F403
|
||||
|
||||
Reference in New Issue
Block a user