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:
@@ -1,11 +1,11 @@
|
||||
from datetime import datetime, timezone
|
||||
|
||||
from fastapi.logger import logger
|
||||
from sqlalchemy import and_
|
||||
|
||||
from shared.constants import PAGE_SIZE
|
||||
from modules.system.position.schemas import PositionForm, PositionStatusForm
|
||||
from modules.system.position.models import Position
|
||||
from modules.system.position.repository import position_repo
|
||||
from core.database import get_db_session
|
||||
from core import R
|
||||
from core.security import get_user_id
|
||||
@@ -15,13 +15,12 @@ from utils.request import like_contains
|
||||
# 查询岗位分页数据
|
||||
|
||||
def get_position_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(Position).filter(Position.is_delete == 0)
|
||||
query = position_repo.filter(Position.is_delete == 0)
|
||||
# 岗位名称
|
||||
name = request.query_params.get('name')
|
||||
if name:
|
||||
@@ -55,9 +54,8 @@ def get_position_page(request):
|
||||
# 根据ID查询岗位详情
|
||||
|
||||
def get_position_detail(position_id):
|
||||
db = get_db_session()
|
||||
# 根据ID查询岗位
|
||||
position = db.query(Position).filter(and_(Position.id == position_id, Position.is_delete == 0)).first()
|
||||
position = position_repo.get_by_id(position_id)
|
||||
# 查询结果判空
|
||||
if not position:
|
||||
return None
|
||||
@@ -68,15 +66,11 @@ def get_position_detail(position_id):
|
||||
# 添加岗位
|
||||
|
||||
def add_position(request, data: PositionForm):
|
||||
db = get_db_session()
|
||||
# 唯一性校验
|
||||
if db.query(Position).filter(and_(Position.name == data.name, Position.is_delete == 0)).first():
|
||||
if position_repo.filter(Position.name == data.name, Position.is_delete == 0).first():
|
||||
return R.failed("岗位名称不能重复")
|
||||
# 表单数据赋值给对象
|
||||
position = Position(**data.model_dump(exclude={'id'}))
|
||||
position.create_user = get_user_id(request)
|
||||
# 插入数据
|
||||
position.save()
|
||||
# 表单数据赋值给对象并插入
|
||||
position_repo.create(**data.model_dump(exclude={'id'}), create_user=get_user_id(request))
|
||||
# 返回结果
|
||||
return R.ok(msg="添加成功")
|
||||
|
||||
@@ -84,24 +78,21 @@ def add_position(request, data: PositionForm):
|
||||
# 更新岗位
|
||||
|
||||
def update_position(request, data: PositionForm):
|
||||
db = get_db_session()
|
||||
# 记录ID判空
|
||||
if not data.id or data.id <= 0:
|
||||
return R.failed("记录ID不能为空")
|
||||
# 唯一性校验(排除自身)
|
||||
if db.query(Position).filter(and_(Position.name == data.name, Position.id != data.id, Position.is_delete == 0)).first():
|
||||
if position_repo.filter(Position.name == data.name, Position.id != data.id, Position.is_delete == 0).first():
|
||||
return R.failed("岗位名称不能重复")
|
||||
|
||||
# 根据ID查询记录
|
||||
position = db.query(Position).filter(and_(Position.id == data.id, Position.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not position:
|
||||
if not position_repo.get_by_id(data.id):
|
||||
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(Position).filter_by(id=data.id).update(updData)
|
||||
result = position_repo.update(data.id, updData)
|
||||
# 提交数据
|
||||
if not result:
|
||||
return R.failed("更新失败")
|
||||
@@ -114,15 +105,12 @@ def delete_position(position_id):
|
||||
# 设置状态
|
||||
|
||||
def update_position_status(request, data: PositionStatusForm):
|
||||
db = get_db_session()
|
||||
# 根据ID查询记录
|
||||
position = db.query(Position).filter(and_(Position.id == data.id, Position.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not position:
|
||||
if not position_repo.get_by_id(data.id):
|
||||
return R.failed("记录不存在")
|
||||
|
||||
# 更新记录
|
||||
result = db.query(Position).filter_by(id=data.id).update({
|
||||
result = position_repo.update(data.id, {
|
||||
"status": data.status,
|
||||
"update_user": get_user_id(request),
|
||||
"update_time": datetime.now(tz=timezone.utc)
|
||||
@@ -135,9 +123,8 @@ def update_position_status(request, data: PositionStatusForm):
|
||||
# 获取岗位数据列表
|
||||
|
||||
def get_position_list():
|
||||
db = get_db_session()
|
||||
# 查询岗位数据列表
|
||||
position_rows = db.query(Position).filter(and_(Position.is_delete == 0, Position.status == 1)).order_by(
|
||||
position_rows = position_repo.filter(Position.is_delete == 0, Position.status == 1).order_by(
|
||||
Position.sort.asc()).all()
|
||||
# 实例化列表
|
||||
position_list = []
|
||||
|
||||
Reference in New Issue
Block a user