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
+19
-37
@@ -8,7 +8,7 @@ from shared.constants import PAGE_SIZE
|
||||
from modules.member.schemas import MemberForm, MemberStatusForm
|
||||
from modules.member.models import Member
|
||||
from modules.member.models import MemberLevel
|
||||
from core.database import get_db_session
|
||||
from modules.member.repository import member_repo, memberlevel_repo
|
||||
from core import R
|
||||
from core import password
|
||||
from utils.rich_text import get_file_url, save_file
|
||||
@@ -19,13 +19,12 @@ from core.security import get_user_id
|
||||
# 查询会员分页数据
|
||||
|
||||
def get_member_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(Member).filter(Member.is_delete == 0)
|
||||
query = member_repo.filter(Member.is_delete == 0)
|
||||
# 会员账号
|
||||
username = request.query_params.get('username')
|
||||
if username:
|
||||
@@ -61,7 +60,7 @@ def get_member_page(request):
|
||||
level_ids = {item.member_level for item in member_list if item.member_level}
|
||||
member_level_list = {}
|
||||
if level_ids:
|
||||
for ml in db.query(MemberLevel).filter(MemberLevel.id.in_(level_ids), MemberLevel.is_delete == 0).all():
|
||||
for ml in memberlevel_repo.filter(MemberLevel.id.in_(level_ids), MemberLevel.is_delete == 0).all():
|
||||
member_level_list[ml.id] = ml.name
|
||||
|
||||
# 遍历会员数据源
|
||||
@@ -83,9 +82,8 @@ def get_member_page(request):
|
||||
# 根据ID查看会员详情
|
||||
|
||||
def get_member_detail(member_id):
|
||||
db = get_db_session()
|
||||
# 根据ID查询会员
|
||||
member = db.query(Member).filter(and_(Member.id == member_id, Member.is_delete == 0)).first()
|
||||
member = member_repo.get_by_id(member_id)
|
||||
# 查询结果判空
|
||||
if not member:
|
||||
return None
|
||||
@@ -110,9 +108,8 @@ def get_member_detail(member_id):
|
||||
# 添加会员
|
||||
|
||||
def add_member(request, data: MemberForm):
|
||||
db = get_db_session()
|
||||
# 唯一性校验
|
||||
if db.query(Member).filter(and_(Member.username == data.username, Member.is_delete == 0)).first():
|
||||
if member_repo.filter(and_(Member.username == data.username, Member.is_delete == 0)).first():
|
||||
return R.failed("登录账号不能重复")
|
||||
# 获取表单数据
|
||||
form_data = data.model_dump(exclude={'id'})
|
||||
@@ -142,10 +139,7 @@ def add_member(request, data: MemberForm):
|
||||
form_data['district_code'] = citys[2]
|
||||
|
||||
# 表单数据赋值给对象
|
||||
member = Member(**form_data)
|
||||
member.create_user = get_user_id(request)
|
||||
# 插入数据
|
||||
member.save()
|
||||
member_repo.create(**form_data, create_user=get_user_id(request))
|
||||
|
||||
# 返回结果
|
||||
return R.ok(msg="添加成功")
|
||||
@@ -154,16 +148,15 @@ def add_member(request, data: MemberForm):
|
||||
# 更新会员
|
||||
|
||||
def update_member(request, data: MemberForm):
|
||||
db = get_db_session()
|
||||
# 记录ID判空
|
||||
if not data.id or data.id <= 0:
|
||||
return R.failed("记录ID不能为空")
|
||||
# 唯一性校验（排除自身）
|
||||
if db.query(Member).filter(and_(Member.username == data.username, Member.id != data.id, Member.is_delete == 0)).first():
|
||||
if member_repo.filter(and_(Member.username == data.username, Member.id != data.id, Member.is_delete == 0)).first():
|
||||
return R.failed("登录账号不能重复")
|
||||
|
||||
# 根据ID查询记录
|
||||
user = db.query(Member).filter(and_(Member.id == data.id, Member.is_delete == 0)).first()
|
||||
user = member_repo.get_by_id(data.id)
|
||||
# 查询结果判空
|
||||
if not user:
|
||||
return R.failed("记录不存在")
|
||||
@@ -198,7 +191,7 @@ def update_member(request, data: MemberForm):
|
||||
form_data['update_user'] = get_user_id(request)
|
||||
form_data['update_time'] = datetime.now(tz=timezone.utc)
|
||||
# 更新数据
|
||||
result = db.query(Member).filter_by(id=data.id).update(form_data)
|
||||
result = member_repo.update(data.id, form_data)
|
||||
# 提交数据
|
||||
if not result:
|
||||
return R.failed("更新失败")
|
||||
@@ -211,15 +204,14 @@ def delete_member(member_id):
|
||||
# 设置状态
|
||||
|
||||
def update_member_status(request, data: MemberStatusForm):
|
||||
db = get_db_session()
|
||||
# 根据ID查询记录
|
||||
user = db.query(Member).filter(and_(Member.id == data.id, Member.is_delete == 0)).first()
|
||||
user = member_repo.get_by_id(data.id)
|
||||
# 查询结果判空
|
||||
if not user:
|
||||
return R.failed("记录不存在")
|
||||
|
||||
# 更新记录
|
||||
result = db.query(Member).filter_by(id=data.id).update({
|
||||
result = member_repo.update(data.id, {
|
||||
"status": data.status,
|
||||
"update_user": get_user_id(request),
|
||||
"update_time": datetime.now(tz=timezone.utc)
|
||||
@@ -239,7 +231,6 @@ from sqlalchemy import and_
|
||||
from shared.constants import PAGE_SIZE
|
||||
from modules.member.schemas import MemberLevelForm
|
||||
from modules.member.models import MemberLevel
|
||||
from core.database import get_db_session
|
||||
from core import R
|
||||
from core.security import get_user_id
|
||||
from utils.request import like_contains
|
||||
@@ -248,13 +239,12 @@ from utils.request import like_contains
|
||||
# 查询会员登记分页数据
|
||||
|
||||
def get_member_level_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(MemberLevel).filter(MemberLevel.is_delete == 0)
|
||||
query = memberlevel_repo.filter(MemberLevel.is_delete == 0)
|
||||
# 会员等级名称
|
||||
name = request.query_params.get('name')
|
||||
if name:
|
||||
@@ -284,10 +274,8 @@ def get_member_level_page(request):
|
||||
# 根据会员等级ID查询详情
|
||||
|
||||
def get_member_level_detail(member_level_id):
|
||||
db = get_db_session()
|
||||
# 根据ID查询会员等级
|
||||
member_level = db.query(MemberLevel).filter(
|
||||
and_(MemberLevel.id == member_level_id, MemberLevel.is_delete == 0)).first()
|
||||
member_level = memberlevel_repo.get_by_id(member_level_id)
|
||||
# 查询结果判空
|
||||
if not member_level:
|
||||
return None
|
||||
@@ -298,15 +286,11 @@ def get_member_level_detail(member_level_id):
|
||||
# 添加会员等级
|
||||
|
||||
def add_member_level(request, data: MemberLevelForm):
|
||||
db = get_db_session()
|
||||
# 唯一性校验
|
||||
if db.query(MemberLevel).filter(and_(MemberLevel.name == data.name, MemberLevel.is_delete == 0)).first():
|
||||
if memberlevel_repo.filter(and_(MemberLevel.name == data.name, MemberLevel.is_delete == 0)).first():
|
||||
return R.failed("会员等级名称不能重复")
|
||||
# 表单数据赋值给对象
|
||||
member_level = MemberLevel(**data.model_dump(exclude={'id'}))
|
||||
member_level.create_user = get_user_id(request)
|
||||
# 插入数据
|
||||
member_level.save()
|
||||
memberlevel_repo.create(**data.model_dump(exclude={'id'}), create_user=get_user_id(request))
|
||||
# 返回结果
|
||||
return R.ok(msg="添加成功")
|
||||
|
||||
@@ -314,16 +298,15 @@ def add_member_level(request, data: MemberLevelForm):
|
||||
# 更新会员等级
|
||||
|
||||
def update_member_level(request, data: MemberLevelForm):
|
||||
db = get_db_session()
|
||||
# 记录ID判空
|
||||
if not data.id or data.id <= 0:
|
||||
return R.failed("记录ID不能为空")
|
||||
# 唯一性校验（排除自身）
|
||||
if db.query(MemberLevel).filter(and_(MemberLevel.name == data.name, MemberLevel.id != data.id, MemberLevel.is_delete == 0)).first():
|
||||
if memberlevel_repo.filter(and_(MemberLevel.name == data.name, MemberLevel.id != data.id, MemberLevel.is_delete == 0)).first():
|
||||
return R.failed("会员等级名称不能重复")
|
||||
|
||||
# 根据ID查询记录
|
||||
member_level = db.query(MemberLevel).filter(and_(MemberLevel.id == data.id, MemberLevel.is_delete == 0)).first()
|
||||
member_level = memberlevel_repo.get_by_id(data.id)
|
||||
# 查询结果判空
|
||||
if not member_level:
|
||||
return R.failed("记录不存在")
|
||||
@@ -331,7 +314,7 @@ def update_member_level(request, data: MemberLevelForm):
|
||||
updData = data.model_dump(exclude={'id'})
|
||||
updData['update_user'] = get_user_id(request)
|
||||
updData['update_time'] = datetime.now(tz=timezone.utc)
|
||||
result = db.query(MemberLevel).filter_by(id=data.id).update(updData)
|
||||
result = memberlevel_repo.update(data.id, updData)
|
||||
# 提交数据
|
||||
if not result:
|
||||
return R.failed("更新失败")
|
||||
@@ -344,8 +327,7 @@ def delete_member_level(member_level_id):
|
||||
# 获取会员等级列表
|
||||
|
||||
def get_member_level_list():
|
||||
db = get_db_session()
|
||||
member_level_list = db.query(MemberLevel).filter(MemberLevel.is_delete == 0).order_by(MemberLevel.sort.asc()).all()
|
||||
member_level_list = memberlevel_repo.filter(MemberLevel.is_delete == 0).order_by(MemberLevel.sort.asc()).all()
|
||||
# 实例化对象
|
||||
result = []
|
||||
# 遍历数据源
|
||||
|
||||
Reference in New Issue
Block a user