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
@@ -2,7 +2,6 @@ from datetime import datetime, timezone
|
||||
import asyncio
|
||||
|
||||
from fastapi.logger import logger
|
||||
from sqlalchemy import and_
|
||||
|
||||
from shared.enums import GENDER_LIST
|
||||
from shared.constants import PAGE_SIZE, DEFAULT_PASSWORD
|
||||
@@ -12,6 +11,7 @@ from modules.system.level.models import Level
|
||||
from modules.system.position.models import Position
|
||||
from modules.system.user.models import User
|
||||
from modules.system.user.models import UserRole
|
||||
from modules.system.user.repository import user_repo
|
||||
from core.database import get_db_session
|
||||
from core import R
|
||||
from core import password
|
||||
@@ -30,7 +30,7 @@ def get_user_page(request):
|
||||
# 每页数
|
||||
limit = int(request.query_params.get("pageSize", PAGE_SIZE))
|
||||
# 实例化查询对象
|
||||
query = db.query(User).filter(User.is_delete == 0)
|
||||
query = user_repo.filter(User.is_delete == 0)
|
||||
# 用户账号
|
||||
username = request.query_params.get('username')
|
||||
if username:
|
||||
@@ -118,7 +118,7 @@ def get_user_page(request):
|
||||
def get_user_detail(user_id):
|
||||
db = get_db_session()
|
||||
# 根据ID查询用户
|
||||
user = db.query(User).filter(and_(User.id == user_id, User.is_delete == 0)).first()
|
||||
user = user_repo.get_by_id(user_id)
|
||||
# 查询结果判空
|
||||
if not user:
|
||||
return None
|
||||
@@ -153,9 +153,8 @@ def get_user_detail(user_id):
|
||||
|
||||
async def add_user(request, data: UserForm):
|
||||
def _add():
|
||||
db = get_db_session()
|
||||
# 唯一性校验
|
||||
if db.query(User).filter(and_(User.username == data.username, User.is_delete == 0)).first():
|
||||
if user_repo.filter(User.username == data.username, User.is_delete == 0).first():
|
||||
return R.failed("登录账号不能重复"), None
|
||||
# 获取表单数据（排除非数据列）
|
||||
formData = data.model_dump(exclude={'city', 'roles'})
|
||||
@@ -178,11 +177,8 @@ async def add_user(request, data: UserForm):
|
||||
formData['city_code'] = citys[1]
|
||||
formData['district_code'] = citys[2]
|
||||
|
||||
# 表单数据赋值给对象
|
||||
user = User(**formData)
|
||||
user.create_user = get_user_id(request)
|
||||
# 插入数据
|
||||
user.save()
|
||||
# 表单数据赋值给对象并插入
|
||||
user = user_repo.create(**formData, create_user=get_user_id(request))
|
||||
return None, user.id
|
||||
|
||||
# 同步DB/文件操作放入线程池，避免阻塞事件循环
|
||||
@@ -201,19 +197,16 @@ async def add_user(request, data: UserForm):
|
||||
|
||||
async def update_user(request, data: UserForm):
|
||||
def _update():
|
||||
db = get_db_session()
|
||||
# 记录ID判空
|
||||
user_id = data.id
|
||||
if not user_id or int(user_id) <= 0:
|
||||
return R.failed("记录ID不能为空"), None
|
||||
# 唯一性校验（排除自身）
|
||||
if db.query(User).filter(and_(User.username == data.username, User.id != data.id, User.is_delete == 0)).first():
|
||||
if user_repo.filter(User.username == data.username, User.id != data.id, User.is_delete == 0).first():
|
||||
return R.failed("登录账号不能重复"), None
|
||||
|
||||
# 根据ID查询记录
|
||||
user = db.query(User).filter(and_(User.id == user_id, User.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not user:
|
||||
if not user_repo.get_by_id(user_id):
|
||||
return R.failed("记录不存在"), None
|
||||
|
||||
# 获取表单数据（排除敏感字段和非数据列）
|
||||
@@ -242,7 +235,7 @@ async def update_user(request, data: UserForm):
|
||||
updData['update_user'] = get_user_id(request)
|
||||
updData['update_time'] = datetime.now(tz=timezone.utc)
|
||||
# 更新数据
|
||||
result = db.query(User).filter_by(id=user_id).update(updData)
|
||||
result = user_repo.update(user_id, updData)
|
||||
if not result:
|
||||
return R.failed("更新失败"), None
|
||||
return None, user_id
|
||||
@@ -284,19 +277,16 @@ def delete_user(user_id):
|
||||
# 设置状态
|
||||
|
||||
def update_user_status(request, data: UserStatusForm):
|
||||
db = get_db_session()
|
||||
# 记录ID
|
||||
id = data.id
|
||||
# 状态值
|
||||
status = data.status
|
||||
# 根据ID查询记录
|
||||
user = db.query(User).filter(and_(User.id == id, User.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not user:
|
||||
if not user_repo.get_by_id(id):
|
||||
return R.failed("记录不存在")
|
||||
|
||||
# 更新记录
|
||||
result = db.query(User).filter_by(id=id).update({
|
||||
result = user_repo.update(id, {
|
||||
"status": status,
|
||||
"update_user": get_user_id(request),
|
||||
"update_time": datetime.now(tz=timezone.utc)
|
||||
@@ -309,18 +299,15 @@ def update_user_status(request, data: UserStatusForm):
|
||||
# 更新用户信息
|
||||
|
||||
def update_user_info(request, data: UserInfoForm):
|
||||
db = get_db_session()
|
||||
# 用户ID
|
||||
user_id = get_user_id(request)
|
||||
# 根据ID查询记录
|
||||
user = db.query(User).filter(and_(User.id == user_id, User.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not user:
|
||||
if not user_repo.get_by_id(user_id):
|
||||
return R.failed("记录不存在")
|
||||
|
||||
# 更新记录
|
||||
updData = data.model_dump()
|
||||
result = db.query(User).filter_by(id=user_id).update(updData)
|
||||
result = user_repo.update(user_id, updData)
|
||||
# 提交数据
|
||||
if not result:
|
||||
return R.failed("更新失败")
|
||||
@@ -329,12 +316,11 @@ def update_user_info(request, data: UserInfoForm):
|
||||
# 更新密码
|
||||
|
||||
def update_pwd(request, data: UpdatePwdForm):
|
||||
db = get_db_session()
|
||||
# 用户ID
|
||||
user_id = get_user_id(request)
|
||||
|
||||
# 根据ID查询用户
|
||||
user = db.query(User).filter(and_(User.is_delete == 0, User.id == user_id)).first()
|
||||
user = user_repo.get_by_id(user_id)
|
||||
if not user:
|
||||
return R.failed("用户不存在")
|
||||
|
||||
@@ -345,7 +331,7 @@ def update_pwd(request, data: UpdatePwdForm):
|
||||
# 加密新密码
|
||||
salt = password.generate_salt()
|
||||
new_hash = password.encrypt_password(data.newPassword, salt)
|
||||
result = db.query(User).filter_by(id=user_id).update({
|
||||
result = user_repo.update(user_id, {
|
||||
"password": new_hash,
|
||||
"salt": salt
|
||||
})
|
||||
@@ -357,19 +343,17 @@ def update_pwd(request, data: UpdatePwdForm):
|
||||
# 重置密码
|
||||
|
||||
def reset_user_pwd(request, data: ResetPwdForm):
|
||||
db = get_db_session()
|
||||
# 用户ID
|
||||
user_id = data.id
|
||||
|
||||
# 根据ID查询用户
|
||||
user = db.query(User).filter(and_(User.is_delete == 0, User.id == user_id)).first()
|
||||
if not user:
|
||||
if not user_repo.get_by_id(user_id):
|
||||
return R.failed("用户不存在")
|
||||
|
||||
# 加密新密码
|
||||
salt = password.generate_salt()
|
||||
new_hash = password.encrypt_password(DEFAULT_PASSWORD, salt)
|
||||
result = db.query(User).filter_by(id=user_id).update({
|
||||
result = user_repo.update(user_id, {
|
||||
"password": new_hash,
|
||||
"salt": salt
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user