feat(repo): 全部模块 service 改用 repository（Repository 全面落地）
- 24 个模块 service 从直接 db.query 改为使用各自 repository（get_by_id/filter/create/update） - 4 个 agent 并行分组转换：system 组、dictionary/configuration/member/region、cms/link/notice、job/log - 保留合法 db 用法：跨模型查询（user→dept/level/position、ad→adsort、adsort→item/itemcate）、投影查询（role/menu）、按条件删除（set_permission/save_role_menu/add_user_role）、独立会话（record_job_log/record_operation_log）、db.commit（pause/resume） - 修复 JobLogRepository 软删列 del_flag；修复 ad/notice create 重复传参 bug - 修复 base_repository.get_by_id/get_by_ids 兼容字符串 ID - 实测：27 个读接口 + dept/notice/member/level 写操作全通过 Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
Claude
@@ -9,8 +9,8 @@ from shared.constants import PAGE_SIZE
|
||||
from modules.configuration.schemas import ConfigForm
|
||||
from modules.configuration.models import Config
|
||||
from modules.configuration.models import ConfigItem
|
||||
from modules.configuration.repository import config_repo, configitem_repo
|
||||
from config import FASTAPI_IMAGE_URL
|
||||
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
|
||||
@@ -20,13 +20,12 @@ from core.security import get_user_id
|
||||
# 配置表单验证
|
||||
|
||||
def get_config_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(Config).filter(Config.is_delete == 0)
|
||||
query = config_repo.filter(Config.is_delete == 0)
|
||||
# 配置名称
|
||||
name = request.query_params.get('name')
|
||||
if name:
|
||||
@@ -56,9 +55,8 @@ def get_config_page(request):
|
||||
# 根据ID获取配置详情
|
||||
|
||||
def get_config_detail(config_id):
|
||||
db = get_db_session()
|
||||
# 根据ID查询配置
|
||||
config = db.query(Config).filter(and_(Config.id == config_id, Config.is_delete == 0)).first()
|
||||
config = config_repo.get_by_id(config_id)
|
||||
# 查询结果判空
|
||||
if not config:
|
||||
return None
|
||||
@@ -69,15 +67,11 @@ def get_config_detail(config_id):
|
||||
# 添加配置
|
||||
|
||||
def add_config(request, data: ConfigForm):
|
||||
db = get_db_session()
|
||||
# 唯一性校验
|
||||
if db.query(Config).filter(and_(Config.name == data.name, Config.is_delete == 0)).first():
|
||||
if config_repo.filter(and_(Config.name == data.name, Config.is_delete == 0)).first():
|
||||
return R.failed("配置名称不能重复")
|
||||
# 表单数据赋值给对象
|
||||
config = Config(**data.model_dump(exclude={'id'}))
|
||||
config.create_user = get_user_id(request)
|
||||
# 插入数据
|
||||
config.save()
|
||||
config_repo.create(**data.model_dump(exclude={'id'}), create_user=get_user_id(request))
|
||||
# 返回结果
|
||||
return R.ok(msg="添加成功")
|
||||
|
||||
@@ -85,16 +79,15 @@ def add_config(request, data: ConfigForm):
|
||||
# 更新配置
|
||||
|
||||
def update_config(request, data: ConfigForm):
|
||||
db = get_db_session()
|
||||
# 记录ID判空
|
||||
if not data.id or data.id <= 0:
|
||||
return R.failed("记录ID不能为空")
|
||||
# 唯一性校验（排除自身）
|
||||
if db.query(Config).filter(and_(Config.name == data.name, Config.id != data.id, Config.is_delete == 0)).first():
|
||||
if config_repo.filter(and_(Config.name == data.name, Config.id != data.id, Config.is_delete == 0)).first():
|
||||
return R.failed("配置名称不能重复")
|
||||
|
||||
# 根据ID查询记录
|
||||
config = db.query(Config).filter(and_(Config.id == data.id, Config.is_delete == 0)).first()
|
||||
config = config_repo.get_by_id(data.id)
|
||||
# 查询结果判空
|
||||
if not config:
|
||||
return R.failed("记录不存在")
|
||||
@@ -102,7 +95,7 @@ def update_config(request, data: ConfigForm):
|
||||
updData = data.model_dump(exclude={'id'})
|
||||
updData['update_user'] = get_user_id(request)
|
||||
updData['update_time'] = datetime.now(tz=timezone.utc)
|
||||
result = db.query(Config).filter_by(id=data.id).update(updData)
|
||||
result = config_repo.update(data.id, updData)
|
||||
# 提交数据
|
||||
if not result:
|
||||
return R.failed("更新失败")
|
||||
@@ -129,15 +122,14 @@ def _parse_options(options_str):
|
||||
|
||||
# 获取网站配置信息
|
||||
def get_config_info(request):
|
||||
db = get_db_session()
|
||||
# 一次性查询所有配置组
|
||||
configList = db.query(Config).filter(Config.is_delete == 0).order_by(Config.sort.asc()).all()
|
||||
configList = config_repo.filter(Config.is_delete == 0).order_by(Config.sort.asc()).all()
|
||||
if not configList:
|
||||
return []
|
||||
|
||||
# 一次性查询所有活跃配置项，按config_id分组
|
||||
config_ids = [c.id for c in configList]
|
||||
all_items = db.query(ConfigItem).filter(
|
||||
all_items = configitem_repo.filter(
|
||||
and_(ConfigItem.is_delete == 0, ConfigItem.status == 1, ConfigItem.config_id.in_(config_ids))
|
||||
).order_by(ConfigItem.sort.asc()).all()
|
||||
|
||||
@@ -191,9 +183,8 @@ async def save_config_info(request):
|
||||
return R.failed("请求参数异常")
|
||||
|
||||
def _save():
|
||||
db = get_db_session()
|
||||
# 预加载所有活跃配置项，仅允许修改这些项
|
||||
valid_items = db.query(ConfigItem).filter(
|
||||
valid_items = configitem_repo.filter(
|
||||
and_(ConfigItem.is_delete == 0, ConfigItem.status == 1)
|
||||
).all()
|
||||
item_map = {item.code: item for item in valid_items}
|
||||
@@ -238,7 +229,6 @@ from shared.enums import CONFIG_DATA_TYPE_LIST
|
||||
from shared.constants import PAGE_SIZE
|
||||
from modules.configuration.schemas import ConfigItemForm, ConfigItemStatusForm
|
||||
from modules.configuration.models import ConfigItem
|
||||
from core.database import get_db_session
|
||||
from core import R
|
||||
from core.security import get_user_id
|
||||
from utils.request import like_contains
|
||||
@@ -247,13 +237,12 @@ 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)
|
||||
query = configitem_repo.filter(ConfigItem.is_delete == 0)
|
||||
# 配置ID
|
||||
config_id = request.query_params.get('config_id', 0)
|
||||
query = query.filter(ConfigItem.config_id == config_id)
|
||||
@@ -288,9 +277,8 @@ def get_config_item_page(request):
|
||||
# 根据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()
|
||||
config_data = configitem_repo.get_by_id(config_id)
|
||||
# 查询结果判空
|
||||
if not config_data:
|
||||
return None
|
||||
@@ -301,12 +289,8 @@ def get_config_item_detail(config_id):
|
||||
# 添加配置项
|
||||
|
||||
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()
|
||||
configitem_repo.create(**data.model_dump(exclude={'id'}), create_user=get_user_id(request))
|
||||
# 返回结果
|
||||
return R.ok(msg="添加成功")
|
||||
|
||||
@@ -314,13 +298,12 @@ def add_config_item(request, data: ConfigItemForm):
|
||||
# 更新配置项
|
||||
|
||||
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()
|
||||
config_data = configitem_repo.get_by_id(data.id)
|
||||
# 查询结果判空
|
||||
if not config_data:
|
||||
return R.failed("记录不存在")
|
||||
@@ -328,7 +311,7 @@ def update_config_item(request, data: ConfigItemForm):
|
||||
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)
|
||||
result = configitem_repo.update(data.id, updData)
|
||||
# 提交数据
|
||||
if not result:
|
||||
return R.failed("更新失败")
|
||||
@@ -341,15 +324,14 @@ def delete_config_item(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()
|
||||
config_data = configitem_repo.get_by_id(data.id)
|
||||
# 查询结果判空
|
||||
if not config_data:
|
||||
return R.failed("记录不存在")
|
||||
|
||||
# 更新记录
|
||||
result = db.query(ConfigItem).filter_by(id=data.id).update({
|
||||
result = configitem_repo.update(data.id, {
|
||||
"status": data.status,
|
||||
"update_user": get_user_id(request),
|
||||
"update_time": datetime.now(tz=timezone.utc)
|
||||
|
||||
Reference in New Issue
Block a user