ClaudeandClaude
969fdbbe7f
- 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>
229 lines
7.0 KiB
Python
229 lines
7.0 KiB
Python
from datetime import datetime, timezone
|
||
|
||
from fastapi.logger import logger
|
||
from sqlalchemy import and_
|
||
|
||
from shared.constants import PAGE_SIZE
|
||
from modules.dictionary.schemas import DictForm
|
||
from modules.dictionary.models import Dict
|
||
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
|
||
|
||
|
||
# 查询字典分页数据
|
||
|
||
def get_dict_page(request):
|
||
# 页码
|
||
page = int(request.query_params.get("pageNo", 1))
|
||
# 每页数
|
||
limit = int(request.query_params.get("pageSize", PAGE_SIZE))
|
||
# 实例化查询对象
|
||
query = dict_repo.filter(Dict.is_delete == 0)
|
||
# 字典名称
|
||
name = request.query_params.get('name')
|
||
if name:
|
||
query = query.filter(Dict.name.like(like_contains(name), escape='\\'))
|
||
# 排序
|
||
query = query.order_by(Dict.sort.asc())
|
||
# 记录总数
|
||
count = query.count()
|
||
# 分页查询
|
||
dict_list = query.limit(limit).offset((page - 1) * limit).all()
|
||
# 若当前页超出末页（数据被并发删除），自动回退到第一页
|
||
if page > 1 and not dict_list:
|
||
page = 1
|
||
count = query.count()
|
||
dict_list = query.limit(limit).offset(0).all()
|
||
# 实例化结果
|
||
result = []
|
||
# 遍历数据源
|
||
if len(dict_list) > 0:
|
||
for item in dict_list:
|
||
# 对象转字典
|
||
data = item.to_dict()
|
||
# 加入列表
|
||
result.append(data)
|
||
# 返回结果
|
||
return R.ok(data=result, count=count)
|
||
# 根据ID查询字典
|
||
|
||
def get_dict_detail(dict_id):
|
||
# 根据ID查询字典
|
||
dict = dict_repo.get_by_id(dict_id)
|
||
# 查询结果判空
|
||
if not dict:
|
||
return None
|
||
# 对象转字典
|
||
data = dict.to_dict()
|
||
# 返回结果
|
||
return data
|
||
# 添加字典
|
||
|
||
def add_dict(request, data: DictForm):
|
||
# 唯一性校验
|
||
if dict_repo.filter(and_(Dict.name == data.name, Dict.is_delete == 0)).first():
|
||
return R.failed("字典名称不能重复")
|
||
# 表单数据赋值给对象
|
||
dict_repo.create(**data.model_dump(exclude={'id'}), create_user=get_user_id(request))
|
||
# 返回结果
|
||
return R.ok(msg="添加成功")
|
||
|
||
|
||
# 更新字典
|
||
|
||
def update_dict(request, data: DictForm):
|
||
# 记录ID判空
|
||
if not data.id or data.id <= 0:
|
||
return R.failed("记录ID不能为空")
|
||
# 唯一性校验（排除自身）
|
||
if dict_repo.filter(and_(Dict.name == data.name, Dict.id != data.id, Dict.is_delete == 0)).first():
|
||
return R.failed("字典名称不能重复")
|
||
|
||
# 根据ID查询记录
|
||
dict = dict_repo.get_by_id(data.id)
|
||
# 查询结果判空
|
||
if not dict:
|
||
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 = dict_repo.update(data.id, updData)
|
||
# 提交数据
|
||
if not result:
|
||
return R.failed("更新失败")
|
||
# 返回结果
|
||
return R.ok(msg="更新成功")
|
||
# 删除字典
|
||
|
||
def delete_dict(dict_id):
|
||
return Dict.batch_delete_r(dict_id)
|
||
|
||
|
||
from datetime import datetime, timezone
|
||
|
||
from fastapi.logger import logger
|
||
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 import R
|
||
from core.security import get_user_id
|
||
from utils.request import like_contains
|
||
|
||
|
||
# 查询字典项分页数据
|
||
|
||
def get_dict_item_page(request):
|
||
# 页码
|
||
page = int(request.query_params.get("pageNo", 1))
|
||
# 每页数
|
||
limit = int(request.query_params.get("pageSize", PAGE_SIZE))
|
||
# 实例化查询对象
|
||
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)
|
||
# 字典项名称
|
||
name = request.query_params.get('name')
|
||
if name:
|
||
query = query.filter(DictItem.name.like(like_contains(name), escape='\\'))
|
||
# 排序
|
||
query = query.order_by(DictItem.sort.asc())
|
||
# 记录总数
|
||
count = query.count()
|
||
# 分页查询
|
||
dict_list = query.limit(limit).offset((page - 1) * limit).all()
|
||
# 若当前页超出末页（数据被并发删除），自动回退到第一页
|
||
if page > 1 and not dict_list:
|
||
page = 1
|
||
count = query.count()
|
||
dict_list = query.limit(limit).offset(0).all()
|
||
# 实例化结果
|
||
result = []
|
||
# 遍历数据源
|
||
if len(dict_list) > 0:
|
||
for item in dict_list:
|
||
# 对象转字典
|
||
data = item.to_dict()
|
||
# 加入列表
|
||
result.append(data)
|
||
# 返回结果
|
||
return R.ok(data=result, count=count)
|
||
# 根据ID查询字典项详情
|
||
|
||
def get_dict_item_detail(dict_id):
|
||
# 根据ID查询字典项
|
||
dict_data = dictitem_repo.get_by_id(dict_id)
|
||
# 查询结果判空
|
||
if not dict_data:
|
||
return None
|
||
# 对象转字典
|
||
data = dict_data.to_dict()
|
||
# 返回结果
|
||
return data
|
||
# 添加字典项
|
||
|
||
def add_dict_item(request, data: DictItemForm):
|
||
# 唯一性校验
|
||
if dictitem_repo.filter(and_(DictItem.name == data.name, DictItem.is_delete == 0)).first():
|
||
return R.failed("字典项名称不能重复")
|
||
# 表单数据赋值给对象
|
||
dictitem_repo.create(**data.model_dump(exclude={'id'}), create_user=get_user_id(request))
|
||
# 返回结果
|
||
return R.ok(msg="添加成功")
|
||
|
||
|
||
# 更新字典项
|
||
|
||
def update_dict_item(request, data: DictItemForm):
|
||
# 记录ID判空
|
||
if not data.id or data.id <= 0:
|
||
return R.failed("记录ID不能为空")
|
||
# 唯一性校验（排除自身）
|
||
if dictitem_repo.filter(and_(DictItem.name == data.name, DictItem.id != data.id, DictItem.is_delete == 0)).first():
|
||
return R.failed("字典项名称不能重复")
|
||
|
||
# 根据ID查询记录
|
||
dict_data = dictitem_repo.get_by_id(data.id)
|
||
# 查询结果判空
|
||
if not dict_data:
|
||
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 = dictitem_repo.update(data.id, updData)
|
||
# 提交数据
|
||
if not result:
|
||
return R.failed("更新失败")
|
||
# 返回结果
|
||
return R.ok(msg="更新成功")
|
||
# 删除字典项
|
||
|
||
def delete_dict_item(dict_id):
|
||
return DictItem.batch_delete_r(dict_id)
|
||
# 设置状态
|
||
|
||
def update_dict_item_status(request, data: DictItemStatusForm):
|
||
# 根据ID查询记录
|
||
dict_data = dictitem_repo.get_by_id(data.id)
|
||
# 查询结果判空
|
||
if not dict_data:
|
||
return R.failed("记录不存在")
|
||
|
||
# 更新记录
|
||
result = dictitem_repo.update(data.id, {
|
||
"status": data.status,
|
||
"update_user": get_user_id(request),
|
||
"update_time": datetime.now(tz=timezone.utc)
|
||
})
|
||
# 提交数据
|
||
if not result:
|
||
return R.failed("设置失败")
|
||
# 返回结果
|
||
return R.ok(msg="设置成功")
|