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
@@ -6,7 +6,7 @@ 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 modules.dictionary.repository import dict_repo, dictitem_repo
|
||||
from core import R
|
||||
from core.security import get_user_id
|
||||
from utils.request import like_contains
|
||||
@@ -15,13 +15,12 @@ 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)
|
||||
query = dict_repo.filter(Dict.is_delete == 0)
|
||||
# 字典名称
|
||||
name = request.query_params.get('name')
|
||||
if name:
|
||||
@@ -51,9 +50,8 @@ def get_dict_page(request):
|
||||
# 根据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()
|
||||
dict = dict_repo.get_by_id(dict_id)
|
||||
# 查询结果判空
|
||||
if not dict:
|
||||
return None
|
||||
@@ -64,15 +62,11 @@ def get_dict_detail(dict_id):
|
||||
# 添加字典
|
||||
|
||||
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():
|
||||
if dict_repo.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()
|
||||
dict_repo.create(**data.model_dump(exclude={'id'}), create_user=get_user_id(request))
|
||||
# 返回结果
|
||||
return R.ok(msg="添加成功")
|
||||
|
||||
@@ -80,16 +74,15 @@ def add_dict(request, data: DictForm):
|
||||
# 更新字典
|
||||
|
||||
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():
|
||||
if dict_repo.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()
|
||||
dict = dict_repo.get_by_id(data.id)
|
||||
# 查询结果判空
|
||||
if not dict:
|
||||
return R.failed("记录不存在")
|
||||
@@ -97,7 +90,7 @@ def update_dict(request, data: DictForm):
|
||||
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)
|
||||
result = dict_repo.update(data.id, updData)
|
||||
# 提交数据
|
||||
if not result:
|
||||
return R.failed("更新失败")
|
||||
@@ -117,7 +110,6 @@ 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
|
||||
@@ -126,13 +118,12 @@ 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)
|
||||
query = dictitem_repo.filter(DictItem.is_delete == 0)
|
||||
# 字典ID
|
||||
dict_id = request.query_params.get('dict_id', 0)
|
||||
query = query.filter(DictItem.dict_id == dict_id)
|
||||
@@ -165,9 +156,8 @@ def get_dict_item_page(request):
|
||||
# 根据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()
|
||||
dict_data = dictitem_repo.get_by_id(dict_id)
|
||||
# 查询结果判空
|
||||
if not dict_data:
|
||||
return None
|
||||
@@ -178,15 +168,11 @@ def get_dict_item_detail(dict_id):
|
||||
# 添加字典项
|
||||
|
||||
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():
|
||||
if dictitem_repo.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()
|
||||
dictitem_repo.create(**data.model_dump(exclude={'id'}), create_user=get_user_id(request))
|
||||
# 返回结果
|
||||
return R.ok(msg="添加成功")
|
||||
|
||||
@@ -194,16 +180,15 @@ def add_dict_item(request, data: DictItemForm):
|
||||
# 更新字典项
|
||||
|
||||
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():
|
||||
if dictitem_repo.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()
|
||||
dict_data = dictitem_repo.get_by_id(data.id)
|
||||
# 查询结果判空
|
||||
if not dict_data:
|
||||
return R.failed("记录不存在")
|
||||
@@ -211,7 +196,7 @@ def update_dict_item(request, data: DictItemForm):
|
||||
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)
|
||||
result = dictitem_repo.update(data.id, updData)
|
||||
# 提交数据
|
||||
if not result:
|
||||
return R.failed("更新失败")
|
||||
@@ -224,15 +209,14 @@ def delete_dict_item(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()
|
||||
dict_data = dictitem_repo.get_by_id(data.id)
|
||||
# 查询结果判空
|
||||
if not dict_data:
|
||||
return R.failed("记录不存在")
|
||||
|
||||
# 更新记录
|
||||
result = db.query(DictItem).filter_by(id=data.id).update({
|
||||
result = dictitem_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