djangoadmin/DjangoAdmin_FastAPI_EleVue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(repo): 全部模块 service 改用 repository（Repository 全面落地）

Browse Source 
- 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
2026-08-07 11:02:58 +08:00
co-authored by Claude
parent 13853daa4a
commit 969fdbbe7f
18 changed files with 219 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/cms/ad/service.py
+9 -16
View File
@@ -8,6 +8,7 @@ from shared.enums import AD_TYPE_LIST
from shared.constants import PAGE_SIZE
from modules.cms.ad.schemas import AdForm, AdStatusForm
from modules.cms.ad.models import Ad
from modules.cms.ad.repository import ad_repo
from modules.cms.ad_sort.models import AdSort
from config import FASTAPI_IMAGE_URL
from core.database import get_db_session
@@ -26,7 +27,7 @@ def get_ad_page(request):
# 每页数
limit = int(request.query_params.get("pageSize", PAGE_SIZE))
# 实例化查询对象
query = db.query(Ad).filter(Ad.is_delete == 0)
query = ad_repo.filter(Ad.is_delete == 0)
# 广告标题
title = request.query_params.get('title')
if title:
@@ -72,9 +73,8 @@ def get_ad_page(request):
# 根据广告ID查询详情
def get_ad_detail(ad_id):
db = get_db_session()
# 根据广告ID查询信息
ad = db.query(Ad).filter(and_(Ad.id == ad_id, Ad.is_delete == 0)).first()
ad = ad_repo.get_by_id(ad_id)
# 查询结果为空判断
if not ad:
return None
@@ -92,7 +92,6 @@ def get_ad_detail(ad_id):
# 添加广告
def add_ad(request, data: AdForm):
db = get_db_session()
# 广告封面
cover = data.cover
if data.type == 1 and cover:
@@ -107,12 +106,8 @@ def add_ad(request, data: AdForm):
# # 处理富文本内容
# content = save_content(content, title, "ad")
# 表单数据赋值给对象
ad = Ad(**data.model_dump(exclude={'id'}))
ad.cover = cover
ad.create_user = get_user_id(request)
# 插入数据
ad.save()
# 表单数据赋值给对象并插入（cover 用处理后的文件路径，排除表单原值避免重复传参）
ad_repo.create(**data.model_dump(exclude={'id', 'cover'}), cover=cover, create_user=get_user_id(request))
# 返回结果
return R.ok(msg="添加成功")
@@ -120,12 +115,11 @@ def add_ad(request, data: AdForm):
# 更新广告
def update_ad(request, data: AdForm):
db = get_db_session()
# 记录ID判空
if not data.id or data.id <= 0:
return R.failed("记录ID不能为空")
# 根据ID查询记录
ad = db.query(Ad).filter(and_(Ad.id == data.id, Ad.is_delete == 0)).first()
ad = ad_repo.get_by_id(data.id)
# 查询结果判空
if not ad:
return R.failed("记录不存在")
@@ -150,7 +144,7 @@ def update_ad(request, data: AdForm):
updData['update_user'] = get_user_id(request)
updData['update_time'] = datetime.now(tz=timezone.utc)
# 更新记录
result = db.query(Ad).filter_by(id=data.id).update(updData)
result = ad_repo.update(data.id, updData)
# 提交数据
# 返回结果
if not result:
@@ -164,15 +158,14 @@ def delete_ad(ad_id):
# 设置状态
def update_ad_status(request, data: AdStatusForm):
db = get_db_session()
# 根据ID查询记录
ad = db.query(Ad).filter(and_(Ad.id == data.id, Ad.is_delete == 0)).first()
ad = ad_repo.get_by_id(data.id)
# 查询结果判空
if not ad:
return R.failed("记录不存在")
# 更新记录
result = db.query(Ad).filter_by(id=data.id).update({
result = ad_repo.update(data.id, {
"status": data.status,
"update_user": get_user_id(request),
"update_time": datetime.now(tz=timezone.utc)
modules/cms/ad_sort/service.py
+8 -14
View File
@@ -8,6 +8,7 @@ from shared.enums import AD_SORT_PLATFORM_LIST
from shared.constants import PAGE_SIZE
from modules.cms.ad_sort.schemas import AdSortForm
from modules.cms.ad_sort.models import AdSort
from modules.cms.ad_sort.repository import adsort_repo
from modules.cms.item.models import Item
from modules.cms.item_cate.models import ItemCate
from core.database import get_db_session
@@ -25,7 +26,7 @@ def get_ad_sort_page(request):
# 每页数
limit = int(request.query_params.get("pageSize", PAGE_SIZE))
# 实例化查询对象
query = db.query(AdSort).filter(AdSort.is_delete == 0)
query = adsort_repo.filter(AdSort.is_delete == 0)
# 名称
name = request.query_params.get('name')
if name:
@@ -71,9 +72,8 @@ def get_ad_sort_page(request):
# 根据ID查询广告位详情
def get_ad_sort_detail(adsort_id):
db = get_db_session()
# 根据ID查询广告位
adsort = db.query(AdSort).filter(and_(AdSort.id == adsort_id, AdSort.is_delete == 0)).first()
adsort = adsort_repo.get_by_id(adsort_id)
# 查询结果为空判断
if not adsort:
return None
@@ -84,12 +84,8 @@ def get_ad_sort_detail(adsort_id):
# 添加广告位
def add_ad_sort(request, data: AdSortForm):
db = get_db_session()
# 表单数据赋值给对象
adsort = AdSort(**data.model_dump(exclude={'id'}))
adsort.create_user = get_user_id(request)
# 插入数据
adsort.save()
# 表单数据赋值给对象并插入
adsort_repo.create(**data.model_dump(exclude={'id'}), create_user=get_user_id(request))
# 返回结果
return R.ok(msg="添加成功")
@@ -97,13 +93,12 @@ def add_ad_sort(request, data: AdSortForm):
# 更新广告位
def update_ad_sort(request, data: AdSortForm):
db = get_db_session()
# 记录ID判空
if not data.id or data.id <= 0:
return R.failed("记录ID不能为空")
# 根据ID查询记录
adsort = db.query(AdSort).filter(and_(AdSort.id == data.id, AdSort.is_delete == 0)).first()
adsort = adsort_repo.get_by_id(data.id)
# 查询结果判空
if not adsort:
return R.failed("记录不存在")
@@ -111,7 +106,7 @@ def update_ad_sort(request, data: AdSortForm):
updData = data.model_dump(exclude={'id'})
updData['update_user'] = get_user_id(request)
updData['update_time'] = datetime.now(tz=timezone.utc)
result = db.query(AdSort).filter_by(id=data.id).update(updData)
result = adsort_repo.update(data.id, updData)
# 提交数据
if not result:
return R.failed("更新失败")
@@ -124,9 +119,8 @@ def delete_ad_sort(adsort_id):
# 查询广告位列表
def get_ad_sort_list():
db = get_db_session()
# 查询全部广告位列表
ad_sort_list = db.query(AdSort).filter(AdSort.is_delete == 0).all()
ad_sort_list = adsort_repo.filter(AdSort.is_delete == 0).all()
# 实例化广告位对象列表
sortList = []
if ad_sort_list:
modules/cms/item/service.py
+10 -18
View File
@@ -8,7 +8,7 @@ from shared.enums import ITEM_TYPE_LIST
from shared.constants import PAGE_SIZE
from modules.cms.item.schemas import ItemForm
from modules.cms.item.models import Item
from core.database import get_db_session
from modules.cms.item.repository import item_repo
from core import R
from utils.rich_text import get_file_url, save_file
from utils.request import like_contains
@@ -18,13 +18,12 @@ from core.security import get_user_id
# 查询站点分页数据
def get_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(Item).filter(Item.is_delete == 0)
query = item_repo.filter(Item.is_delete == 0)
# 站点名称
name = request.query_params.get('name')
if name:
@@ -66,9 +65,8 @@ def get_item_page(request):
# 根据ID查询站点详情
def get_item_detail(item_id):
db = get_db_session()
# 根据ID查询站点
item = db.query(Item).filter(and_(Item.id == item_id, Item.is_delete == 0)).first()
item = item_repo.get_by_id(item_id)
# 查询结果判空
if not item:
return None
@@ -81,9 +79,8 @@ def get_item_detail(item_id):
# 添加站点
def add_item(request, data: ItemForm):
db = get_db_session()
# 唯一性校验
if db.query(Item).filter(and_(Item.name == data.name, Item.is_delete == 0)).first():
if item_repo.filter(and_(Item.name == data.name, Item.is_delete == 0)).first():
return R.failed("站点名称不能重复")
# 表单数据转字典
form_data = data.model_dump(exclude={'id'})
@@ -92,11 +89,8 @@ def add_item(request, data: ItemForm):
if image:
form_data['image'] = save_file(image, "item")
# 表单数据赋值给对象
item = Item(**form_data)
item.create_user = get_user_id(request)
# 插入数据
item.save()
# 表单数据赋值给对象并插入
item_repo.create(**form_data, create_user=get_user_id(request))
# 返回结果
return R.ok(msg="添加成功")
@@ -104,16 +98,15 @@ def add_item(request, data: ItemForm):
# 更新站点
def update_item(request, data: ItemForm):
db = get_db_session()
# 记录ID判空
if not data.id or data.id <= 0:
return R.failed("记录ID不能为空")
# 唯一性校验（排除自身）
if db.query(Item).filter(and_(Item.name == data.name, Item.id != data.id, Item.is_delete == 0)).first():
if item_repo.filter(and_(Item.name == data.name, Item.id != data.id, Item.is_delete == 0)).first():
return R.failed("站点名称不能重复")
# 根据ID查询记录
item = db.query(Item).filter(and_(Item.id == data.id, Item.is_delete == 0)).first()
item = item_repo.get_by_id(data.id)
# 查询结果判空
if not item:
return R.failed("记录不存在")
@@ -127,7 +120,7 @@ def update_item(request, data: ItemForm):
updData['update_user'] = get_user_id(request)
updData['update_time'] = datetime.now(tz=timezone.utc)
# 更新数据
result = db.query(Item).filter_by(id=data.id).update(updData)
result = item_repo.update(data.id, updData)
# 提交数据
if not result:
return R.failed("更新失败")
@@ -140,8 +133,7 @@ def delete_item(item_id):
# 获取站点列表
def get_item_list():
db = get_db_session()
item_rows = db.query(Item).filter(and_(Item.status == 1, Item.is_delete == 0)).order_by(Item.sort.asc()).all()
item_rows = item_repo.filter(and_(Item.status == 1, Item.is_delete == 0)).order_by(Item.sort.asc()).all()
# 实例化站点列表
item_list = []
# 遍历数据源
modules/cms/item_cate/service.py
+10 -18
View File
@@ -7,8 +7,8 @@ from sqlalchemy import and_
from shared.constants import PAGE_SIZE
from modules.cms.item_cate.schemas import ItemCateForm
from modules.cms.item_cate.models import ItemCate
from modules.cms.item_cate.repository import itemcate_repo
from modules.cms.item import service as item
from core.database import get_db_session
from core import R
from utils.rich_text import get_file_url, save_file
from utils.request import like_contains
@@ -18,13 +18,12 @@ from core.security import get_user_id
# 查询栏目数据
def get_item_cate_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(ItemCate).filter(ItemCate.is_delete == 0)
query = itemcate_repo.filter(ItemCate.is_delete == 0)
# 栏目名称
name = request.query_params.get('name')
if name:
@@ -64,9 +63,8 @@ def get_item_cate_page(request):
# 根据栏目ID查询详情
def get_item_cate_detail(itemcate_id):
db = get_db_session()
# 根据ID查询栏目
cate = db.query(ItemCate).filter(and_(ItemCate.id == itemcate_id, ItemCate.is_delete == 0)).first()
cate = itemcate_repo.get_by_id(itemcate_id)
# 查询结果判空
if not cate:
return None
@@ -80,9 +78,8 @@ def get_item_cate_detail(itemcate_id):
# 添加栏目
def add_item_cate(request, data: ItemCateForm):
db = get_db_session()
# 唯一性校验
if db.query(ItemCate).filter(and_(ItemCate.name == data.name, ItemCate.is_delete == 0)).first():
if itemcate_repo.filter(and_(ItemCate.name == data.name, ItemCate.is_delete == 0)).first():
return R.failed("栏目名称不能重复")
# 表单数据转字典
form_data = data.model_dump(exclude={'id'})
@@ -100,11 +97,8 @@ def add_item_cate(request, data: ItemCateForm):
else:
form_data['cover'] = None
# 表单数据赋值给对象
cate = ItemCate(**form_data)
cate.create_user = get_user_id(request)
# 插入数据
cate.save()
# 表单数据赋值给对象并插入
itemcate_repo.create(**form_data, create_user=get_user_id(request))
# 返回结果
return R.ok(msg="添加成功")
@@ -112,16 +106,15 @@ def add_item_cate(request, data: ItemCateForm):
# 更新栏目
def update_item_cate(request, data: ItemCateForm):
db = get_db_session()
# 记录ID判空
if not data.id or data.id <= 0:
return R.failed("记录ID不能为空")
# 唯一性校验（排除自身）
if db.query(ItemCate).filter(and_(ItemCate.name == data.name, ItemCate.id != data.id, ItemCate.is_delete == 0)).first():
if itemcate_repo.filter(and_(ItemCate.name == data.name, ItemCate.id != data.id, ItemCate.is_delete == 0)).first():
return R.failed("栏目名称不能重复")
# 根据ID查询记录
cate = db.query(ItemCate).filter(and_(ItemCate.id == data.id, ItemCate.is_delete == 0)).first()
cate = itemcate_repo.get_by_id(data.id)
# 查询结果判空
if not cate:
return R.failed("记录不存在")
@@ -143,7 +136,7 @@ def update_item_cate(request, data: ItemCateForm):
updData['update_user'] = get_user_id(request)
updData['update_time'] = datetime.now(tz=timezone.utc)
# 更新数据
result = db.query(ItemCate).filter_by(id=data.id).update(updData)
result = itemcate_repo.update(data.id, updData)
# 提交数据
if not result:
return R.failed("更新失败")
@@ -156,8 +149,7 @@ def delete_item_cate(cate_id):
# 获取栏目列表
def get_cate_list():
db = get_db_session()
cate_rows = db.query(ItemCate).filter(and_(ItemCate.is_delete == 0, ItemCate.status == 1)).order_by(
cate_rows = itemcate_repo.filter(and_(ItemCate.is_delete == 0, ItemCate.status == 1)).order_by(
ItemCate.sort.asc()).all()
# 实例化栏目列表
cate_list = []