feat(phase4): 全部业务模块迁移到 modules/（结构迁移）
- 21 个模块目录（auth/system/dictionary/configuration/cms/member/region/link/notice/job/log/upload/index） - 每个模块 router.py（合并模块导出多个 router）/schemas.py/service.py/repository.py/models.py - routers/v1.py 与 routers/__init__.py 改为直接引用 modules，前缀与权限串原样保留 - core/middleware.py 懒加载指向 modules.system.menu / modules.log；core/redis_client.py 指向 modules.job.scheduler - apps/views|services|forms 全部改为 re-export 垫片 - 迁移后 grep 守门通过：modules/core 无 apps/extensions 残留引用 - 实测登录、27+ 模块接口、写操作 commit、操作日志落库均正常 Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
Claude
+2
-184
@@ -1,184 +1,2 @@
|
||||
from datetime import datetime, timezone
|
||||
|
||||
from fastapi.logger import logger
|
||||
from sqlalchemy import and_
|
||||
|
||||
|
||||
from apps.constants.constants import AD_TYPE_LIST
|
||||
from apps.constants.message import PAGE_SIZE
|
||||
from apps.forms.ad import AdForm, AdStatusForm
|
||||
from apps.models.ad import Ad
|
||||
from apps.models.ad_sort import AdSort
|
||||
from config import FASTAPI_IMAGE_URL
|
||||
from extensions import get_db_session
|
||||
from utils import R
|
||||
from utils.rich_text import get_file_url, save_file, save_content
|
||||
from utils.request import like_contains
|
||||
from utils.security import get_user_id
|
||||
|
||||
|
||||
# 查询广告分页数据
|
||||
|
||||
def get_ad_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(Ad).filter(Ad.is_delete == 0)
|
||||
# 广告标题
|
||||
title = request.query_params.get('title')
|
||||
if title:
|
||||
query = query.filter(Ad.title.like(like_contains(title), escape='\\'))
|
||||
# 广告类型：1-图片 2-文字 3-视频 4-推荐
|
||||
type = request.query_params.get('type')
|
||||
if type:
|
||||
query = query.filter(Ad.type == type)
|
||||
# 广告状态
|
||||
status = request.query_params.get('status')
|
||||
if status:
|
||||
query = query.filter(Ad.status == status)
|
||||
# 排序
|
||||
query = query.order_by(Ad.sort.desc())
|
||||
# 记录总数
|
||||
count = query.count()
|
||||
# 分页查询
|
||||
ad_list = query.limit(limit).offset((page - 1) * limit).all()
|
||||
# 若当前页超出末页（数据被并发删除），自动回退到第一页
|
||||
if page > 1 and not ad_list:
|
||||
page = 1
|
||||
count = query.count()
|
||||
ad_list = query.limit(limit).offset(0).all()
|
||||
# 实例化结果
|
||||
result = []
|
||||
# 遍历数据源
|
||||
if len(ad_list) > 0:
|
||||
for item in ad_list:
|
||||
# 对象转字典
|
||||
data = item.to_dict()
|
||||
# 广告类型
|
||||
data['type_name'] = AD_TYPE_LIST.get(item.type)
|
||||
# 广告封面
|
||||
data['cover'] = get_file_url(item.cover) if item.cover else None
|
||||
# 查询广告位信息
|
||||
ad_sort = db.query(AdSort).filter(and_(AdSort.id == item.sort_id, AdSort.is_delete == 0)).first()
|
||||
# 广告位描述
|
||||
data['sort_desc'] = ad_sort.name + "=>" + str(ad_sort.loc_id) if ad_sort else None
|
||||
# 加入列表
|
||||
result.append(data)
|
||||
# 返回结果
|
||||
return R.ok(data=result, count=count)
|
||||
# 根据广告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()
|
||||
# 查询结果为空判断
|
||||
if not ad:
|
||||
return None
|
||||
# 对象转字典
|
||||
data = ad.to_dict()
|
||||
# 广告类型描述
|
||||
data['type_name'] = AD_TYPE_LIST.get(ad.type)
|
||||
# 广告封面
|
||||
data['cover'] = get_file_url(ad.cover) if ad.cover else ""
|
||||
# # 富文本内容
|
||||
# content = ad.content.replace("[IMG_URL]", FASTAPI_IMAGE_URL)
|
||||
# data['content'] = content
|
||||
# 返回结果
|
||||
return data
|
||||
# 添加广告
|
||||
|
||||
def add_ad(request, data: AdForm):
|
||||
db = get_db_session()
|
||||
# 广告封面
|
||||
cover = data.cover
|
||||
if data.type == 1 and cover:
|
||||
cover = save_file(cover, "ad")
|
||||
else:
|
||||
cover = None
|
||||
|
||||
# # 广告标题
|
||||
# title = data.title
|
||||
# # 广告内容
|
||||
# content = data.content
|
||||
# # 处理富文本内容
|
||||
# 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()
|
||||
# 返回结果
|
||||
return R.ok(msg="添加成功")
|
||||
|
||||
|
||||
# 更新广告
|
||||
|
||||
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()
|
||||
# 查询结果判空
|
||||
if not ad:
|
||||
return R.failed("记录不存在")
|
||||
|
||||
# 广告封面
|
||||
cover = data.cover
|
||||
if data.type == 1 and cover:
|
||||
cover = save_file(cover, "ad")
|
||||
else:
|
||||
cover = None
|
||||
|
||||
# # 广告标题
|
||||
# title = data.title
|
||||
# # 广告内容
|
||||
# content = data.content
|
||||
# # 处理富文本内容
|
||||
# content = save_content(content, title, "ad")
|
||||
|
||||
# 构造更新数据（排除 id）
|
||||
updData = data.model_dump(exclude={'id'})
|
||||
updData['cover'] = cover
|
||||
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)
|
||||
# 提交数据
|
||||
# 返回结果
|
||||
if not result:
|
||||
return R.failed("更新失败")
|
||||
# 返回结果
|
||||
return R.ok(msg="更新成功")
|
||||
# 删除广告
|
||||
|
||||
def delete_ad(ad_id):
|
||||
return Ad.batch_delete_r(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()
|
||||
# 查询结果判空
|
||||
if not ad:
|
||||
return R.failed("记录不存在")
|
||||
|
||||
# 更新记录
|
||||
result = db.query(Ad).filter_by(id=data.id).update({
|
||||
"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="设置成功")
|
||||
# 兼容垫片：由 modules.cms.ad.service 迁移
|
||||
from modules.cms.ad.service import * # noqa: F401,F403
|
||||
|
||||
+2
-141
@@ -1,141 +1,2 @@
|
||||
from datetime import datetime, timezone
|
||||
|
||||
from fastapi.logger import logger
|
||||
from sqlalchemy import and_
|
||||
|
||||
|
||||
from apps.constants.constants import AD_SORT_PLATFORM_LIST
|
||||
from apps.constants.message import PAGE_SIZE
|
||||
from apps.forms.ad_sort import AdSortForm
|
||||
from apps.models.ad_sort import AdSort
|
||||
from apps.models.item import Item
|
||||
from apps.models.item_cate import ItemCate
|
||||
from extensions import get_db_session
|
||||
from utils import R
|
||||
from utils.security import get_user_id
|
||||
from utils.request import like_contains
|
||||
|
||||
|
||||
# 获取广告位分页数据
|
||||
|
||||
def get_ad_sort_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(AdSort).filter(AdSort.is_delete == 0)
|
||||
# 名称
|
||||
name = request.query_params.get('name')
|
||||
if name:
|
||||
query = query.filter(AdSort.name.like(like_contains(name), escape='\\'))
|
||||
# 投放平台：1PC站 2WAP站 3微信小程序 4APP应用
|
||||
platform = request.query_params.get('platform')
|
||||
if platform:
|
||||
query = query.filter(AdSort.platform == platform)
|
||||
# 栏目状态筛选
|
||||
status = request.query_params.get('status')
|
||||
if status:
|
||||
query = query.filter(AdSort.status == status)
|
||||
# 排序
|
||||
query = query.order_by(AdSort.sort.asc())
|
||||
# 记录总数
|
||||
count = query.count()
|
||||
# 分页查询
|
||||
ad_sort_list = query.limit(limit).offset((page - 1) * limit).all()
|
||||
# 若当前页超出末页（数据被并发删除），自动回退到第一页
|
||||
if page > 1 and not ad_sort_list:
|
||||
page = 1
|
||||
count = query.count()
|
||||
ad_sort_list = query.limit(limit).offset(0).all()
|
||||
# 实例化结果
|
||||
result = []
|
||||
# 遍历数据源
|
||||
if len(ad_sort_list) > 0:
|
||||
for v in ad_sort_list:
|
||||
# 对象转字典
|
||||
data = v.to_dict()
|
||||
# 投放平台
|
||||
data['platform_name'] = AD_SORT_PLATFORM_LIST.get(v.platform)
|
||||
# 站点信息
|
||||
item_info = db.query(Item).filter(and_(Item.id == v.item_id, Item.is_delete == 0)).first()
|
||||
data['item_name'] = item_info.name if item_info else None
|
||||
# 栏目信息
|
||||
cate_info = db.query(ItemCate).filter(and_(ItemCate.id == v.cate_id, ItemCate.is_delete == 0)).first()
|
||||
data['cate_name'] = cate_info.name if cate_info else None
|
||||
# 加入列表
|
||||
result.append(data)
|
||||
# 返回结果
|
||||
return R.ok(data=result, count=count)
|
||||
# 根据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()
|
||||
# 查询结果为空判断
|
||||
if not adsort:
|
||||
return None
|
||||
# 对象转字典
|
||||
data = adsort.to_dict()
|
||||
# 返回结果
|
||||
return data
|
||||
# 添加广告位
|
||||
|
||||
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()
|
||||
# 返回结果
|
||||
return R.ok(msg="添加成功")
|
||||
|
||||
|
||||
# 更新广告位
|
||||
|
||||
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()
|
||||
# 查询结果判空
|
||||
if not adsort:
|
||||
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(AdSort).filter_by(id=data.id).update(updData)
|
||||
# 提交数据
|
||||
if not result:
|
||||
return R.failed("更新失败")
|
||||
# 返回结果
|
||||
return R.ok(msg="更新成功")
|
||||
# 删除广告位
|
||||
|
||||
def delete_ad_sort(adsort_id):
|
||||
return AdSort.batch_delete_r(adsort_id)
|
||||
# 查询广告位列表
|
||||
|
||||
def get_ad_sort_list():
|
||||
db = get_db_session()
|
||||
# 查询全部广告位列表
|
||||
ad_sort_list = db.query(AdSort).filter(AdSort.is_delete == 0).all()
|
||||
# 实例化广告位对象列表
|
||||
sortList = []
|
||||
if ad_sort_list:
|
||||
for v in ad_sort_list:
|
||||
item = {
|
||||
'id': v.id,
|
||||
'description': v.description + "=>" + str(v.loc_id)
|
||||
}
|
||||
# 加入列表
|
||||
sortList.append(item)
|
||||
# 返回结果
|
||||
return sortList
|
||||
# 兼容垫片：由 modules.cms.ad_sort.service 迁移
|
||||
from modules.cms.ad_sort.service import * # noqa: F401,F403
|
||||
|
||||
+2
-159
@@ -1,159 +1,2 @@
|
||||
# +======================================================================
|
||||
# | DjangoAdmin 企业数字化开发平台 [ 赋能开发者，助力企业发展 ]
|
||||
# +----------------------------------------------------------------------
|
||||
# | Copyright (c) 2021-2026 一米阳光团队 版权所有
|
||||
# +----------------------------------------------------------------------
|
||||
# | 开源协议: Apache-2.0
|
||||
# | 重要声明: 未经书面许可，不得移除或修改本框架相关版权标识。
|
||||
# +----------------------------------------------------------------------
|
||||
# | 官方网站: https://www.djangoadmin.cn
|
||||
# +----------------------------------------------------------------------
|
||||
# | 研发团队: 一米阳光团队 荣誉出品
|
||||
# +======================================================================
|
||||
# | 版权和免责声明:
|
||||
# | 一、知识产权声明
|
||||
# | 本团队对该软件框架产品（以下简称“本产品”）拥有完整知识产权，包括但不限于商标权、专利权、
|
||||
# | 著作权、商业秘密等。前述权利均受中华人民共和国及相关国际法律法规保护。未经本团队书面授权，
|
||||
# | 任何个人或单位不得基于本产品本身申请任何形式的知识产权。
|
||||
# | 二、使用限制与禁止条款
|
||||
# | 您理解并同意，禁止将本产品用于以下任何行为：
|
||||
# | 1. 任何违反中华人民共和国法律法规的用途；
|
||||
# | 2. 任何侵害他人合法权益（包括但不限于人身权、财产权、知识产权等）的行为；
|
||||
# | 3. 任何危害国家安全、公共利益及社会道德风尚的行为。
|
||||
# | 三、责任豁免
|
||||
# | 因使用本产品而产生的任何损失或法律纠纷（包括但不限于直接损失、间接损失、附带损失、衍生损失
|
||||
# | 以及因违约、侵权等引发的责任），本团队均不承担任何法律责任。若因违规使用本产品导致任何第三
|
||||
# | 方提起索赔或行政机关进行调查，您应独立承担全部责任。
|
||||
# | 四、违约与法律责任
|
||||
# | 如发现任何违反本声明的行为，本团队有权：
|
||||
# | 1. 无条件配合公安机关及其他有权机关的调查取证工作；
|
||||
# | 2. 依法追究相关方的民事责任，并要求赔偿全部损失；
|
||||
# | 3. 保留进一步采取刑事控告等法律措施的权利。
|
||||
# | 五、许可范围说明
|
||||
# | 1、被授权方应视本产品源代码为核心机密信息，负有最高标准的保密与保管义务。禁止以任何形式（包
|
||||
# | 括但不限于直接或间接的分享、复制、传播、分发、转售、出租、开源、反向工程、反编译、反汇编或通
|
||||
# | 过网络服务提供给任何第三方）泄露、披露或处置源代码的全部或部分内容。任何未经授权的复制、使用、
|
||||
# | 传播行为均构成对本团队知识产权的严重侵权，本团队有权依法追究其全部法律责任，并要求赔偿因此造
|
||||
# | 成的一切经济损失及商誉损害。
|
||||
# | 2、本产品仅限于公司或个人在法律允许范围内，用于内部且合规的软件产品研发。具体权利义务以《软件
|
||||
# | 许可协议》附件为准。
|
||||
# +======================================================================
|
||||
|
||||
from datetime import datetime, timezone
|
||||
|
||||
from fastapi.logger import logger
|
||||
from sqlalchemy import and_
|
||||
|
||||
|
||||
from apps.constants.constants import CITY_LEVEL_LIST
|
||||
from apps.forms.city import CityForm
|
||||
from apps.models.city import City
|
||||
from extensions import get_db_session
|
||||
from utils import R
|
||||
from utils.security import get_user_id
|
||||
from utils.request import like_contains
|
||||
|
||||
|
||||
# 查询城市数据
|
||||
|
||||
def get_city_page(request):
|
||||
db = get_db_session()
|
||||
# 实例化查询对象
|
||||
query = db.query(City).filter(City.is_delete == 0)
|
||||
# 上级ID
|
||||
pid = request.query_params.get('pid', 0)
|
||||
query = query.filter(City.pid == pid)
|
||||
# 城市名称
|
||||
name = request.query_params.get('name')
|
||||
if name:
|
||||
# 城市名称模糊查询
|
||||
query = query.filter(City.name.like(like_contains(name), escape='\\'))
|
||||
# 查询数据
|
||||
city_list = query.order_by(City.id.asc()).all()
|
||||
# 实例化数组对象
|
||||
result = []
|
||||
# 遍历数据源
|
||||
if city_list:
|
||||
for item in city_list:
|
||||
# 对象转字典
|
||||
data = item.to_dict()
|
||||
# 城市级别
|
||||
data['level_name'] = CITY_LEVEL_LIST.get(item.level)
|
||||
# 是否有子级
|
||||
data['haveChild'] = True if item.level < 3 else False,
|
||||
# 加入列表
|
||||
result.append(data)
|
||||
# 返回结果
|
||||
return R.ok(data=result)
|
||||
# 根据城市ID获取详情
|
||||
|
||||
def get_city_detail(city_id):
|
||||
db = get_db_session()
|
||||
# 根据ID查询城市
|
||||
city = db.query(City).filter(and_(City.id == city_id, City.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not city:
|
||||
return None
|
||||
# 对象转字典
|
||||
data = city.to_dict()
|
||||
# 返回结果
|
||||
return data
|
||||
# 添加城市
|
||||
|
||||
def add_city(request, data: CityForm):
|
||||
db = get_db_session()
|
||||
# 表单数据赋值给对象
|
||||
city = City(**data.model_dump(exclude={'id'}))
|
||||
city.create_user = get_user_id(request)
|
||||
# 插入数据
|
||||
city.save()
|
||||
# 返回结果
|
||||
return R.ok(msg="添加成功")
|
||||
|
||||
|
||||
# 更新城市
|
||||
|
||||
def update_city(request, data: CityForm):
|
||||
db = get_db_session()
|
||||
# 记录ID判空
|
||||
if not data.id or data.id <= 0:
|
||||
return R.failed("记录ID不能为空")
|
||||
|
||||
# 根据ID查询记录
|
||||
city = db.query(City).filter(and_(City.id == data.id, City.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not city:
|
||||
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(City).filter_by(id=data.id).update(updData)
|
||||
# 提交数据
|
||||
if not result:
|
||||
return R.failed("更新失败")
|
||||
# 返回结果
|
||||
return R.ok(msg="更新成功")
|
||||
# 删除城市
|
||||
|
||||
def delete_city(city_id):
|
||||
return City.batch_delete_r(city_id)
|
||||
# 根据城市ID获取子级城市
|
||||
|
||||
def get_child_list(city_code):
|
||||
db = get_db_session()
|
||||
# 查询子级城市
|
||||
childList = db.query(City).filter(and_(City.parent_code == city_code, City.is_delete == 0)).all()
|
||||
# 实例化子级城市对象
|
||||
city_list = []
|
||||
# 遍历数据源
|
||||
if childList:
|
||||
for v in childList:
|
||||
item = {
|
||||
'area_code': v.area_code,
|
||||
'name': v.name
|
||||
}
|
||||
# 加入列表
|
||||
city_list.append(item)
|
||||
# 返回结果
|
||||
return city_list
|
||||
# 兼容垫片：由 modules.region.service 迁移
|
||||
from modules.region.service import * # noqa: F401,F403
|
||||
|
||||
+2
-229
@@ -1,229 +1,2 @@
|
||||
import asyncio
|
||||
from datetime import datetime, timezone
|
||||
|
||||
from fastapi.logger import logger
|
||||
from sqlalchemy import and_
|
||||
|
||||
|
||||
from apps.constants.message import PAGE_SIZE
|
||||
from apps.forms.config import ConfigForm
|
||||
from apps.models.config import Config
|
||||
from apps.models.config_item import ConfigItem
|
||||
from config import FASTAPI_IMAGE_URL
|
||||
from extensions import get_db_session
|
||||
from utils import R
|
||||
from utils.rich_text import get_file_url, save_file
|
||||
from utils.request import like_contains
|
||||
from utils.security import get_user_id
|
||||
|
||||
|
||||
# 配置表单验证
|
||||
|
||||
def get_config_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(Config).filter(Config.is_delete == 0)
|
||||
# 配置名称
|
||||
name = request.query_params.get('name')
|
||||
if name:
|
||||
query = query.filter(Config.name.like(like_contains(name), escape='\\'))
|
||||
# 排序
|
||||
query = query.order_by(Config.sort.asc())
|
||||
# 记录总数
|
||||
count = query.count()
|
||||
# 分页查询
|
||||
config_list = query.limit(limit).offset((page - 1) * limit).all()
|
||||
# 若当前页超出末页（数据被并发删除），自动回退到第一页
|
||||
if page > 1 and not config_list:
|
||||
page = 1
|
||||
count = query.count()
|
||||
config_list = query.limit(limit).offset(0).all()
|
||||
# 实例化结果
|
||||
result = []
|
||||
# 遍历数据源
|
||||
if len(config_list) > 0:
|
||||
for item in config_list:
|
||||
# 对象转字典
|
||||
data = item.to_dict()
|
||||
# 加入列表
|
||||
result.append(data)
|
||||
# 返回结果
|
||||
return R.ok(data=result, count=count)
|
||||
# 根据ID获取配置详情
|
||||
|
||||
def get_config_detail(config_id):
|
||||
db = get_db_session()
|
||||
# 根据ID查询配置
|
||||
config = db.query(Config).filter(and_(Config.id == config_id, Config.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not config:
|
||||
return None
|
||||
# 对象转字典
|
||||
data = config.to_dict()
|
||||
# 返回结果
|
||||
return data
|
||||
# 添加配置
|
||||
|
||||
def add_config(request, data: ConfigForm):
|
||||
db = get_db_session()
|
||||
# 唯一性校验
|
||||
if db.query(Config).filter(and_(Config.name == data.name, Config.is_delete == 0)).first():
|
||||
return R.failed("配置名称不能重复")
|
||||
# 表单数据赋值给对象
|
||||
config = Config(**data.model_dump(exclude={'id'}))
|
||||
config.create_user = get_user_id(request)
|
||||
# 插入数据
|
||||
config.save()
|
||||
# 返回结果
|
||||
return R.ok(msg="添加成功")
|
||||
|
||||
|
||||
# 更新配置
|
||||
|
||||
def update_config(request, data: ConfigForm):
|
||||
db = get_db_session()
|
||||
# 记录ID判空
|
||||
if not data.id or data.id <= 0:
|
||||
return R.failed("记录ID不能为空")
|
||||
# 唯一性校验（排除自身）
|
||||
if db.query(Config).filter(and_(Config.name == data.name, Config.id != data.id, Config.is_delete == 0)).first():
|
||||
return R.failed("配置名称不能重复")
|
||||
|
||||
# 根据ID查询记录
|
||||
config = db.query(Config).filter(and_(Config.id == data.id, Config.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not config:
|
||||
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(Config).filter_by(id=data.id).update(updData)
|
||||
# 提交数据
|
||||
if not result:
|
||||
return R.failed("更新失败")
|
||||
# 返回结果
|
||||
return R.ok(msg="更新成功")
|
||||
# 删除配置
|
||||
|
||||
def delete_config(config_id):
|
||||
return Config.batch_delete_r(config_id)
|
||||
|
||||
|
||||
# 解析配置项选项字符串为字典
|
||||
def _parse_options(options_str):
|
||||
"""将 'k1=v1,k2=v2' 格式的选项字符串解析为字典"""
|
||||
if not options_str:
|
||||
return {}
|
||||
result = {}
|
||||
for part in options_str.split(','):
|
||||
parts = part.split('=', 1)
|
||||
if len(parts) == 2:
|
||||
result[parts[0]] = parts[1]
|
||||
return result
|
||||
|
||||
|
||||
# 获取网站配置信息
|
||||
def get_config_info(request):
|
||||
db = get_db_session()
|
||||
# 一次性查询所有配置组
|
||||
configList = db.query(Config).filter(Config.is_delete == 0).order_by(Config.sort.asc()).all()
|
||||
if not configList:
|
||||
return []
|
||||
|
||||
# 一次性查询所有活跃配置项，按config_id分组
|
||||
config_ids = [c.id for c in configList]
|
||||
all_items = db.query(ConfigItem).filter(
|
||||
and_(ConfigItem.is_delete == 0, ConfigItem.status == 1, ConfigItem.config_id.in_(config_ids))
|
||||
).order_by(ConfigItem.sort.asc()).all()
|
||||
|
||||
items_map = {}
|
||||
for item in all_items:
|
||||
items_map.setdefault(item.config_id, []).append(item)
|
||||
|
||||
config_list = []
|
||||
for val in configList:
|
||||
config = {
|
||||
'config_id': val.id,
|
||||
'config_name': val.name
|
||||
}
|
||||
|
||||
data_list = []
|
||||
for v in items_map.get(val.id, []):
|
||||
data = {
|
||||
"id": v.id,
|
||||
"title": v.title,
|
||||
"code": v.code,
|
||||
"value": v.value,
|
||||
"type": v.type,
|
||||
}
|
||||
|
||||
item_type = v.type
|
||||
if item_type == "checkbox":
|
||||
data['optionsList'] = _parse_options(v.options)
|
||||
data["value"] = v.value.split(',') if v.value else []
|
||||
elif item_type in ("radio", "select"):
|
||||
data['optionsList'] = _parse_options(v.options)
|
||||
elif item_type == "image":
|
||||
if v.value:
|
||||
data["value"] = get_file_url(v.value)
|
||||
elif item_type == "images":
|
||||
if v.value:
|
||||
data["value"] = [get_file_url(img) for img in v.value.split(',')]
|
||||
|
||||
data_list.append(data)
|
||||
|
||||
config['data_list'] = data_list
|
||||
config_list.append(config)
|
||||
|
||||
return config_list
|
||||
|
||||
|
||||
# 保存网站配置信息
|
||||
async def save_config_info(request):
|
||||
# 获取请求参数
|
||||
req_data = await request.json()
|
||||
if not req_data or not isinstance(req_data, dict):
|
||||
return R.failed("请求参数异常")
|
||||
|
||||
def _save():
|
||||
db = get_db_session()
|
||||
# 预加载所有活跃配置项，仅允许修改这些项
|
||||
valid_items = db.query(ConfigItem).filter(
|
||||
and_(ConfigItem.is_delete == 0, ConfigItem.status == 1)
|
||||
).all()
|
||||
item_map = {item.code: item for item in valid_items}
|
||||
|
||||
# 数据源处理
|
||||
for key, val in req_data.items():
|
||||
# 仅允许修改已存在的活跃配置项，忽略非法key
|
||||
config_item = item_map.get(key)
|
||||
if not config_item:
|
||||
continue
|
||||
|
||||
# 图片数据
|
||||
item = []
|
||||
if isinstance(val, list):
|
||||
for v in val:
|
||||
if isinstance(v, str) and (v.startswith("http://") or v.startswith("https://")):
|
||||
url = save_file(v, "config")
|
||||
item.append(url)
|
||||
else:
|
||||
item.append(v)
|
||||
val = ','.join(item)
|
||||
else:
|
||||
if isinstance(val, str) and (val.startswith("http://") or val.startswith("https://")):
|
||||
val = save_file(val, "config")
|
||||
|
||||
# 设置
|
||||
config_item.value = val
|
||||
|
||||
# 同步DB操作与网络下载放入线程池，避免阻塞事件循环
|
||||
await asyncio.to_thread(_save)
|
||||
|
||||
# 返回结果
|
||||
return R.ok()
|
||||
# 兼容垫片：由 modules.configuration.service 迁移
|
||||
from modules.configuration.service import * # noqa: F401,F403
|
||||
|
||||
@@ -1,130 +1,2 @@
|
||||
from datetime import datetime, timezone
|
||||
|
||||
from fastapi.logger import logger
|
||||
from sqlalchemy import and_
|
||||
|
||||
from apps.constants.constants import CONFIG_DATA_TYPE_LIST
|
||||
from apps.constants.message import PAGE_SIZE
|
||||
from apps.forms.config_item import ConfigItemForm, ConfigItemStatusForm
|
||||
from apps.models.config_item import ConfigItem
|
||||
from extensions import get_db_session
|
||||
from utils import R
|
||||
from utils.security import get_user_id
|
||||
from utils.request import like_contains
|
||||
|
||||
|
||||
# 查询配置项分页数据
|
||||
|
||||
def get_config_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(ConfigItem).filter(ConfigItem.is_delete == 0)
|
||||
# 配置ID
|
||||
config_id = request.query_params.get('config_id', 0)
|
||||
query = query.filter(ConfigItem.config_id == config_id)
|
||||
# 配置项项名称模糊筛选
|
||||
title = request.query_params.get('title')
|
||||
if title:
|
||||
query = query.filter(ConfigItem.title.like(like_contains(title), escape='\\'))
|
||||
# 排序
|
||||
query = query.order_by(ConfigItem.sort.asc())
|
||||
# 记录总数
|
||||
count = query.count()
|
||||
# 分页查询
|
||||
config_list = query.limit(limit).offset((page - 1) * limit).all()
|
||||
# 若当前页超出末页（数据被并发删除），自动回退到第一页
|
||||
if page > 1 and not config_list:
|
||||
page = 1
|
||||
count = query.count()
|
||||
config_list = query.limit(limit).offset(0).all()
|
||||
# 实例化结果
|
||||
result = []
|
||||
# 遍历数据源
|
||||
if len(config_list) > 0:
|
||||
for item in config_list:
|
||||
# 对象转字典
|
||||
data = item.to_dict()
|
||||
# 配置项类型
|
||||
data['type_name'] = CONFIG_DATA_TYPE_LIST.get(item.type)
|
||||
# 加入列表
|
||||
result.append(data)
|
||||
# 返回结果
|
||||
return R.ok(data=result, count=count)
|
||||
# 根据ID查询配置项详情
|
||||
|
||||
def get_config_item_detail(config_id):
|
||||
db = get_db_session()
|
||||
# 根据ID查询配置项
|
||||
config_data = db.query(ConfigItem).filter(and_(ConfigItem.id == config_id, ConfigItem.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not config_data:
|
||||
return None
|
||||
# 对象转字典
|
||||
data = config_data.to_dict()
|
||||
# 返回结果
|
||||
return data
|
||||
# 添加配置项
|
||||
|
||||
def add_config_item(request, data: ConfigItemForm):
|
||||
db = get_db_session()
|
||||
# 表单数据赋值给对象
|
||||
config_data = ConfigItem(**data.model_dump(exclude={'id'}))
|
||||
config_data.create_user = get_user_id(request)
|
||||
# 插入数据
|
||||
config_data.save()
|
||||
# 返回结果
|
||||
return R.ok(msg="添加成功")
|
||||
|
||||
|
||||
# 更新配置项
|
||||
|
||||
def update_config_item(request, data: ConfigItemForm):
|
||||
db = get_db_session()
|
||||
# 记录ID判空
|
||||
if not data.id or data.id <= 0:
|
||||
return R.failed("记录ID不能为空")
|
||||
|
||||
# 根据ID查询记录
|
||||
config_data = db.query(ConfigItem).filter(and_(ConfigItem.id == data.id, ConfigItem.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not config_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 = db.query(ConfigItem).filter_by(id=data.id).update(updData)
|
||||
# 提交数据
|
||||
if not result:
|
||||
return R.failed("更新失败")
|
||||
# 返回结果
|
||||
return R.ok(msg="更新成功")
|
||||
# 删除配置项
|
||||
|
||||
def delete_config_item(config_id):
|
||||
return ConfigItem.batch_delete_r(config_id)
|
||||
# 设置状态
|
||||
|
||||
def update_config_item_status(request, data: ConfigItemStatusForm):
|
||||
db = get_db_session()
|
||||
# 根据ID查询记录
|
||||
config_data = db.query(ConfigItem).filter(and_(ConfigItem.id == data.id, ConfigItem.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not config_data:
|
||||
return R.failed("记录不存在")
|
||||
|
||||
# 更新记录
|
||||
result = db.query(ConfigItem).filter_by(id=data.id).update({
|
||||
"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="设置成功")
|
||||
# 兼容垫片：由 modules.configuration.service 迁移
|
||||
from modules.configuration.service import * # noqa: F401,F403
|
||||
|
||||
+2
-114
@@ -1,114 +1,2 @@
|
||||
from datetime import datetime, timezone
|
||||
|
||||
from fastapi.logger import logger
|
||||
from sqlalchemy import and_
|
||||
|
||||
from apps.forms.dept import DeptForm
|
||||
from apps.models.dept import Dept
|
||||
from extensions import get_db_session
|
||||
from utils import R
|
||||
|
||||
from utils.security import get_user_id
|
||||
from utils.request import like_contains, parse_id_list
|
||||
|
||||
|
||||
# 查询部门数据
|
||||
|
||||
def get_dept_page(request):
|
||||
db = get_db_session()
|
||||
# 实例化查询对象
|
||||
query = db.query(Dept).filter(Dept.is_delete == 0)
|
||||
# 部门名称
|
||||
name = request.query_params.get('name')
|
||||
if name:
|
||||
# 部门名称模糊查询
|
||||
query = query.filter(Dept.name.like(like_contains(name), escape='\\'))
|
||||
# 查询数据
|
||||
dept_list = query.order_by(Dept.sort.asc()).all()
|
||||
# 实例化数组对象
|
||||
result = []
|
||||
# 遍历数据源
|
||||
if dept_list:
|
||||
for item in dept_list:
|
||||
# 对象转字典
|
||||
data = item.to_dict()
|
||||
# 加入列表
|
||||
result.append(data)
|
||||
# 返回结果
|
||||
return R.ok(data=result)
|
||||
# 根据ID查询部门
|
||||
|
||||
def get_dept_detail(dept_id):
|
||||
db = get_db_session()
|
||||
# 根据ID查询部门
|
||||
dept = db.query(Dept).filter(and_(Dept.id == dept_id, Dept.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not dept:
|
||||
return None
|
||||
# 对象转字典
|
||||
data = dept.to_dict()
|
||||
# 返回结果
|
||||
return data
|
||||
# 添加部门
|
||||
|
||||
def add_dept(request, data: DeptForm):
|
||||
db = get_db_session()
|
||||
# 唯一性校验
|
||||
if db.query(Dept).filter(and_(Dept.name == data.name, Dept.is_delete == 0)).first():
|
||||
return R.failed("部门名称不能重复")
|
||||
# 表单数据赋值给对象
|
||||
dept = Dept(**data.model_dump(exclude={'id'}))
|
||||
dept.create_user = get_user_id(request)
|
||||
# 插入数据
|
||||
dept.save()
|
||||
# 返回结果
|
||||
return R.ok(msg="添加成功")
|
||||
|
||||
|
||||
# 更新部门
|
||||
|
||||
def update_dept(request, data: DeptForm):
|
||||
db = get_db_session()
|
||||
# 记录ID判空
|
||||
if not data.id or data.id <= 0:
|
||||
return R.failed("记录ID不能为空")
|
||||
# 唯一性校验（排除自身）
|
||||
if db.query(Dept).filter(and_(Dept.name == data.name, Dept.id != data.id, Dept.is_delete == 0)).first():
|
||||
return R.failed("部门名称不能重复")
|
||||
|
||||
# 根据ID查询记录
|
||||
dept = db.query(Dept).filter(and_(Dept.id == data.id, Dept.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not dept:
|
||||
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(Dept).filter_by(id=data.id).update(updData)
|
||||
# 提交数据
|
||||
if not result:
|
||||
return R.failed("更新失败")
|
||||
# 返回结果
|
||||
return R.ok(msg="更新成功")
|
||||
# 删除部门
|
||||
|
||||
def delete_dept(dept_id):
|
||||
return Dept.batch_delete_r(dept_id)
|
||||
# 获取部门列表
|
||||
|
||||
def get_dept_list():
|
||||
db = get_db_session()
|
||||
# 查询部门数据列表
|
||||
dept_rows = db.query(Dept).filter(Dept.is_delete == 0).order_by(Dept.sort.asc()).all()
|
||||
# 实例化列表
|
||||
dept_list = []
|
||||
# 遍历数据源
|
||||
if dept_rows:
|
||||
for v in dept_rows:
|
||||
# 对象转字典
|
||||
item = v.to_dict()
|
||||
# 加入数组
|
||||
dept_list.append(item)
|
||||
# 返回结果
|
||||
return dept_list
|
||||
# 兼容垫片：由 modules.system.dept.service 迁移
|
||||
from modules.system.dept.service import * # noqa: F401,F403
|
||||
|
||||
+2
-109
@@ -1,109 +1,2 @@
|
||||
from datetime import datetime, timezone
|
||||
|
||||
from fastapi.logger import logger
|
||||
from sqlalchemy import and_
|
||||
|
||||
from apps.constants.message import PAGE_SIZE
|
||||
from apps.forms.dict import DictForm
|
||||
from apps.models.dict import Dict
|
||||
from extensions import get_db_session
|
||||
from utils import R
|
||||
from utils.security import get_user_id
|
||||
from utils.request import like_contains
|
||||
|
||||
|
||||
# 查询字典分页数据
|
||||
|
||||
def get_dict_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(Dict).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):
|
||||
db = get_db_session()
|
||||
# 根据ID查询字典
|
||||
dict = db.query(Dict).filter(and_(Dict.id == dict_id, Dict.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not dict:
|
||||
return None
|
||||
# 对象转字典
|
||||
data = dict.to_dict()
|
||||
# 返回结果
|
||||
return data
|
||||
# 添加字典
|
||||
|
||||
def add_dict(request, data: DictForm):
|
||||
db = get_db_session()
|
||||
# 唯一性校验
|
||||
if db.query(Dict).filter(and_(Dict.name == data.name, Dict.is_delete == 0)).first():
|
||||
return R.failed("字典名称不能重复")
|
||||
# 表单数据赋值给对象
|
||||
dict = Dict(**data.model_dump(exclude={'id'}))
|
||||
dict.create_user = get_user_id(request)
|
||||
# 插入数据
|
||||
dict.save()
|
||||
# 返回结果
|
||||
return R.ok(msg="添加成功")
|
||||
|
||||
|
||||
# 更新字典
|
||||
|
||||
def update_dict(request, data: DictForm):
|
||||
db = get_db_session()
|
||||
# 记录ID判空
|
||||
if not data.id or data.id <= 0:
|
||||
return R.failed("记录ID不能为空")
|
||||
# 唯一性校验（排除自身）
|
||||
if db.query(Dict).filter(and_(Dict.name == data.name, Dict.id != data.id, Dict.is_delete == 0)).first():
|
||||
return R.failed("字典名称不能重复")
|
||||
|
||||
# 根据ID查询记录
|
||||
dict = db.query(Dict).filter(and_(Dict.id == data.id, Dict.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
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 = db.query(Dict).filter_by(id=data.id).update(updData)
|
||||
# 提交数据
|
||||
if not result:
|
||||
return R.failed("更新失败")
|
||||
# 返回结果
|
||||
return R.ok(msg="更新成功")
|
||||
# 删除字典
|
||||
|
||||
def delete_dict(dict_id):
|
||||
return Dict.batch_delete_r(dict_id)
|
||||
# 兼容垫片：由 modules.dictionary.service 迁移
|
||||
from modules.dictionary.service import * # noqa: F401,F403
|
||||
|
||||
+2
-133
@@ -1,133 +1,2 @@
|
||||
from datetime import datetime, timezone
|
||||
|
||||
from fastapi.logger import logger
|
||||
from sqlalchemy import and_
|
||||
|
||||
from apps.constants.message import PAGE_SIZE
|
||||
from apps.forms.dict_item import DictItemForm, DictItemStatusForm
|
||||
from apps.models.dict_item import DictItem
|
||||
from extensions import get_db_session
|
||||
from utils import R
|
||||
from utils.security import get_user_id
|
||||
from utils.request import like_contains
|
||||
|
||||
|
||||
# 查询字典项分页数据
|
||||
|
||||
def get_dict_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(DictItem).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):
|
||||
db = get_db_session()
|
||||
# 根据ID查询字典项
|
||||
dict_data = db.query(DictItem).filter(and_(DictItem.id == dict_id, DictItem.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not dict_data:
|
||||
return None
|
||||
# 对象转字典
|
||||
data = dict_data.to_dict()
|
||||
# 返回结果
|
||||
return data
|
||||
# 添加字典项
|
||||
|
||||
def add_dict_item(request, data: DictItemForm):
|
||||
db = get_db_session()
|
||||
# 唯一性校验
|
||||
if db.query(DictItem).filter(and_(DictItem.name == data.name, DictItem.is_delete == 0)).first():
|
||||
return R.failed("字典项名称不能重复")
|
||||
# 表单数据赋值给对象
|
||||
dict_data = DictItem(**data.model_dump(exclude={'id'}))
|
||||
dict_data.create_user = get_user_id(request)
|
||||
# 插入数据
|
||||
dict_data.save()
|
||||
# 返回结果
|
||||
return R.ok(msg="添加成功")
|
||||
|
||||
|
||||
# 更新字典项
|
||||
|
||||
def update_dict_item(request, data: DictItemForm):
|
||||
db = get_db_session()
|
||||
# 记录ID判空
|
||||
if not data.id or data.id <= 0:
|
||||
return R.failed("记录ID不能为空")
|
||||
# 唯一性校验（排除自身）
|
||||
if db.query(DictItem).filter(and_(DictItem.name == data.name, DictItem.id != data.id, DictItem.is_delete == 0)).first():
|
||||
return R.failed("字典项名称不能重复")
|
||||
|
||||
# 根据ID查询记录
|
||||
dict_data = db.query(DictItem).filter(and_(DictItem.id == data.id, DictItem.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
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 = db.query(DictItem).filter_by(id=data.id).update(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):
|
||||
db = get_db_session()
|
||||
# 根据ID查询记录
|
||||
dict_data = db.query(DictItem).filter(and_(DictItem.id == data.id, DictItem.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not dict_data:
|
||||
return R.failed("记录不存在")
|
||||
|
||||
# 更新记录
|
||||
result = db.query(DictItem).filter_by(id=data.id).update({
|
||||
"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="设置成功")
|
||||
# 兼容垫片：由 modules.dictionary.service 迁移
|
||||
from modules.dictionary.service import * # noqa: F401,F403
|
||||
|
||||
+2
-154
@@ -1,154 +1,2 @@
|
||||
from datetime import datetime, timezone
|
||||
|
||||
from fastapi.logger import logger
|
||||
from sqlalchemy import and_
|
||||
|
||||
|
||||
from apps.constants.constants import ITEM_TYPE_LIST
|
||||
from apps.constants.message import PAGE_SIZE
|
||||
from apps.forms.item import ItemForm
|
||||
from apps.models.item import Item
|
||||
from extensions import get_db_session
|
||||
from utils import R
|
||||
from utils.rich_text import get_file_url, save_file
|
||||
from utils.request import like_contains
|
||||
from utils.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)
|
||||
# 站点名称
|
||||
name = request.query_params.get('name')
|
||||
if name:
|
||||
query = query.filter(Item.name.like(like_contains(name), escape='\\'))
|
||||
# 站点类型
|
||||
type = request.query_params.get('type')
|
||||
if type:
|
||||
query = query.filter(Item.type == type)
|
||||
# 站点状态筛选
|
||||
status = request.query_params.get('status')
|
||||
if status:
|
||||
query = query.filter(Item.status == status)
|
||||
# 排序
|
||||
query = query.order_by(Item.sort.asc())
|
||||
# 记录总数
|
||||
count = query.count()
|
||||
# 分页查询
|
||||
item_list = query.limit(limit).offset((page - 1) * limit).all()
|
||||
# 若当前页超出末页（数据被并发删除），自动回退到第一页
|
||||
if page > 1 and not item_list:
|
||||
page = 1
|
||||
count = query.count()
|
||||
item_list = query.limit(limit).offset(0).all()
|
||||
# 实例化结果
|
||||
result = []
|
||||
# 遍历数据源
|
||||
if len(item_list) > 0:
|
||||
for item in item_list:
|
||||
# 对象转字典
|
||||
data = item.to_dict()
|
||||
# 站点图片
|
||||
data['image'] = get_file_url(item.image)
|
||||
# 站点类型描述
|
||||
data['type_name'] = ITEM_TYPE_LIST.get(item.type)
|
||||
# 加入列表
|
||||
result.append(data)
|
||||
# 返回结果
|
||||
return R.ok(data=result, count=count)
|
||||
# 根据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()
|
||||
# 查询结果判空
|
||||
if not item:
|
||||
return None
|
||||
# 对象转字典
|
||||
data = item.to_dict()
|
||||
# 站点图片
|
||||
data['image'] = get_file_url(item.image)
|
||||
# 返回结果
|
||||
return data
|
||||
# 添加站点
|
||||
|
||||
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():
|
||||
return R.failed("站点名称不能重复")
|
||||
# 表单数据转字典
|
||||
form_data = data.model_dump(exclude={'id'})
|
||||
# 站点图片
|
||||
image = data.image
|
||||
if image:
|
||||
form_data['image'] = save_file(image, "item")
|
||||
|
||||
# 表单数据赋值给对象
|
||||
item = Item(**form_data)
|
||||
item.create_user = get_user_id(request)
|
||||
# 插入数据
|
||||
item.save()
|
||||
# 返回结果
|
||||
return R.ok(msg="添加成功")
|
||||
|
||||
|
||||
# 更新站点
|
||||
|
||||
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():
|
||||
return R.failed("站点名称不能重复")
|
||||
|
||||
# 根据ID查询记录
|
||||
item = db.query(Item).filter(and_(Item.id == data.id, Item.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not item:
|
||||
return R.failed("记录不存在")
|
||||
|
||||
# 构造更新数据（排除 id）
|
||||
updData = data.model_dump(exclude={'id'})
|
||||
# 站点图片
|
||||
image = data.image
|
||||
if image:
|
||||
updData['image'] = save_file(image, "item")
|
||||
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)
|
||||
# 提交数据
|
||||
if not result:
|
||||
return R.failed("更新失败")
|
||||
# 返回结果
|
||||
return R.ok(msg="更新成功")
|
||||
# 删除站点
|
||||
|
||||
def delete_item(item_id):
|
||||
return Item.batch_delete_r(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_list = []
|
||||
# 遍历数据源
|
||||
for v in item_rows:
|
||||
# 对象转字典
|
||||
item = v.to_dict()
|
||||
# 加入列表
|
||||
item_list.append(item)
|
||||
# 返回结果
|
||||
return item_list
|
||||
# 兼容垫片：由 modules.cms.item.service 迁移
|
||||
from modules.cms.item.service import * # noqa: F401,F403
|
||||
|
||||
+2
-171
@@ -1,171 +1,2 @@
|
||||
from datetime import datetime, timezone
|
||||
|
||||
from fastapi.logger import logger
|
||||
from sqlalchemy import and_
|
||||
|
||||
|
||||
from apps.constants.message import PAGE_SIZE
|
||||
from apps.forms.item_cate import ItemCateForm
|
||||
from apps.models.item_cate import ItemCate
|
||||
from apps.services import item
|
||||
from extensions import get_db_session
|
||||
from utils import R
|
||||
from utils.rich_text import get_file_url, save_file
|
||||
from utils.request import like_contains
|
||||
from utils.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)
|
||||
# 栏目名称
|
||||
name = request.query_params.get('name')
|
||||
if name:
|
||||
query = query.filter(ItemCate.name.like(like_contains(name), escape='\\'))
|
||||
# 栏目状态筛选
|
||||
status = request.query_params.get('status')
|
||||
if status:
|
||||
query = query.filter(ItemCate.status == status)
|
||||
# 排序
|
||||
query = query.order_by(ItemCate.sort.asc())
|
||||
# 记录总数
|
||||
count = query.count()
|
||||
# 分页查询
|
||||
item_cate_list = query.limit(limit).offset((page - 1) * limit).all()
|
||||
# 若当前页超出末页（数据被并发删除），自动回退到第一页
|
||||
if page > 1 and not item_cate_list:
|
||||
page = 1
|
||||
count = query.count()
|
||||
item_cate_list = query.limit(limit).offset(0).all()
|
||||
# 实例化结果
|
||||
result = []
|
||||
# 遍历数据源
|
||||
if len(item_cate_list) > 0:
|
||||
for v in item_cate_list:
|
||||
# 对象转字典
|
||||
data = v.to_dict()
|
||||
# 栏目图片
|
||||
data['cover'] = get_file_url(v.cover) if v.cover else None
|
||||
# 查询站点信息
|
||||
item_info = item.get_item_detail(v.id)
|
||||
if item_info:
|
||||
data['item_name'] = item_info.get('name') if item_info else None
|
||||
# 加入列表
|
||||
result.append(data)
|
||||
# 返回结果
|
||||
return R.ok(data=result, count=count)
|
||||
# 根据栏目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()
|
||||
# 查询结果判空
|
||||
if not cate:
|
||||
return None
|
||||
# 对象转字典
|
||||
data = cate.to_dict()
|
||||
# 栏目图片
|
||||
if cate.cover:
|
||||
data['cover'] = get_file_url(cate.cover)
|
||||
# 返回结果
|
||||
return data
|
||||
# 添加栏目
|
||||
|
||||
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():
|
||||
return R.failed("栏目名称不能重复")
|
||||
# 表单数据转字典
|
||||
form_data = data.model_dump(exclude={'id'})
|
||||
|
||||
# 是否有封面
|
||||
is_cover = data.is_cover
|
||||
if is_cover == 1:
|
||||
# 栏目图片
|
||||
cover = data.cover
|
||||
# 图片处理
|
||||
if cover:
|
||||
form_data['cover'] = save_file(cover, "item_cate")
|
||||
else:
|
||||
form_data['cover'] = None
|
||||
else:
|
||||
form_data['cover'] = None
|
||||
|
||||
# 表单数据赋值给对象
|
||||
cate = ItemCate(**form_data)
|
||||
cate.create_user = get_user_id(request)
|
||||
# 插入数据
|
||||
cate.save()
|
||||
# 返回结果
|
||||
return R.ok(msg="添加成功")
|
||||
|
||||
|
||||
# 更新栏目
|
||||
|
||||
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():
|
||||
return R.failed("栏目名称不能重复")
|
||||
|
||||
# 根据ID查询记录
|
||||
cate = db.query(ItemCate).filter(and_(ItemCate.id == data.id, ItemCate.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not cate:
|
||||
return R.failed("记录不存在")
|
||||
|
||||
# 构造更新数据（排除 id）
|
||||
updData = data.model_dump(exclude={'id'})
|
||||
# 是否有封面
|
||||
is_cover = data.is_cover
|
||||
if is_cover == 1:
|
||||
# 栏目图片
|
||||
cover = data.cover
|
||||
# 图片处理
|
||||
if cover:
|
||||
updData['cover'] = save_file(cover, "item_cate")
|
||||
else:
|
||||
updData['cover'] = None
|
||||
else:
|
||||
updData['cover'] = None
|
||||
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)
|
||||
# 提交数据
|
||||
if not result:
|
||||
return R.failed("更新失败")
|
||||
# 返回结果
|
||||
return R.ok(msg="更新成功")
|
||||
# 删除栏目
|
||||
|
||||
def delete_item_cate(cate_id):
|
||||
return ItemCate.batch_delete_r(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(
|
||||
ItemCate.sort.asc()).all()
|
||||
# 实例化栏目列表
|
||||
cate_list = []
|
||||
# 遍历数据源
|
||||
for v in cate_rows:
|
||||
# 对象转字典
|
||||
item = v.to_dict()
|
||||
# 加入列表
|
||||
cate_list.append(item)
|
||||
# 返回结果
|
||||
return cate_list
|
||||
# 兼容垫片：由 modules.cms.item_cate.service 迁移
|
||||
from modules.cms.item_cate.service import * # noqa: F401,F403
|
||||
|
||||
+2
-259
@@ -1,259 +1,2 @@
|
||||
import logging
|
||||
from datetime import datetime, timezone
|
||||
|
||||
from sqlalchemy import and_
|
||||
|
||||
from apps.constants.constants import JOB_STATUS_LIST, JOB_EXECUTE_POLICY_LIST
|
||||
from apps.constants.message import PAGE_SIZE
|
||||
from apps.forms.job import JobForm, JobStatusForm
|
||||
from apps.models.job import Job
|
||||
from apps.services.scheduler import (
|
||||
add_job_to_scheduler,
|
||||
remove_job_from_scheduler,
|
||||
pause_job_in_scheduler,
|
||||
get_scheduler,
|
||||
run_job_once as scheduler_run_job_once,
|
||||
reload_scheduler,
|
||||
)
|
||||
from extensions import get_db_session
|
||||
from utils import R
|
||||
from utils.security import get_user_id
|
||||
from utils.request import like_contains, parse_id_list
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
# 查询定时任务分页数据
|
||||
|
||||
def get_job_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(Job).filter(Job.is_delete == 0)
|
||||
# 任务名称
|
||||
job_name = request.query_params.get('jobName')
|
||||
if job_name:
|
||||
query = query.filter(Job.job_name.like(like_contains(job_name), escape='\\'))
|
||||
# 任务状态
|
||||
status = request.query_params.get('status')
|
||||
if status:
|
||||
query = query.filter(Job.status == status)
|
||||
# 任务分组
|
||||
job_group = request.query_params.get('jobGroup')
|
||||
if job_group:
|
||||
query = query.filter(Job.job_group == job_group)
|
||||
# 排序
|
||||
query = query.order_by(Job.id.desc())
|
||||
# 记录总数
|
||||
count = query.count()
|
||||
# 分页查询
|
||||
job_list = query.limit(limit).offset((page - 1) * limit).all()
|
||||
# 若当前页超出末页（数据被并发删除），自动回退到第一页
|
||||
if page > 1 and not job_list:
|
||||
page = 1
|
||||
count = query.count()
|
||||
job_list = query.limit(limit).offset(0).all()
|
||||
# 实例化结果
|
||||
scheduler = get_scheduler()
|
||||
result = []
|
||||
if len(job_list) > 0:
|
||||
for item in job_list:
|
||||
data = item.to_dict()
|
||||
data['status_name'] = JOB_STATUS_LIST.get(item.status)
|
||||
data['execute_policy_name'] = JOB_EXECUTE_POLICY_LIST.get(item.execute_policy)
|
||||
data['next_run_time'] = _get_next_run_time(scheduler, item.id)
|
||||
result.append(data)
|
||||
return R.ok(data=result, count=count)
|
||||
|
||||
|
||||
def _get_next_run_time(scheduler, job_id):
|
||||
"""从调度器获取任务下次执行时间"""
|
||||
try:
|
||||
scheduler_job = scheduler.get_job(f"job_{job_id}")
|
||||
if scheduler_job and scheduler_job.next_run_time:
|
||||
return scheduler_job.next_run_time.strftime('%Y-%m-%d %H:%M:%S')
|
||||
except Exception:
|
||||
pass
|
||||
return None
|
||||
|
||||
|
||||
# 根据ID查询任务详情
|
||||
|
||||
def get_job_detail(job_id):
|
||||
db = get_db_session()
|
||||
job = db.query(Job).filter(and_(Job.id == job_id, Job.is_delete == 0)).first()
|
||||
if not job:
|
||||
return None
|
||||
data = job.to_dict()
|
||||
data['status_name'] = JOB_STATUS_LIST.get(job.status)
|
||||
data['execute_policy_name'] = JOB_EXECUTE_POLICY_LIST.get(job.execute_policy)
|
||||
return data
|
||||
|
||||
|
||||
# 添加定时任务
|
||||
|
||||
def add_job(request, data: JobForm):
|
||||
db = get_db_session()
|
||||
# 表单数据赋值给对象
|
||||
job = Job(**data.model_dump(exclude={'id'}))
|
||||
job.create_user = get_user_id(request)
|
||||
# 插入数据
|
||||
job.save()
|
||||
|
||||
# 状态为运行中且有Cron表达式，添加到调度器
|
||||
if job.status == 1 and job.cron_expression:
|
||||
add_job_to_scheduler(job.to_dict())
|
||||
|
||||
return R.ok(msg="添加成功")
|
||||
|
||||
|
||||
# 更新定时任务
|
||||
|
||||
def update_job(request, data: JobForm):
|
||||
db = get_db_session()
|
||||
# 记录ID判空
|
||||
if not data.id or data.id <= 0:
|
||||
return R.failed("记录ID不能为空")
|
||||
|
||||
# 根据ID查询记录
|
||||
job = db.query(Job).filter(and_(Job.id == data.id, Job.is_delete == 0)).first()
|
||||
if not job:
|
||||
return R.failed("任务不存在")
|
||||
|
||||
old_status = job.status
|
||||
old_cron = job.cron_expression
|
||||
|
||||
# 构造更新数据（排除 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(Job).filter_by(id=data.id).update(updData)
|
||||
if not result:
|
||||
return R.failed("更新失败")
|
||||
|
||||
# 处理调度器更新
|
||||
_handle_scheduler_update(data.model_dump(), old_status, old_cron)
|
||||
|
||||
return R.ok(msg="更新成功")
|
||||
|
||||
|
||||
def _handle_scheduler_update(job_data, old_status, old_cron):
|
||||
"""处理调度器更新（job_data 为完整任务数据，含 execute_policy/params）"""
|
||||
job_id = job_data.get('id')
|
||||
new_status = job_data.get('status')
|
||||
new_cron = job_data.get('cron_expression')
|
||||
if old_status != 1 and new_status == 1 and new_cron:
|
||||
add_job_to_scheduler(job_data)
|
||||
elif old_status == 1 and new_status != 1:
|
||||
remove_job_from_scheduler(job_id)
|
||||
elif new_status == 1 and old_cron != new_cron:
|
||||
if new_cron:
|
||||
add_job_to_scheduler(job_data)
|
||||
else:
|
||||
remove_job_from_scheduler(job_id)
|
||||
|
||||
|
||||
# 删除定时任务
|
||||
|
||||
def delete_job(job_id):
|
||||
# 从调度器移除
|
||||
id_list = parse_id_list(job_id)
|
||||
for jid in id_list:
|
||||
remove_job_from_scheduler(jid)
|
||||
return Job.batch_delete_r(job_id)
|
||||
|
||||
|
||||
# 设置任务状态
|
||||
|
||||
def update_job_status(request, data: JobStatusForm):
|
||||
db = get_db_session()
|
||||
# 根据ID查询记录
|
||||
job = db.query(Job).filter(and_(Job.id == data.id, Job.is_delete == 0)).first()
|
||||
if not job:
|
||||
return R.failed("任务不存在")
|
||||
|
||||
old_status = job.status
|
||||
|
||||
# 更新记录
|
||||
result = db.query(Job).filter_by(id=data.id).update({
|
||||
"status": data.status,
|
||||
"update_user": get_user_id(request),
|
||||
"update_time": datetime.now(tz=timezone.utc)
|
||||
})
|
||||
if not result:
|
||||
return R.failed("设置失败")
|
||||
|
||||
# 处理调度器
|
||||
if data.status == 1 and job.cron_expression:
|
||||
job_dict = job.to_dict()
|
||||
job_dict['status'] = data.status
|
||||
add_job_to_scheduler(job_dict)
|
||||
elif data.status == 2:
|
||||
pause_job_in_scheduler(data.id)
|
||||
elif old_status == 1 and data.status != 1:
|
||||
remove_job_from_scheduler(data.id)
|
||||
|
||||
return R.ok(msg="设置成功")
|
||||
|
||||
|
||||
# 暂停任务
|
||||
|
||||
def pause_job_by_id(job_id):
|
||||
db = get_db_session()
|
||||
job = db.query(Job).filter(and_(Job.id == job_id, Job.is_delete == 0)).first()
|
||||
if not job:
|
||||
return R.failed("任务不存在")
|
||||
|
||||
if job.status == 2:
|
||||
return R.ok(msg="任务已处于暂停状态")
|
||||
|
||||
job.status = 2
|
||||
job.update_user = job.create_user
|
||||
job.update_time = datetime.now(tz=timezone.utc)
|
||||
db.commit()
|
||||
pause_job_in_scheduler(job_id)
|
||||
|
||||
return R.ok(msg="暂停成功")
|
||||
|
||||
|
||||
# 恢复任务
|
||||
|
||||
def resume_job_by_id(job_id):
|
||||
db = get_db_session()
|
||||
job = db.query(Job).filter(and_(Job.id == job_id, Job.is_delete == 0)).first()
|
||||
if not job:
|
||||
return R.failed("任务不存在")
|
||||
|
||||
if job.status == 1:
|
||||
return R.ok(msg="任务已处于运行中状态")
|
||||
|
||||
if not job.cron_expression:
|
||||
return R.failed("Cron表达式为空，无法恢复")
|
||||
|
||||
job.status = 1
|
||||
job.update_user = job.create_user
|
||||
job.update_time = datetime.now(tz=timezone.utc)
|
||||
db.commit()
|
||||
add_job_to_scheduler(job.to_dict())
|
||||
|
||||
return R.ok(msg="恢复成功")
|
||||
|
||||
|
||||
# 立即执行一次
|
||||
|
||||
def run_job_once_api(job_id):
|
||||
result = scheduler_run_job_once(job_id)
|
||||
if result.get('success'):
|
||||
return R.ok(data=result, msg="执行成功")
|
||||
else:
|
||||
return R.failed(msg=result.get('error', '执行失败'))
|
||||
|
||||
|
||||
# 重新加载调度器
|
||||
|
||||
def reload_all_jobs():
|
||||
count = reload_scheduler()
|
||||
return R.ok(data=count, msg=f"已重新加载 {count} 个任务")
|
||||
# 兼容垫片：由 modules.job.service 迁移
|
||||
from modules.job.service import * # noqa: F401,F403
|
||||
|
||||
+2
-121
@@ -1,121 +1,2 @@
|
||||
import logging
|
||||
|
||||
from sqlalchemy import and_
|
||||
|
||||
from apps.constants.constants import JOB_LOG_STATUS_LIST
|
||||
from apps.constants.message import PAGE_SIZE
|
||||
from apps.models.job import Job
|
||||
from apps.models.job_log import JobLog
|
||||
from extensions import get_db_session
|
||||
from extensions.sqlalchemy import SessionLocal
|
||||
from utils import R
|
||||
from utils.request import like_contains, parse_id_list
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
# ============================================================
|
||||
# 日志写入（供调度器调用，可在请求上下文外执行）
|
||||
# ============================================================
|
||||
|
||||
def record_job_log(job_id, start_time, end_time, status, exception_info=None, job_message=None):
|
||||
"""
|
||||
记录任务执行日志
|
||||
|
||||
使用独立会话写入，调度器线程等无请求上下文场景也可调用。
|
||||
"""
|
||||
session = SessionLocal()
|
||||
try:
|
||||
job = session.query(Job).filter(Job.id == job_id, Job.is_delete == 0).first()
|
||||
consume_time = 0
|
||||
if end_time and start_time:
|
||||
consume_time = int((end_time - start_time).total_seconds() * 1000)
|
||||
log = JobLog(
|
||||
job_id=job_id,
|
||||
job_name=job.job_name if job else '',
|
||||
job_group=job.job_group if job else None,
|
||||
job_trigger=job.job_trigger if job else None,
|
||||
cron_expression=job.cron_expression if job else None,
|
||||
job_message=job_message,
|
||||
status=status,
|
||||
start_time=start_time,
|
||||
end_time=end_time,
|
||||
consume_time=consume_time,
|
||||
exception_info=exception_info,
|
||||
)
|
||||
session.add(log)
|
||||
session.commit()
|
||||
return log
|
||||
except Exception as e:
|
||||
session.rollback()
|
||||
logger.error(f"记录任务执行日志异常: {str(e)}")
|
||||
return None
|
||||
finally:
|
||||
session.close()
|
||||
|
||||
|
||||
# ============================================================
|
||||
# 日志查询/删除
|
||||
# ============================================================
|
||||
|
||||
def get_job_log_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(JobLog).filter(JobLog.del_flag == 0)
|
||||
# 任务名称
|
||||
job_name = request.query_params.get('jobName')
|
||||
if job_name:
|
||||
query = query.filter(JobLog.job_name.like(like_contains(job_name), escape='\\'))
|
||||
# 任务分组
|
||||
job_group = request.query_params.get('jobGroup')
|
||||
if job_group:
|
||||
query = query.filter(JobLog.job_group == job_group)
|
||||
# 执行状态
|
||||
status = request.query_params.get('status')
|
||||
if status:
|
||||
query = query.filter(JobLog.status == status)
|
||||
# 排序
|
||||
query = query.order_by(JobLog.id.desc())
|
||||
# 记录总数
|
||||
count = query.count()
|
||||
# 分页查询
|
||||
log_list = query.limit(limit).offset((page - 1) * limit).all()
|
||||
# 若当前页超出末页（数据被并发删除），自动回退到第一页
|
||||
if page > 1 and not log_list:
|
||||
page = 1
|
||||
count = query.count()
|
||||
log_list = query.limit(limit).offset(0).all()
|
||||
# 实例化结果
|
||||
result = []
|
||||
for item in log_list:
|
||||
data = item.to_dict()
|
||||
data['status_name'] = JOB_LOG_STATUS_LIST.get(item.status)
|
||||
result.append(data)
|
||||
return R.ok(data=result, count=count)
|
||||
|
||||
|
||||
# 根据ID查询日志详情
|
||||
def get_job_log_detail(job_log_id):
|
||||
db = get_db_session()
|
||||
log = db.query(JobLog).filter(and_(JobLog.id == job_log_id, JobLog.del_flag == 0)).first()
|
||||
if not log:
|
||||
return None
|
||||
data = log.to_dict()
|
||||
data['status_name'] = JOB_LOG_STATUS_LIST.get(log.status)
|
||||
return data
|
||||
|
||||
|
||||
# 删除任务日志（软删除）
|
||||
def delete_job_log(ids_str):
|
||||
id_list = parse_id_list(ids_str)
|
||||
if not id_list:
|
||||
return R.failed("记录ID不存在")
|
||||
db = get_db_session()
|
||||
result = db.query(JobLog).filter(JobLog.id.in_(id_list), JobLog.del_flag == 0).update(
|
||||
{"del_flag": 1}, synchronize_session=False
|
||||
)
|
||||
return R.ok(msg="本次共删除{0}条数据".format(result))
|
||||
# 兼容垫片：由 modules.job.service 迁移
|
||||
from modules.job.service import * # noqa: F401,F403
|
||||
|
||||
+2
-309
@@ -1,309 +1,2 @@
|
||||
# +======================================================================
|
||||
# | DjangoAdmin 企业数字化开发平台 [ 赋能开发者，助力企业发展 ]
|
||||
# +----------------------------------------------------------------------
|
||||
# | Copyright (c) 2021-2026 一米阳光团队 版权所有
|
||||
# +----------------------------------------------------------------------
|
||||
# | 开源协议: Apache-2.0
|
||||
# | 重要声明: 未经书面许可，不得移除或修改本框架相关版权标识。
|
||||
# +----------------------------------------------------------------------
|
||||
# | 官方网站: https://www.djangoadmin.cn
|
||||
# +----------------------------------------------------------------------
|
||||
# | 研发团队: 一米阳光团队 荣誉出品
|
||||
# +======================================================================
|
||||
# | 版权和免责声明:
|
||||
# | 一、知识产权声明
|
||||
# | 本团队对该软件框架产品（以下简称"本产品"）拥有完整知识产权，包括但不限于商标权、专利权、
|
||||
# | 著作权、商业秘密等。前述权利均受中华人民共和国及相关国际法律法规保护。未经本团队书面授权，
|
||||
# | 任何个人或单位不得基于本产品本身申请任何形式的知识产权。
|
||||
# | 二、使用限制与禁止条款
|
||||
# | 您理解并同意，禁止将本产品用于以下任何行为：
|
||||
# | 1. 任何违反中华人民共和国法律法规的用途；
|
||||
# | 2. 任何侵害他人合法权益（包括但不限于人身权、财产权、知识产权等）的行为；
|
||||
# | 3. 任何危害国家安全、公共利益及社会道德风尚的行为。
|
||||
# | 三、责任豁免
|
||||
# | 因使用本产品而产生的任何损失或法律纠纷（包括但不限于直接损失、间接损失、附带损失、衍生损失
|
||||
# | 以及因违约、侵权等引发的责任），本团队均不承担任何法律责任。若因违规使用本产品导致任何第三
|
||||
# | 方提起索赔或行政机关进行调查，您应独立承担全部责任。
|
||||
# | 四、违约与法律责任
|
||||
# | 如发现任何违反本声明的行为，本团队有权：
|
||||
# | 1. 无条件配合公安机关及其他有权机关的调查取证工作；
|
||||
# | 2. 依法追究相关方的民事责任，并要求赔偿全部损失；
|
||||
# | 3. 保留进一步采取刑事控告等法律措施的权利。
|
||||
# | 五、许可范围说明
|
||||
# | 1、被授权方应视本产品源代码为核心机密信息，负有最高标准的保密与保管义务。禁止以任何形式（包
|
||||
# | 括但不限于直接或间接的分享、复制、传播、分发、转售、出租、开源、反向工程、反编译、反汇编或通
|
||||
# | 过网络服务提供给任何第三方）泄露、披露或处置源代码的全部或部分内容。任何未经授权的复制、使用、
|
||||
# | 传播行为均构成对本团队知识产权的严重侵权，本团队有权依法追究其全部法律责任，并要求赔偿因此造
|
||||
# | 成的一切经济损失及商誉损害。
|
||||
# | 2、本产品仅限于公司或个人在法律允许范围内，用于内部且合规的软件产品研发。具体权利义务以《软件
|
||||
# | 许可协议》附件为准。
|
||||
# +======================================================================
|
||||
import asyncio
|
||||
import os
|
||||
import random
|
||||
import time
|
||||
from datetime import datetime, timezone
|
||||
|
||||
from fastapi.logger import logger
|
||||
from openpyxl.reader.excel import load_workbook
|
||||
from openpyxl.workbook import Workbook
|
||||
from sqlalchemy import and_
|
||||
|
||||
|
||||
from apps.constants.message import PAGE_SIZE
|
||||
from apps.forms.level import LevelForm, LevelStatusForm
|
||||
from apps.models.level import Level
|
||||
from apps.services import upload
|
||||
from config import FASTAPI_TEMP_PATH, FASTAPI_UPLOAD_DIR, FASTAPI_IMAGE_URL
|
||||
from extensions import get_db_session
|
||||
from utils import R
|
||||
from utils.file import mkdir
|
||||
|
||||
from utils.security import get_user_id
|
||||
from utils.request import like_contains
|
||||
|
||||
|
||||
# 查询职级分页数据
|
||||
|
||||
def get_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(Level).filter(Level.is_delete == 0)
|
||||
# 职级名称
|
||||
name = request.query_params.get('name')
|
||||
if name:
|
||||
query = query.filter(Level.name.like(like_contains(name), escape='\\'))
|
||||
# 职级状态
|
||||
status = request.query_params.get('status')
|
||||
if status:
|
||||
query = query.filter(Level.status == status)
|
||||
# 排序
|
||||
query = query.order_by(Level.sort.asc())
|
||||
# 记录总数
|
||||
count = query.count()
|
||||
# 分页查询
|
||||
level_list = query.limit(limit).offset((page - 1) * limit).all()
|
||||
# 若当前页超出末页（数据被并发删除），自动回退到第一页
|
||||
if page > 1 and not level_list:
|
||||
page = 1
|
||||
count = query.count()
|
||||
level_list = query.limit(limit).offset(0).all()
|
||||
# 遍历数据源
|
||||
result = []
|
||||
if len(level_list) > 0:
|
||||
for item in level_list:
|
||||
# 对象转字典
|
||||
data = item.to_dict()
|
||||
# 加入列表
|
||||
result.append(data)
|
||||
# 返回结果
|
||||
return R.ok(data=result, count=count)
|
||||
# 根据ID查询职级详情
|
||||
|
||||
def get_level_detail(level_id):
|
||||
db = get_db_session()
|
||||
# 根据ID查询职级
|
||||
level = db.query(Level).filter(and_(Level.id == level_id, Level.is_delete == 0)).first()
|
||||
# 查询结果为空判断
|
||||
if not level:
|
||||
return None
|
||||
# 对象转字典
|
||||
data = level.to_dict()
|
||||
# 返回结果
|
||||
return data
|
||||
# 添加职级
|
||||
|
||||
def add_level(request, data: LevelForm):
|
||||
db = get_db_session()
|
||||
# 唯一性校验
|
||||
if db.query(Level).filter(and_(Level.name == data.name, Level.is_delete == 0)).first():
|
||||
return R.failed("职级名称不能重复")
|
||||
# 表单数据赋值给对象
|
||||
level = Level(**data.model_dump(exclude={'id'}))
|
||||
level.create_user = get_user_id(request)
|
||||
# 插入数据
|
||||
level.save()
|
||||
# 返回结果
|
||||
return R.ok(msg="添加成功")
|
||||
|
||||
|
||||
# 更新职级
|
||||
|
||||
def update_level(request, data: LevelForm):
|
||||
db = get_db_session()
|
||||
# 记录ID判空
|
||||
if not data.id or data.id <= 0:
|
||||
return R.failed("记录ID不能为空")
|
||||
# 唯一性校验（排除自身）
|
||||
if db.query(Level).filter(and_(Level.name == data.name, Level.id != data.id, Level.is_delete == 0)).first():
|
||||
return R.failed("职级名称不能重复")
|
||||
|
||||
# 根据ID查询记录
|
||||
level = db.query(Level).filter(and_(Level.id == data.id, Level.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not level:
|
||||
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(Level).filter_by(id=data.id).update(updData)
|
||||
# 提交数据
|
||||
if not result:
|
||||
return R.failed("更新失败")
|
||||
# 返回结果
|
||||
return R.ok(msg="更新成功")
|
||||
# 删除职级
|
||||
|
||||
def delete_level(level_id):
|
||||
return Level.batch_delete_r(level_id)
|
||||
# 设置状态
|
||||
|
||||
def update_level_status(request, data: LevelStatusForm):
|
||||
db = get_db_session()
|
||||
# 根据ID查询记录
|
||||
level = db.query(Level).filter(and_(Level.id == data.id, Level.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not level:
|
||||
return R.failed("记录不存在")
|
||||
|
||||
# 更新记录
|
||||
result = db.query(Level).filter_by(id=data.id).update({
|
||||
"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="设置成功")
|
||||
# 导入Excel
|
||||
|
||||
async def import_level(request, file):
|
||||
# 读取上传的文件
|
||||
result = await upload.upload_file(file, ".xls|.xlsx")
|
||||
if result.get('code') != 0:
|
||||
return result
|
||||
# 本地文件地址
|
||||
relative_path = result['data']['filePath']
|
||||
path = FASTAPI_UPLOAD_DIR + relative_path
|
||||
|
||||
def _import():
|
||||
try:
|
||||
# 打开工作簿
|
||||
wb = load_workbook(path)
|
||||
# 获取表单
|
||||
ws = wb.worksheets[0]
|
||||
# 读取最大行
|
||||
max_row = ws.max_row
|
||||
# 计数器
|
||||
count = 0
|
||||
# 遍历读取数据源
|
||||
for item in range(2, max_row + 1):
|
||||
# 职级名称
|
||||
name = ws.cell(item, 2).value
|
||||
# 职级排序
|
||||
sort = ws.cell(item, 3).value
|
||||
# 职级状态
|
||||
status = ws.cell(item, 4).value
|
||||
# 创建数据
|
||||
level = Level(
|
||||
name=name,
|
||||
status=1 if status == "正常" else 2,
|
||||
sort=sort,
|
||||
)
|
||||
level.create_user = get_user_id(request)
|
||||
level.save()
|
||||
|
||||
count += 1
|
||||
# 关闭工作簿
|
||||
wb.close()
|
||||
return count
|
||||
finally:
|
||||
# 清理临时文件
|
||||
if os.path.exists(path):
|
||||
os.remove(path)
|
||||
|
||||
# Excel解析与同步DB写入放入线程池，避免阻塞事件循环
|
||||
count = await asyncio.to_thread(_import)
|
||||
# 返回结果
|
||||
return R.ok(msg="本次共导入【{}】条数据".format(count))
|
||||
|
||||
|
||||
# 导出Excel
|
||||
|
||||
def export_level(request):
|
||||
db = get_db_session()
|
||||
# 查询数据
|
||||
query = db.query(Level).filter(Level.is_delete == 0)
|
||||
# 职级名称
|
||||
name = request.query_params.get('name')
|
||||
if name:
|
||||
query = query.filter(Level.name.like(like_contains(name), escape='\\'))
|
||||
# 职级状态
|
||||
status = request.query_params.get('status')
|
||||
if status:
|
||||
query = query.filter(Level.status == status)
|
||||
# 排序
|
||||
query = query.order_by(Level.sort.asc())
|
||||
# 导出数量限制，防止数据量过大导致内存溢出
|
||||
EXPORT_MAX_ROWS = 10000
|
||||
BATCH_SIZE = 500
|
||||
|
||||
# 实例化工作薄
|
||||
wb = Workbook()
|
||||
# 指定第一个sheet
|
||||
ws = wb.worksheets[0]
|
||||
# 添加表头
|
||||
ws.append(['职级ID', '职级名称', '职级排序', '职级状态', '创建时间', '更新时间'])
|
||||
|
||||
# yield_per 分批加载，边查边写，避免双倍内存占用
|
||||
for item in query.limit(EXPORT_MAX_ROWS).yield_per(BATCH_SIZE):
|
||||
ws.append([
|
||||
item.id, item.name, item.sort,
|
||||
"正常" if item.status == 1 else "禁用",
|
||||
item.create_time.strftime('%Y-%m-%d %H:%M:%S') if item.create_time else None,
|
||||
item.update_time.strftime('%Y-%m-%d %H:%M:%S') if item.update_time else None,
|
||||
])
|
||||
db.expunge(item)
|
||||
|
||||
# 保存文件
|
||||
save_path = FASTAPI_TEMP_PATH + "/" + time.strftime('%Y%m%d')
|
||||
# 创建存放目录
|
||||
mkdir(save_path)
|
||||
# 定义文件名，年月日时分秒随机数
|
||||
file_name = time.strftime('%Y%m%d%H%M%S') + '%05d' % random.randint(0, 99999)
|
||||
# 重写合成文件名
|
||||
file_name = os.path.join(file_name + ".xlsx")
|
||||
# 拼接文件路径
|
||||
path = save_path + "/" + file_name
|
||||
# 写入文件
|
||||
wb.save(r'' + path + '')
|
||||
# 文件访问地址
|
||||
file_url = FASTAPI_IMAGE_URL + path.replace(FASTAPI_UPLOAD_DIR, "")
|
||||
# 返回结果
|
||||
return R.ok(data=file_url)
|
||||
|
||||
|
||||
# 获取职级数据列表
|
||||
|
||||
def get_level_list():
|
||||
db = get_db_session()
|
||||
# 查询职级数据列表
|
||||
level_rows = db.query(Level).filter(and_(Level.is_delete == 0, Level.status == 1)).order_by(Level.sort.asc()).all()
|
||||
# 实例化列表
|
||||
level_list = []
|
||||
# 遍历数据源
|
||||
if level_rows:
|
||||
for v in level_rows:
|
||||
# 对象转字典
|
||||
item = v.to_dict()
|
||||
# 加入数组
|
||||
level_list.append(item)
|
||||
# 返回结果
|
||||
return level_list
|
||||
# 兼容垫片：由 modules.system.level.service 迁移
|
||||
from modules.system.level.service import * # noqa: F401,F403
|
||||
|
||||
+2
-167
@@ -1,167 +1,2 @@
|
||||
from datetime import datetime, timezone
|
||||
|
||||
from fastapi.logger import logger
|
||||
from sqlalchemy import and_
|
||||
|
||||
|
||||
from apps.constants.constants import LINK_TYPE_LIST, LINK_PLATFORM_LIST, LINK_FORM_LIST
|
||||
from apps.constants.message import PAGE_SIZE
|
||||
from apps.forms.link import LinkForm, LinkStatusForm
|
||||
from apps.models.link import Link
|
||||
from extensions import get_db_session
|
||||
from utils import R
|
||||
from utils.rich_text import get_file_url, save_file
|
||||
from utils.request import like_contains
|
||||
from utils.security import get_user_id
|
||||
|
||||
|
||||
# 查看友链分页数据
|
||||
|
||||
def get_link_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(Link).filter(Link.is_delete == 0)
|
||||
# 友链名称
|
||||
name = request.query_params.get('name')
|
||||
if name:
|
||||
query = query.filter(Link.name.like(like_contains(name), escape='\\'))
|
||||
# 友链类型：1-友情链接 2-合作伙伴
|
||||
type = request.query_params.get('type')
|
||||
if type:
|
||||
query = query.filter(Link.type == type)
|
||||
# 投放平台：1PC站 2WAP站 3微信小程序 4APP应用
|
||||
platform = request.query_params.get('platform')
|
||||
if platform:
|
||||
query = query.filter(Link.platform == platform)
|
||||
# 友链形式：1文字链接 2图片链接
|
||||
form = request.query_params.get('form')
|
||||
if form:
|
||||
query = query.filter(Link.form == form)
|
||||
# 状态筛选
|
||||
status = request.query_params.get('status')
|
||||
if status:
|
||||
query = query.filter(Link.status == status)
|
||||
# 排序
|
||||
query = query.order_by(Link.sort.desc())
|
||||
# 记录总数
|
||||
count = query.count()
|
||||
# 分页查询
|
||||
link_list = query.limit(limit).offset((page - 1) * limit).all()
|
||||
# 若当前页超出末页（数据被并发删除），自动回退到第一页
|
||||
if page > 1 and not link_list:
|
||||
page = 1
|
||||
count = query.count()
|
||||
link_list = query.limit(limit).offset(0).all()
|
||||
# 实例化结果
|
||||
result = []
|
||||
# 遍历数据源
|
||||
if len(link_list) > 0:
|
||||
for item in link_list:
|
||||
# 对象转字典
|
||||
data = item.to_dict()
|
||||
# 友链类型
|
||||
data['type_name'] = LINK_TYPE_LIST.get(item.type)
|
||||
# 投放平台
|
||||
data['platform_name'] = LINK_PLATFORM_LIST.get(item.platform)
|
||||
# 友链形式
|
||||
data['form_name'] = LINK_FORM_LIST.get(item.form)
|
||||
# 友链图片
|
||||
data['image'] = get_file_url(item.image) if item.image else None
|
||||
# 加入列表
|
||||
result.append(data)
|
||||
# 返回结果
|
||||
return R.ok(data=result, count=count)
|
||||
# 根据ID查看友链详情
|
||||
|
||||
def get_link_detail(link_id):
|
||||
db = get_db_session()
|
||||
# 根据ID查询友链
|
||||
link = db.query(Link).filter(and_(Link.id == link_id, Link.is_delete == 0)).first()
|
||||
# 查询结果为空判断
|
||||
if not link:
|
||||
return None
|
||||
# 对象转字典
|
||||
data = link.to_dict()
|
||||
# 友链图片
|
||||
data['image'] = get_file_url(link.image) if link.image else None
|
||||
# 返回结果
|
||||
return data
|
||||
# 添加友链
|
||||
|
||||
def add_link(request, data: LinkForm):
|
||||
db = get_db_session()
|
||||
# 表单数据转字典
|
||||
form_data = data.model_dump(exclude={'id'}, by_alias=True)
|
||||
|
||||
# 友链图片
|
||||
image = data.image
|
||||
if image:
|
||||
form_data['image'] = save_file(image, "link")
|
||||
|
||||
# 表单数据赋值给对象
|
||||
link = Link(**form_data)
|
||||
link.create_user = get_user_id(request)
|
||||
# 插入数据
|
||||
link.save()
|
||||
# 返回结果
|
||||
return R.ok(msg="添加成功")
|
||||
|
||||
|
||||
# 更新友链
|
||||
|
||||
def update_link(request, data: LinkForm):
|
||||
db = get_db_session()
|
||||
# 记录ID判空
|
||||
if not data.id or data.id <= 0:
|
||||
return R.failed("记录ID不能为空")
|
||||
|
||||
# 根据ID查询记录
|
||||
link = db.query(Link).filter(and_(Link.id == data.id, Link.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not link:
|
||||
return R.failed("记录不存在")
|
||||
|
||||
# 构造更新数据（排除 id，使用别名以匹配数据库字段）
|
||||
updData = data.model_dump(exclude={'id'}, by_alias=True)
|
||||
# 友链图片
|
||||
image = data.image
|
||||
if image:
|
||||
updData['image'] = save_file(image, "link")
|
||||
updData['update_user'] = get_user_id(request)
|
||||
updData['update_time'] = datetime.now(tz=timezone.utc)
|
||||
# 更新数据
|
||||
result = db.query(Link).filter_by(id=data.id).update(updData)
|
||||
# 提交数据
|
||||
if not result:
|
||||
return R.failed("更新失败")
|
||||
# 返回结果
|
||||
return R.ok(msg="更新成功")
|
||||
# 删除友链
|
||||
|
||||
def delete_link(link_id):
|
||||
return Link.batch_delete_r(link_id)
|
||||
# 设置状态
|
||||
|
||||
def update_link_status(request, data: LinkStatusForm):
|
||||
db = get_db_session()
|
||||
# 根据ID查询记录
|
||||
link = db.query(Link).filter(and_(Link.id == data.id, Link.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not link:
|
||||
return R.failed("记录不存在")
|
||||
|
||||
# 更新记录
|
||||
result = db.query(Link).filter_by(id=data.id).update({
|
||||
"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="设置成功")
|
||||
# 兼容垫片：由 modules.link.service 迁移
|
||||
from modules.link.service import * # noqa: F401,F403
|
||||
|
||||
+2
-105
@@ -1,105 +1,2 @@
|
||||
import asyncio
|
||||
|
||||
from fastapi.logger import logger
|
||||
from sqlalchemy import and_
|
||||
|
||||
from apps.forms.login import LoginForm
|
||||
from apps.models.user import User
|
||||
from apps.services import login_log
|
||||
from extensions import get_db_session
|
||||
from utils import R
|
||||
from utils import password
|
||||
from utils.jwt import create_token
|
||||
from utils.captcha import verify_captcha
|
||||
from utils.ip import get_client_ip
|
||||
from config import LOGIN_FAIL_MAX, LOGIN_LOCK_SECONDS
|
||||
|
||||
# Redis Key 前缀
|
||||
_LOGIN_FAIL_PREFIX = 'login:fail:'
|
||||
_LOGIN_LOCK_PREFIX = 'login:lock:'
|
||||
|
||||
|
||||
def _fail_key(ip: str, username: str) -> str:
|
||||
"""登录失败计数Key：按IP+用户名维度"""
|
||||
return f'{_LOGIN_FAIL_PREFIX}{ip}:{username}'
|
||||
|
||||
|
||||
def _lock_key(ip: str, username: str) -> str:
|
||||
"""登录锁定Key"""
|
||||
return f'{_LOGIN_LOCK_PREFIX}{ip}:{username}'
|
||||
|
||||
|
||||
async def _is_locked(redis, ip: str, username: str) -> tuple[bool, int]:
|
||||
"""检查是否处于锁定状态，返回 (是否锁定, 剩余秒数)"""
|
||||
key = _lock_key(ip, username)
|
||||
ttl = await redis.ttl(key)
|
||||
if ttl and ttl > 0:
|
||||
return True, ttl
|
||||
return False, 0
|
||||
|
||||
|
||||
async def _record_fail(redis, ip: str, username: str):
|
||||
"""记录一次登录失败，达到上限则锁定"""
|
||||
key = _fail_key(ip, username)
|
||||
count = await redis.incr(key)
|
||||
# 首次失败时设置过期时间（与锁定时间一致，避免残留）
|
||||
if count == 1:
|
||||
await redis.expire(key, LOGIN_LOCK_SECONDS)
|
||||
# 达到上限，设置锁定
|
||||
if count >= LOGIN_FAIL_MAX:
|
||||
lock_k = _lock_key(ip, username)
|
||||
await redis.set(lock_k, '1', ex=LOGIN_LOCK_SECONDS)
|
||||
logger.warning(f"登录锁定：IP={ip}, 用户={username}, 连续失败{count}次")
|
||||
|
||||
|
||||
async def _clear_fail(redis, ip: str, username: str):
|
||||
"""登录成功后清除失败记录"""
|
||||
fail_k = _fail_key(ip, username)
|
||||
lock_k = _lock_key(ip, username)
|
||||
await redis.delete(fail_k, lock_k)
|
||||
|
||||
|
||||
# 系统登录
|
||||
|
||||
async def login(request, data: LoginForm):
|
||||
# 获取客户端IP
|
||||
ip = get_client_ip(request)
|
||||
|
||||
# 检查是否被锁定
|
||||
from utils.redis_ctx import get_redis
|
||||
redis = get_redis()
|
||||
locked, remaining = await _is_locked(redis, ip, data.username)
|
||||
if locked:
|
||||
return R.failed(f"登录失败次数过多，请{remaining}秒后再试")
|
||||
|
||||
# 验证码校验（验证成功后自动删除，防止重放攻击）
|
||||
if not await verify_captcha(data.idKey, data.captcha):
|
||||
return R.failed("验证码不正确")
|
||||
|
||||
# 根据用户名查询用户信息（状态为1-正常，2-禁用），同步DB查询放入线程池
|
||||
def _query_user():
|
||||
db = get_db_session()
|
||||
return db.query(User).filter(and_(User.username == data.username, User.is_delete == 0, User.status == 1)).first()
|
||||
|
||||
user = await asyncio.to_thread(_query_user)
|
||||
if not user:
|
||||
# 记录失败但不透露具体原因（用户不存在、已禁用、密码错误统一提示）
|
||||
await _record_fail(redis, ip, data.username)
|
||||
await asyncio.to_thread(login_log.record_login_log, request, data.username, 1, 0, 1, error="用户名或密码不正确")
|
||||
return R.failed("用户名或密码不正确")
|
||||
|
||||
# 比对密码是否相同
|
||||
if not password.verify_password(data.password, user.salt or '', user.password or ''):
|
||||
await _record_fail(redis, ip, data.username)
|
||||
await asyncio.to_thread(login_log.record_login_log, request, data.username, 1, 0, 1, error="用户名或密码不正确")
|
||||
return R.failed("用户名或密码不正确")
|
||||
|
||||
# 登录成功，清除失败记录
|
||||
await _clear_fail(redis, ip, data.username)
|
||||
|
||||
# 生成TOKEN
|
||||
access_token = create_token({"userId": user.id, "username": user.username, "realname": user.realname or ''})
|
||||
# 记录登录成功日志
|
||||
await asyncio.to_thread(login_log.record_login_log, request, data.username, 1, 0, 0, result="登录成功")
|
||||
# 返回结果
|
||||
return R.ok(msg="登录成功", data={"access_token": access_token})
|
||||
# 兼容垫片：由 modules.auth.service 迁移
|
||||
from modules.auth.service import * # noqa: F401,F403
|
||||
|
||||
+2
-131
@@ -1,131 +1,2 @@
|
||||
import logging
|
||||
import time
|
||||
|
||||
from sqlalchemy import and_
|
||||
|
||||
from apps.constants.constants import LOG_TYPE_LIST, LOGIN_SOURCE_LIST, LOGIN_STATUS_LIST
|
||||
from apps.constants.message import PAGE_SIZE
|
||||
from apps.models.login_log import LoginLog
|
||||
from extensions.sqlalchemy import commit_independently
|
||||
from extensions import get_db_session
|
||||
from utils import R
|
||||
from utils.ip import get_client_ip
|
||||
from utils.ip2region import get_ip_location
|
||||
from utils.ua import parse_user_agent
|
||||
from utils.request import like_contains, parse_id_list
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
# ============================================================
|
||||
# 核心便捷方法
|
||||
# ============================================================
|
||||
|
||||
def record_login_log(request, username, log_type, source, status, **kwargs):
|
||||
"""
|
||||
记录登录日志
|
||||
|
||||
使用独立session写入，不受请求事务commit/rollback影响。
|
||||
日志是审计数据，无论业务成功或失败都应持久化。
|
||||
|
||||
Args:
|
||||
request: FastAPI Request 对象
|
||||
username: 登录账号
|
||||
log_type: 日志类型（1-登录，2-退出）
|
||||
source: 登录来源（0-后台，1-前台）
|
||||
status: 操作状态（0-正常，1-异常）
|
||||
**kwargs: 其他可选参数
|
||||
- method: 请求方法
|
||||
- request_method: 请求方式
|
||||
- url: 请求URL
|
||||
- param: 请求参数
|
||||
- result: 返回结果
|
||||
- consume_time: 请求耗时（毫秒）
|
||||
- error: 错误信息
|
||||
"""
|
||||
try:
|
||||
# 从 request 提取信息
|
||||
ip = get_client_ip(request)
|
||||
location = get_ip_location(ip)
|
||||
ua = request.headers.get('User-Agent', '')
|
||||
os_name, browser_name = parse_user_agent(ua)
|
||||
|
||||
log = LoginLog(
|
||||
username=username,
|
||||
log_type=log_type,
|
||||
source=source,
|
||||
method=kwargs.get('method', request.method),
|
||||
request_method=kwargs.get('request_method', ''),
|
||||
url=kwargs.get('url', str(request.url)),
|
||||
param=kwargs.get('param', ''),
|
||||
result=kwargs.get('result', ''),
|
||||
ip=ip,
|
||||
location=location,
|
||||
os=os_name,
|
||||
browser=browser_name,
|
||||
consume_time=kwargs.get('consume_time', 0),
|
||||
status=status,
|
||||
error=kwargs.get('error', ''),
|
||||
)
|
||||
|
||||
commit_independently(log)
|
||||
return log
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"记录登录日志异常: {str(e)}")
|
||||
return None
|
||||
|
||||
|
||||
# ============================================================
|
||||
# CRUD 服务
|
||||
# ============================================================
|
||||
|
||||
def get_login_log_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(LoginLog).filter(LoginLog.is_delete == 0)
|
||||
# 登录账号
|
||||
username = request.query_params.get('username')
|
||||
if username:
|
||||
query = query.filter(LoginLog.username.like(like_contains(username), escape='\\'))
|
||||
# 日志类型
|
||||
log_type = request.query_params.get('log_type')
|
||||
if log_type:
|
||||
query = query.filter(LoginLog.log_type == log_type)
|
||||
# 登录来源
|
||||
source = request.query_params.get('source')
|
||||
if source:
|
||||
query = query.filter(LoginLog.source == source)
|
||||
# 操作状态
|
||||
status = request.query_params.get('status')
|
||||
if status:
|
||||
query = query.filter(LoginLog.status == status)
|
||||
# 排序
|
||||
query = query.order_by(LoginLog.id.desc())
|
||||
# 记录总数
|
||||
count = query.count()
|
||||
# 分页查询
|
||||
log_list = query.limit(limit).offset((page - 1) * limit).all()
|
||||
# 若当前页超出末页（数据被并发删除），自动回退到第一页
|
||||
if page > 1 and not log_list:
|
||||
page = 1
|
||||
count = query.count()
|
||||
log_list = query.limit(limit).offset(0).all()
|
||||
# 实例化结果
|
||||
result = []
|
||||
if len(log_list) > 0:
|
||||
for item in log_list:
|
||||
data = item.to_dict()
|
||||
data['log_type_name'] = LOG_TYPE_LIST.get(item.log_type)
|
||||
data['source_name'] = LOGIN_SOURCE_LIST.get(item.source)
|
||||
data['status_name'] = LOGIN_STATUS_LIST.get(item.status)
|
||||
result.append(data)
|
||||
return R.ok(data=result, count=count)
|
||||
|
||||
|
||||
def delete_login_log(ids_str):
|
||||
return LoginLog.batch_delete_r(ids_str)
|
||||
# 兼容垫片：由 modules.log.service 迁移
|
||||
from modules.log.service import * # noqa: F401,F403
|
||||
|
||||
+2
-231
@@ -1,231 +1,2 @@
|
||||
from datetime import datetime, timezone
|
||||
|
||||
from fastapi.logger import logger
|
||||
from sqlalchemy import and_
|
||||
|
||||
from apps.constants.constants import GENDER_LIST, MEMBER_SOURCE_LIST
|
||||
from apps.constants.message import PAGE_SIZE
|
||||
from apps.forms.member import MemberForm, MemberStatusForm
|
||||
from apps.models.member import Member
|
||||
from apps.models.member_level import MemberLevel
|
||||
from extensions import get_db_session
|
||||
from utils import R
|
||||
from utils import password
|
||||
from utils.rich_text import get_file_url, save_file
|
||||
from utils.request import like_contains
|
||||
from utils.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)
|
||||
# 会员账号
|
||||
username = request.query_params.get('username')
|
||||
if username:
|
||||
query = query.filter(Member.username == username)
|
||||
# 注册来源：1-网站注册 2-客户端注册 3-小程序注册 4-手机站注册 5-后台添加
|
||||
source = request.query_params.get('source')
|
||||
if source:
|
||||
query = query.filter(Member.source == source)
|
||||
# 性别
|
||||
gender = request.query_params.get('gender')
|
||||
if gender:
|
||||
query = query.filter(Member.gender == gender)
|
||||
# 会员状态
|
||||
status = request.query_params.get('status')
|
||||
if status:
|
||||
query = query.filter(Member.status == status)
|
||||
# 排序
|
||||
query = query.order_by(Member.id.desc())
|
||||
# 记录总数
|
||||
count = query.count()
|
||||
# 分页查询
|
||||
member_list = query.limit(limit).offset((page - 1) * limit).all()
|
||||
# 若当前页超出末页（数据被并发删除），自动回退到第一页
|
||||
if page > 1 and not member_list:
|
||||
page = 1
|
||||
count = query.count()
|
||||
member_list = query.limit(limit).offset(0).all()
|
||||
# 实例化结果
|
||||
result = []
|
||||
# 遍历数据源
|
||||
if len(member_list) > 0:
|
||||
# 仅查询当前页用到的会员等级ID
|
||||
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():
|
||||
member_level_list[ml.id] = ml.name
|
||||
|
||||
# 遍历会员数据源
|
||||
for item in member_list:
|
||||
# 对象转字典
|
||||
data = item.to_dict()
|
||||
# 性别
|
||||
data['gender_name'] = GENDER_LIST.get(item.gender)
|
||||
# 头像
|
||||
data['avatar'] = get_file_url(item.avatar) if item.avatar else ""
|
||||
# 会员等级描述
|
||||
data['member_level_name'] = member_level_list.get(item.member_level) if member_level_list else ""
|
||||
# 会员来源描述
|
||||
data['source_name'] = MEMBER_SOURCE_LIST.get(item.source)
|
||||
# 加入列表
|
||||
result.append(data)
|
||||
# 返回结果
|
||||
return R.ok(data=result, count=count)
|
||||
# 根据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()
|
||||
# 查询结果判空
|
||||
if not member:
|
||||
return None
|
||||
|
||||
# 城市编码
|
||||
cityList = []
|
||||
# 省份编号
|
||||
cityList.append(member.province_code)
|
||||
# 城市编码
|
||||
cityList.append(member.city_code)
|
||||
# 县区编码
|
||||
cityList.append(member.district_code)
|
||||
|
||||
# 对象转字典
|
||||
data = member.to_dict()
|
||||
# 头像
|
||||
data['avatar'] = get_file_url(member.avatar) if member.avatar else ""
|
||||
# 行政区划
|
||||
data['city'] = cityList
|
||||
# 返回结果
|
||||
return data
|
||||
# 添加会员
|
||||
|
||||
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():
|
||||
return R.failed("登录账号不能重复")
|
||||
# 获取表单数据
|
||||
form_data = data.model_dump(exclude={'id'})
|
||||
|
||||
# 图片处理
|
||||
avatar = form_data.get('avatar')
|
||||
if avatar:
|
||||
form_data['avatar'] = save_file(avatar, "member")
|
||||
|
||||
# 密码加密
|
||||
pwd = form_data.get('password')
|
||||
if pwd:
|
||||
salt = password.generate_salt()
|
||||
form_data['password'] = password.encrypt_password(pwd, salt)
|
||||
form_data['salt'] = salt
|
||||
|
||||
# 行政区划处理
|
||||
citys = form_data.get('city')
|
||||
# 从表单中移除行政区划
|
||||
del form_data['city']
|
||||
if citys and len(citys) == 3:
|
||||
# 省份编码
|
||||
form_data['province_code'] = citys[0]
|
||||
# 城市编码
|
||||
form_data['city_code'] = citys[1]
|
||||
# 县区编码
|
||||
form_data['district_code'] = citys[2]
|
||||
|
||||
# 表单数据赋值给对象
|
||||
member = Member(**form_data)
|
||||
member.create_user = get_user_id(request)
|
||||
# 插入数据
|
||||
member.save()
|
||||
|
||||
# 返回结果
|
||||
return R.ok(msg="添加成功")
|
||||
|
||||
|
||||
# 更新会员
|
||||
|
||||
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():
|
||||
return R.failed("登录账号不能重复")
|
||||
|
||||
# 根据ID查询记录
|
||||
user = db.query(Member).filter(and_(Member.id == data.id, Member.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not user:
|
||||
return R.failed("记录不存在")
|
||||
|
||||
# 获取表单数据（排除密码字段，避免None覆盖原值）
|
||||
form_data = data.model_dump(exclude={'id', 'password'})
|
||||
|
||||
# 图片处理
|
||||
avatar = form_data.get('avatar')
|
||||
if avatar:
|
||||
form_data['avatar'] = save_file(avatar, "member")
|
||||
|
||||
# 密码加密：仅传入新密码时才更新
|
||||
pwd = data.password
|
||||
if pwd:
|
||||
salt = password.generate_salt()
|
||||
form_data['password'] = password.encrypt_password(pwd, salt)
|
||||
form_data['salt'] = salt
|
||||
|
||||
# 行政区划处理
|
||||
citys = form_data.get('city')
|
||||
# 从表单中移除行政区划
|
||||
del form_data['city']
|
||||
if citys and len(citys) == 3:
|
||||
# 省份编码
|
||||
form_data['province_code'] = citys[0]
|
||||
# 城市编码
|
||||
form_data['city_code'] = citys[1]
|
||||
# 县区编码
|
||||
form_data['district_code'] = citys[2]
|
||||
|
||||
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)
|
||||
# 提交数据
|
||||
if not result:
|
||||
return R.failed("更新失败")
|
||||
# 返回结果
|
||||
return R.ok(msg="更新成功")
|
||||
# 删除会员
|
||||
|
||||
def delete_member(member_id):
|
||||
return Member.batch_delete_r(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()
|
||||
# 查询结果判空
|
||||
if not user:
|
||||
return R.failed("记录不存在")
|
||||
|
||||
# 更新记录
|
||||
result = db.query(Member).filter_by(id=data.id).update({
|
||||
"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="设置成功")
|
||||
# 兼容垫片：由 modules.member.service 迁移
|
||||
from modules.member.service import * # noqa: F401,F403
|
||||
|
||||
@@ -1,125 +1,2 @@
|
||||
from datetime import datetime, timezone
|
||||
|
||||
from fastapi.logger import logger
|
||||
from sqlalchemy import and_
|
||||
|
||||
from apps.constants.message import PAGE_SIZE
|
||||
from apps.forms.member_level import MemberLevelForm
|
||||
from apps.models.member_level import MemberLevel
|
||||
from extensions import get_db_session
|
||||
from utils import R
|
||||
from utils.security import get_user_id
|
||||
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)
|
||||
# 会员等级名称
|
||||
name = request.query_params.get('name')
|
||||
if name:
|
||||
query = query.filter(MemberLevel.name.like(like_contains(name), escape='\\'))
|
||||
# 排序
|
||||
query = query.order_by(MemberLevel.sort.asc())
|
||||
# 记录总数
|
||||
count = query.count()
|
||||
# 分页查询
|
||||
member_level_list = query.limit(limit).offset((page - 1) * limit).all()
|
||||
# 若当前页超出末页（数据被并发删除），自动回退到第一页
|
||||
if page > 1 and not member_level_list:
|
||||
page = 1
|
||||
count = query.count()
|
||||
member_level_list = query.limit(limit).offset(0).all()
|
||||
# 实例化结果
|
||||
result = []
|
||||
# 遍历数据源
|
||||
if len(member_level_list) > 0:
|
||||
for item in member_level_list:
|
||||
# 对象转字典
|
||||
data = item.to_dict()
|
||||
# 加入列表
|
||||
result.append(data)
|
||||
# 返回结果
|
||||
return R.ok(data=result, count=count)
|
||||
# 根据会员等级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()
|
||||
# 查询结果判空
|
||||
if not member_level:
|
||||
return None
|
||||
# 对象转字典
|
||||
data = member_level.to_dict()
|
||||
# 返回结果
|
||||
return data
|
||||
# 添加会员等级
|
||||
|
||||
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():
|
||||
return R.failed("会员等级名称不能重复")
|
||||
# 表单数据赋值给对象
|
||||
member_level = MemberLevel(**data.model_dump(exclude={'id'}))
|
||||
member_level.create_user = get_user_id(request)
|
||||
# 插入数据
|
||||
member_level.save()
|
||||
# 返回结果
|
||||
return R.ok(msg="添加成功")
|
||||
|
||||
|
||||
# 更新会员等级
|
||||
|
||||
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():
|
||||
return R.failed("会员等级名称不能重复")
|
||||
|
||||
# 根据ID查询记录
|
||||
member_level = db.query(MemberLevel).filter(and_(MemberLevel.id == data.id, MemberLevel.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not member_level:
|
||||
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(MemberLevel).filter_by(id=data.id).update(updData)
|
||||
# 提交数据
|
||||
if not result:
|
||||
return R.failed("更新失败")
|
||||
# 返回结果
|
||||
return R.ok(msg="更新成功")
|
||||
# 删除会员等级
|
||||
|
||||
def delete_member_level(member_level_id):
|
||||
return MemberLevel.batch_delete_r(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()
|
||||
# 实例化对象
|
||||
result = []
|
||||
# 遍历数据源
|
||||
for v in member_level_list:
|
||||
# 对象转字典
|
||||
item = v.to_dict()
|
||||
# 加入列表
|
||||
result.append(item)
|
||||
# 返回结果
|
||||
return result
|
||||
# 兼容垫片：由 modules.member.service 迁移
|
||||
from modules.member.service import * # noqa: F401,F403
|
||||
|
||||
+2
-449
@@ -1,449 +1,2 @@
|
||||
# +======================================================================
|
||||
# | DjangoAdmin 企业数字化开发平台 [ 赋能开发者，助力企业发展 ]
|
||||
# +----------------------------------------------------------------------
|
||||
# | Copyright (c) 2021-2026 一米阳光团队 版权所有
|
||||
# +----------------------------------------------------------------------
|
||||
# | 开源协议: Apache-2.0
|
||||
# | 重要声明: 未经书面许可，不得移除或修改本框架相关版权标识。
|
||||
# +----------------------------------------------------------------------
|
||||
# | 官方网站: https://www.djangoadmin.cn
|
||||
# +----------------------------------------------------------------------
|
||||
# | 研发团队: 一米阳光团队 荣誉出品
|
||||
# +======================================================================
|
||||
# | 版权和免责声明:
|
||||
# | 一、知识产权声明
|
||||
# | 本团队对该软件框架产品（以下简称“本产品”）拥有完整知识产权，包括但不限于商标权、专利权、
|
||||
# | 著作权、商业秘密等。前述权利均受中华人民共和国及相关国际法律法规保护。未经本团队书面授权，
|
||||
# | 任何个人或单位不得基于本产品本身申请任何形式的知识产权。
|
||||
# | 二、使用限制与禁止条款
|
||||
# | 您理解并同意，禁止将本产品用于以下任何行为：
|
||||
# | 1. 任何违反中华人民共和国法律法规的用途；
|
||||
# | 2. 任何侵害他人合法权益（包括但不限于人身权、财产权、知识产权等）的行为；
|
||||
# | 3. 任何危害国家安全、公共利益及社会道德风尚的行为。
|
||||
# | 三、责任豁免
|
||||
# | 因使用本产品而产生的任何损失或法律纠纷（包括但不限于直接损失、间接损失、附带损失、衍生损失
|
||||
# | 以及因违约、侵权等引发的责任），本团队均不承担任何法律责任。若因违规使用本产品导致任何第三
|
||||
# | 方提起索赔或行政机关进行调查，您应独立承担全部责任。
|
||||
# | 四、违约与法律责任
|
||||
# | 如发现任何违反本声明的行为，本团队有权：
|
||||
# | 1. 无条件配合公安机关及其他有权机关的调查取证工作；
|
||||
# | 2. 依法追究相关方的民事责任，并要求赔偿全部损失；
|
||||
# | 3. 保留进一步采取刑事控告等法律措施的权利。
|
||||
# | 五、许可范围说明
|
||||
# | 1、被授权方应视本产品源代码为核心机密信息，负有最高标准的保密与保管义务。禁止以任何形式（包
|
||||
# | 括但不限于直接或间接的分享、复制、传播、分发、转售、出租、开源、反向工程、反编译、反汇编或通
|
||||
# | 过网络服务提供给任何第三方）泄露、披露或处置源代码的全部或部分内容。任何未经授权的复制、使用、
|
||||
# | 传播行为均构成对本团队知识产权的严重侵权，本团队有权依法追究其全部法律责任，并要求赔偿因此造
|
||||
# | 成的一切经济损失及商誉损害。
|
||||
# | 2、本产品仅限于公司或个人在法律允许范围内，用于内部且合规的软件产品研发。具体权利义务以《软件
|
||||
# | 许可协议》附件为准。
|
||||
# +======================================================================
|
||||
|
||||
import asyncio
|
||||
from datetime import datetime, timezone
|
||||
|
||||
from fastapi.logger import logger
|
||||
from sqlalchemy import and_, or_
|
||||
|
||||
|
||||
from apps.forms.menu import MenuForm
|
||||
from apps.models.menu import Menu
|
||||
from apps.models.role_menu import RoleMenu
|
||||
from apps.models.user_role import UserRole
|
||||
from extensions import get_db_session
|
||||
from utils import R
|
||||
from utils.security import get_user_id
|
||||
from utils.request import like_contains, parse_id_list
|
||||
from utils.perm_cache import get_cached_permissions, set_cached_permissions, get_cached_menus, set_cached_menus, invalidate_menu_change
|
||||
|
||||
|
||||
# 查询菜单列表
|
||||
|
||||
def get_menu_page(request):
|
||||
db = get_db_session()
|
||||
# 实例化查询对象
|
||||
query = db.query(Menu).filter(Menu.is_delete == 0)
|
||||
# 菜单名称
|
||||
name = request.query_params.get('name')
|
||||
if name:
|
||||
# 菜单名称模糊查询
|
||||
query = query.filter(Menu.name.like(like_contains(name), escape='\\'))
|
||||
# 查询数据
|
||||
menu_list = query.order_by(Menu.sort.asc()).all()
|
||||
# 实例化数组对象
|
||||
result = []
|
||||
# 遍历数据源
|
||||
if menu_list:
|
||||
for item in menu_list:
|
||||
# 对象转字典
|
||||
data = item.to_dict()
|
||||
# 加入列表
|
||||
result.append(data)
|
||||
# 返回结果
|
||||
return R.ok(data=result)
|
||||
# 根据ID查询菜单详情
|
||||
|
||||
def get_menu_detail(menu_id):
|
||||
db = get_db_session()
|
||||
# 根据ID查询菜单
|
||||
menu = db.query(Menu).filter(and_(Menu.id == menu_id, Menu.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not menu:
|
||||
return None
|
||||
# 对象转字典
|
||||
data = menu.to_dict()
|
||||
|
||||
# 查询菜单权限节点
|
||||
permission_list = db.query(Menu).filter(
|
||||
and_(Menu.parent_id == menu_id, Menu.type == 1, Menu.is_delete == 0)).all()
|
||||
# 选中的权限节点
|
||||
checked_list = []
|
||||
if permission_list:
|
||||
for v in permission_list:
|
||||
checked_list.append(v.sort)
|
||||
# 权限节点
|
||||
data['checked_list'] = checked_list
|
||||
# 返回结果
|
||||
return data
|
||||
# 添加菜单
|
||||
|
||||
async def add_menu(request, data: MenuForm):
|
||||
def _add():
|
||||
db = get_db_session()
|
||||
# 权限节点
|
||||
checkedList = data.checked_list or []
|
||||
|
||||
# 表单数据赋值给对象
|
||||
menu = Menu(
|
||||
title=data.title,
|
||||
icon=data.icon,
|
||||
path=data.path,
|
||||
parent_id=data.parent_id,
|
||||
type=data.type,
|
||||
permission=data.permission,
|
||||
component=data.component,
|
||||
status=data.status,
|
||||
hide=data.hide,
|
||||
target=data.target,
|
||||
sort=data.sort
|
||||
)
|
||||
menu.create_user = get_user_id(request)
|
||||
# 插入数据
|
||||
menu.save()
|
||||
|
||||
# 保存节点数据
|
||||
set_permission(data.type, checkedList, data.title, data.path, menu.id, get_user_id(request))
|
||||
|
||||
# 同步DB操作放入线程池，避免阻塞事件循环
|
||||
await asyncio.to_thread(_add)
|
||||
|
||||
# 清理权限缓存
|
||||
await invalidate_menu_change()
|
||||
|
||||
# 返回结果
|
||||
return R.ok(msg="添加成功")
|
||||
# 更新菜单
|
||||
|
||||
async def update_menu(request, data: MenuForm):
|
||||
def _update():
|
||||
db = get_db_session()
|
||||
# 记录ID判空
|
||||
if not data.id or data.id <= 0:
|
||||
return R.failed("记录ID不能为空")
|
||||
|
||||
# 根据ID查询记录
|
||||
menu = db.query(Menu).filter(and_(Menu.id == data.id, Menu.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not menu:
|
||||
return R.failed("记录不存在")
|
||||
|
||||
# 权限节点
|
||||
checkedList = data.checked_list or []
|
||||
|
||||
# 更新数据源（排除 id 和 checked_list）
|
||||
updData = data.model_dump(exclude={'id', 'checked_list'})
|
||||
updData['update_user'] = get_user_id(request)
|
||||
updData['update_time'] = datetime.now(tz=timezone.utc)
|
||||
# 更新数据源
|
||||
result = db.query(Menu).filter_by(id=data.id).update(updData)
|
||||
# 提交数据
|
||||
if not result:
|
||||
return R.failed("更新失败")
|
||||
|
||||
# 保存节点数据
|
||||
set_permission(data.type, checkedList, data.title, data.path, menu.id, get_user_id(request))
|
||||
return None
|
||||
|
||||
# 同步DB操作放入线程池，避免阻塞事件循环
|
||||
err = await asyncio.to_thread(_update)
|
||||
if err:
|
||||
return err
|
||||
|
||||
# 清理权限缓存
|
||||
await invalidate_menu_change()
|
||||
|
||||
# 返回结果
|
||||
return R.ok(msg="更新成功")
|
||||
# 删除菜单
|
||||
|
||||
async def delete_menu(menu_id):
|
||||
def _delete():
|
||||
db = get_db_session()
|
||||
# 记录ID为空判断
|
||||
if not menu_id:
|
||||
return R.failed("记录ID不存在"), None
|
||||
# 分裂字符串
|
||||
id_list = parse_id_list(menu_id)
|
||||
if not id_list:
|
||||
return R.failed("记录ID不存在"), None
|
||||
# 批量查询并校验
|
||||
records = db.query(Menu).filter(and_(Menu.id.in_(id_list), Menu.is_delete == 0)).all()
|
||||
if len(records) != len(id_list):
|
||||
return R.failed("记录不存在"), None
|
||||
# 批量设置删除标识
|
||||
for record in records:
|
||||
record.is_delete = 1
|
||||
return None, records
|
||||
|
||||
# 同步DB操作放入线程池，避免阻塞事件循环
|
||||
err, records = await asyncio.to_thread(_delete)
|
||||
if err:
|
||||
return err
|
||||
|
||||
# 清理权限缓存
|
||||
await invalidate_menu_change()
|
||||
# 返回结果
|
||||
return R.ok(msg="本次共删除{0}条数据".format(len(records)))
|
||||
# 保存节点数据
|
||||
|
||||
def set_permission(menu_type, checkedList, title, path, parent_id, user_id):
|
||||
db = get_db_session()
|
||||
# 参数判空
|
||||
if menu_type != 0 or not checkedList or path == "":
|
||||
return
|
||||
# 删除现有节点
|
||||
db.query(Menu).filter(and_(Menu.parent_id == parent_id, Menu.is_delete == 0)).delete()
|
||||
# 模块名称
|
||||
moduleTitle = title.replace("管理", "")
|
||||
# 请求path处理
|
||||
pathArr = path.split('/')
|
||||
if len(pathArr) < 3:
|
||||
return
|
||||
# 模块名
|
||||
moduleName = pathArr[len(pathArr) - 1]
|
||||
# 遍历数据源
|
||||
for v in checkedList:
|
||||
# 实例化菜单对象
|
||||
entity = Menu()
|
||||
# 节点值
|
||||
value = int(v)
|
||||
if value == 1:
|
||||
# 查询
|
||||
entity.title = "查询" + moduleTitle
|
||||
entity.path = "/" + moduleName + "/list"
|
||||
entity.permission = "sys:" + moduleName + ":list"
|
||||
elif value == 5:
|
||||
# 添加
|
||||
entity.title = "添加" + moduleTitle
|
||||
entity.path = "/" + moduleName + "/add"
|
||||
entity.permission = "sys:" + moduleName + ":add"
|
||||
elif value == 10:
|
||||
# 修改
|
||||
entity.title = "修改" + moduleTitle
|
||||
entity.path = "/" + moduleName + "/update"
|
||||
entity.permission = "sys:" + moduleName + ":update"
|
||||
elif value == 15:
|
||||
# 删除
|
||||
entity.title = "删除" + moduleTitle
|
||||
entity.path = "/" + moduleName + "/delete"
|
||||
entity.permission = "sys:" + moduleName + ":delete"
|
||||
elif value == 20:
|
||||
# 详情
|
||||
entity.title = moduleTitle + "详情"
|
||||
entity.path = "/" + moduleName + "/detail"
|
||||
entity.permission = "sys:" + moduleName + ":detail"
|
||||
elif value == 25:
|
||||
# 设置状态
|
||||
entity.title = "设置状态"
|
||||
entity.path = "/" + moduleName + "/status"
|
||||
entity.permission = "sys:" + moduleName + ":status"
|
||||
elif value == 30:
|
||||
# 批量删除
|
||||
entity.title = "批量删除"
|
||||
entity.path = "/" + moduleName + "/dall"
|
||||
entity.permission = "sys:" + moduleName + ":dall"
|
||||
elif value == 35:
|
||||
# 添加子级
|
||||
entity.title = "添加子级"
|
||||
entity.path = "/" + moduleName + "/addz"
|
||||
entity.permission = "sys:" + moduleName + ":addz"
|
||||
elif value == 40:
|
||||
# 全部展开
|
||||
entity.title = "全部展开"
|
||||
entity.path = "/" + moduleName + "/expand"
|
||||
entity.permission = "sys:" + moduleName + ":expand"
|
||||
elif value == 45:
|
||||
# 全部折叠
|
||||
entity.title = "全部折叠"
|
||||
entity.path = "/" + moduleName + "/collapse"
|
||||
entity.permission = "sys:" + moduleName + ":collapse"
|
||||
elif value == 50:
|
||||
# 导出数据
|
||||
entity.title = "导出" + moduleTitle
|
||||
entity.path = "/" + moduleName + "/export"
|
||||
entity.permission = "sys:" + moduleName + ":export"
|
||||
elif value == 55:
|
||||
# 导入数据
|
||||
entity.title = "导入" + moduleTitle
|
||||
entity.path = "/" + moduleName + "/import"
|
||||
entity.permission = "sys:" + moduleName + ":import"
|
||||
elif value == 60:
|
||||
# 分配权限
|
||||
entity.title = "分配权限"
|
||||
entity.path = "/" + moduleName + "/permission"
|
||||
entity.permission = "sys:" + moduleName + ":permission"
|
||||
elif value == 65:
|
||||
# 重置密码
|
||||
entity.title = "重置密码"
|
||||
entity.path = "/" + moduleName + "/resetPwd"
|
||||
entity.permission = "sys:" + moduleName + ":resetPwd"
|
||||
|
||||
# 设置默认值
|
||||
entity.parent_id = parent_id
|
||||
entity.type = 1
|
||||
entity.status = 1
|
||||
entity.target = "_self"
|
||||
entity.sort = value
|
||||
entity.create_user = user_id
|
||||
# 插入数据
|
||||
entity.save()
|
||||
|
||||
|
||||
# 获取用户权限节点
|
||||
|
||||
def get_permissions_list_sync(user_id):
|
||||
"""同步查询用户权限节点（直查DB，不读缓存），供同步鉴权路径使用"""
|
||||
db = get_db_session()
|
||||
if user_id == 1:
|
||||
# 超级管理员
|
||||
menu_list = db.query(Menu).filter(and_(Menu.is_delete == 0, Menu.type == 1)).all()
|
||||
else:
|
||||
# 其他用户：通过 ORM join 查询权限节点
|
||||
menu_list = (
|
||||
db.query(Menu)
|
||||
.join(RoleMenu, RoleMenu.menu_id == Menu.id)
|
||||
.join(UserRole, UserRole.role_id == RoleMenu.role_id)
|
||||
.filter(
|
||||
and_(
|
||||
UserRole.user_id == user_id,
|
||||
or_(Menu.type == 1, and_(Menu.type == 0, Menu.permission != "")),
|
||||
Menu.status == 1,
|
||||
Menu.is_delete == 0,
|
||||
)
|
||||
)
|
||||
.all()
|
||||
)
|
||||
return [item.permission for item in (menu_list or [])]
|
||||
|
||||
|
||||
async def get_permissions_list(user_id):
|
||||
# 尝试读取缓存
|
||||
cached = await get_cached_permissions(user_id)
|
||||
if cached is not None:
|
||||
return cached
|
||||
|
||||
permission_list = await asyncio.to_thread(get_permissions_list_sync, user_id)
|
||||
|
||||
# 写入缓存
|
||||
await set_cached_permissions(user_id, permission_list)
|
||||
return permission_list
|
||||
|
||||
|
||||
# 根据用户ID查询菜单列表
|
||||
|
||||
def get_permission_menu_list_sync(user_id):
|
||||
"""同步查询用户菜单树（直查DB，不读缓存），供线程池内使用"""
|
||||
db = get_db_session()
|
||||
if user_id == 1:
|
||||
# 超级管理员
|
||||
# 查询全部菜单列表
|
||||
menu_list = db.query(Menu).filter(and_(Menu.is_delete == 0, Menu.status == 1, Menu.type == 0)).order_by(
|
||||
Menu.sort.asc())
|
||||
return get_tree_list(menu_list)
|
||||
# 其他用户：通过 ORM join 查询菜单列表
|
||||
menu_list = (
|
||||
db.query(Menu)
|
||||
.join(RoleMenu, RoleMenu.menu_id == Menu.id)
|
||||
.join(UserRole, UserRole.role_id == RoleMenu.role_id)
|
||||
.filter(
|
||||
and_(
|
||||
UserRole.user_id == user_id,
|
||||
Menu.type == 0,
|
||||
Menu.status == 1,
|
||||
Menu.is_delete == 0,
|
||||
)
|
||||
)
|
||||
.order_by(Menu.sort.asc())
|
||||
.all()
|
||||
)
|
||||
return get_tree_list(menu_list)
|
||||
|
||||
|
||||
async def get_permission_menu_list(user_id):
|
||||
# 尝试读取缓存
|
||||
cached = await get_cached_menus(user_id)
|
||||
if cached is not None:
|
||||
return cached
|
||||
|
||||
menu_list = await asyncio.to_thread(get_permission_menu_list_sync, user_id)
|
||||
|
||||
# 写入缓存
|
||||
await set_cached_menus(user_id, menu_list)
|
||||
return menu_list
|
||||
|
||||
|
||||
# 根据数据源获取树状结构
|
||||
|
||||
def get_tree_list(source_list):
|
||||
# 实例化数组
|
||||
menu_list = []
|
||||
if source_list:
|
||||
for item in source_list:
|
||||
data = {
|
||||
'id': item.id,
|
||||
'title': item.title,
|
||||
'icon': item.icon,
|
||||
'path': item.path,
|
||||
'parent_id': item.parent_id,
|
||||
'type': item.type,
|
||||
'component': item.component,
|
||||
'permission': item.permission,
|
||||
'target': item.target,
|
||||
'hide': item.hide,
|
||||
}
|
||||
menu_list.append(data)
|
||||
# 处理数据源为树状结构
|
||||
result = get_tree(menu_list, 0)
|
||||
# 返回结果
|
||||
return result
|
||||
|
||||
|
||||
# 获取树状结构
|
||||
|
||||
def get_tree(data, parent_id):
|
||||
# 按 parent_id 建立索引，O(n) 构建 + O(n) 遍历
|
||||
children_map = {}
|
||||
for item in data:
|
||||
pid = item["parent_id"]
|
||||
if pid not in children_map:
|
||||
children_map[pid] = []
|
||||
children_map[pid].append(item)
|
||||
|
||||
def build(pid):
|
||||
result = []
|
||||
for item in children_map.get(pid, []):
|
||||
item["children"] = build(item["id"])
|
||||
result.append(item)
|
||||
return result
|
||||
|
||||
return build(parent_id)
|
||||
# 兼容垫片：由 modules.system.menu.service 迁移
|
||||
from modules.system.menu.service import * # noqa: F401,F403
|
||||
|
||||
+2
-138
@@ -1,138 +1,2 @@
|
||||
from datetime import datetime, timezone
|
||||
|
||||
from fastapi.logger import logger
|
||||
from sqlalchemy import and_
|
||||
|
||||
from apps.constants.constants import NOTICE_SOURCE_LIST
|
||||
from apps.constants.message import PAGE_SIZE
|
||||
from apps.forms.notice import NoticeForm
|
||||
from apps.models.notice import Notice
|
||||
from config import FASTAPI_IMAGE_URL
|
||||
from extensions import get_db_session
|
||||
from utils import R
|
||||
from utils.rich_text import save_content
|
||||
from utils.request import like_contains
|
||||
from utils.security import get_user_id
|
||||
|
||||
|
||||
# 查询通知公告分页数据
|
||||
|
||||
def get_notice_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(Notice).filter(Notice.is_delete == 0)
|
||||
# 通知公告标题
|
||||
title = request.query_params.get('title')
|
||||
if title:
|
||||
query = query.filter(Notice.title.like(like_contains(title), escape='\\'))
|
||||
# 通知来源：1官方平台 2开源中国 3CSDN官方 4新浪微博
|
||||
source = request.query_params.get('source')
|
||||
if source:
|
||||
query = query.filter(Notice.source == source)
|
||||
# 通知状态：1-正常 2-停用
|
||||
status = request.query_params.get('status')
|
||||
if status:
|
||||
query = query.filter(Notice.status == status)
|
||||
# 排序
|
||||
query = query.order_by(Notice.id.desc())
|
||||
# 记录总数
|
||||
count = query.count()
|
||||
# 分页查询
|
||||
notice_list = query.limit(limit).offset((page - 1) * limit).all()
|
||||
# 若当前页超出末页（数据被并发删除），自动回退到第一页
|
||||
if page > 1 and not notice_list:
|
||||
page = 1
|
||||
count = query.count()
|
||||
notice_list = query.limit(limit).offset(0).all()
|
||||
# 实例化结果
|
||||
result = []
|
||||
# 遍历数据源
|
||||
if len(notice_list) > 0:
|
||||
for item in notice_list:
|
||||
# 对象转字典
|
||||
data = item.to_dict()
|
||||
# 通知来源描述
|
||||
data['source_name'] = NOTICE_SOURCE_LIST.get(item.source)
|
||||
# 加入列表
|
||||
result.append(data)
|
||||
# 返回结果
|
||||
return R.ok(data=result, count=count)
|
||||
# 根据通知ID查询详情
|
||||
|
||||
def get_notice_detail(notice_id):
|
||||
db = get_db_session()
|
||||
# 根据ID查询通知公告
|
||||
notice = db.query(Notice).filter(and_(Notice.id == notice_id, Notice.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not notice:
|
||||
return None
|
||||
# 对象转字典
|
||||
data = notice.to_dict()
|
||||
# 富文本内容
|
||||
content = (notice.content or "").replace("[IMG_URL]", FASTAPI_IMAGE_URL)
|
||||
data['content'] = content
|
||||
# 通知来源
|
||||
data['source_name'] = NOTICE_SOURCE_LIST.get(notice.source)
|
||||
# 返回结果
|
||||
return data
|
||||
# 添加通知公告
|
||||
|
||||
def add_notice(request, data: NoticeForm):
|
||||
db = get_db_session()
|
||||
# 通知标题
|
||||
title = data.title
|
||||
# 通知内容
|
||||
content = data.content
|
||||
# 处理富文本内容
|
||||
content = save_content(content, title, "notice")
|
||||
|
||||
# 表单数据赋值给对象
|
||||
notice = Notice(**data.model_dump(exclude={'id'}))
|
||||
notice.content = content
|
||||
notice.create_user = get_user_id(request)
|
||||
# 插入数据
|
||||
notice.save()
|
||||
# 返回结果
|
||||
return R.ok(msg="添加成功")
|
||||
|
||||
|
||||
# 更新通知公告
|
||||
|
||||
def update_notice(request, data: NoticeForm):
|
||||
db = get_db_session()
|
||||
# 记录ID判空
|
||||
if not data.id or data.id <= 0:
|
||||
return R.failed("记录ID不能为空")
|
||||
|
||||
# 根据ID查询记录
|
||||
notice = db.query(Notice).filter(and_(Notice.id == data.id, Notice.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not notice:
|
||||
return R.failed("记录不存在")
|
||||
|
||||
# 通知标题
|
||||
title = data.title
|
||||
# 通知内容
|
||||
content = data.content
|
||||
# 处理富文本内容
|
||||
content = save_content(content, title, "notice")
|
||||
# 构造更新数据（排除 id）
|
||||
updData = data.model_dump(exclude={'id'})
|
||||
updData['content'] = content
|
||||
updData['update_user'] = get_user_id(request)
|
||||
updData['update_time'] = datetime.now(tz=timezone.utc)
|
||||
# 更新记录
|
||||
result = db.query(Notice).filter_by(id=data.id).update(updData)
|
||||
# 提交数据
|
||||
if not result:
|
||||
return R.failed("更新失败")
|
||||
# 返回结果
|
||||
return R.ok(msg="更新成功")
|
||||
# 删除通知公告
|
||||
|
||||
def delete_notice(notice_id):
|
||||
return Notice.batch_delete_r(notice_id)
|
||||
# 兼容垫片：由 modules.notice.service 迁移
|
||||
from modules.notice.service import * # noqa: F401,F403
|
||||
|
||||
@@ -1,117 +1,2 @@
|
||||
import logging
|
||||
|
||||
from sqlalchemy import and_
|
||||
|
||||
from apps.constants.constants import OPERATION_SOURCE_LIST, OPERATION_STATUS_LIST
|
||||
from apps.constants.message import PAGE_SIZE
|
||||
from apps.models.operation_log import OperationLog
|
||||
from extensions.sqlalchemy import commit_independently
|
||||
from extensions import get_db_session
|
||||
from utils import R
|
||||
from utils.ip import get_client_ip
|
||||
from utils.ip2region import get_ip_location
|
||||
from utils.ua import parse_user_agent
|
||||
from utils.request import like_contains, parse_id_list
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def record_operation_log(request, title, **kwargs):
|
||||
"""
|
||||
记录操作日志
|
||||
|
||||
使用独立session写入，不受请求事务commit/rollback影响。
|
||||
日志是审计数据，无论业务成功或失败都应持久化。
|
||||
|
||||
Args:
|
||||
request: FastAPI Request 对象
|
||||
title: 操作标题
|
||||
**kwargs: 其他可选参数
|
||||
- type: 请求类型
|
||||
- source: 请求来源（默认0-后台）
|
||||
- method: 请求方法
|
||||
- request_method: 请求方式
|
||||
- url: 请求URL
|
||||
- param: 请求参数
|
||||
- result: 请求结果
|
||||
- consume_time: 请求耗时（毫秒）
|
||||
- status: 操作状态（0-正常，1-异常）
|
||||
- error: 错误描述
|
||||
"""
|
||||
try:
|
||||
# 从 request 提取信息
|
||||
ip = get_client_ip(request)
|
||||
location = get_ip_location(ip)
|
||||
ua = request.headers.get('User-Agent', '')
|
||||
os_name, browser_name = parse_user_agent(ua)
|
||||
|
||||
log = OperationLog(
|
||||
title=title,
|
||||
type=kwargs.get('type', 0),
|
||||
source=kwargs.get('source', 0),
|
||||
method=kwargs.get('method', ''),
|
||||
request_method=kwargs.get('request_method', request.method),
|
||||
url=kwargs.get('url', str(request.url)),
|
||||
param=kwargs.get('param', ''),
|
||||
result=kwargs.get('result', ''),
|
||||
ip=ip,
|
||||
location=location,
|
||||
os=os_name,
|
||||
browser=browser_name,
|
||||
consume_time=kwargs.get('consume_time', 0),
|
||||
status=kwargs.get('status', 0),
|
||||
error=kwargs.get('error', ''),
|
||||
)
|
||||
|
||||
commit_independently(log)
|
||||
return log
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"记录操作日志异常: {str(e)}")
|
||||
return None
|
||||
|
||||
|
||||
def get_operation_log_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(OperationLog).filter(OperationLog.is_delete == 0)
|
||||
# 请求标题
|
||||
title = request.query_params.get('title')
|
||||
if title:
|
||||
query = query.filter(OperationLog.title.like(like_contains(title), escape='\\'))
|
||||
# 请求方式
|
||||
request_method = request.query_params.get('request_method')
|
||||
if request_method:
|
||||
query = query.filter(OperationLog.request_method == request_method)
|
||||
# 操作状态
|
||||
status = request.query_params.get('status')
|
||||
if status:
|
||||
query = query.filter(OperationLog.status == status)
|
||||
# 排序
|
||||
query = query.order_by(OperationLog.id.desc())
|
||||
# 记录总数
|
||||
count = query.count()
|
||||
# 分页查询
|
||||
log_list = query.limit(limit).offset((page - 1) * limit).all()
|
||||
# 若当前页超出末页（数据被并发删除），自动回退到第一页
|
||||
if page > 1 and not log_list:
|
||||
page = 1
|
||||
count = query.count()
|
||||
log_list = query.limit(limit).offset(0).all()
|
||||
# 实例化结果
|
||||
result = []
|
||||
if len(log_list) > 0:
|
||||
for item in log_list:
|
||||
data = item.to_dict()
|
||||
data['source_name'] = OPERATION_SOURCE_LIST.get(item.source)
|
||||
data['status_name'] = OPERATION_STATUS_LIST.get(item.status)
|
||||
result.append(data)
|
||||
return R.ok(data=result, count=count)
|
||||
|
||||
|
||||
def delete_operation_log(ids_str):
|
||||
return OperationLog.batch_delete_r(ids_str)
|
||||
# 兼容垫片：由 modules.log.service 迁移
|
||||
from modules.log.service import * # noqa: F401,F403
|
||||
|
||||
+2
-152
@@ -1,152 +1,2 @@
|
||||
from datetime import datetime, timezone
|
||||
|
||||
from fastapi.logger import logger
|
||||
from sqlalchemy import and_
|
||||
|
||||
from apps.constants.message import PAGE_SIZE
|
||||
from apps.forms.position import PositionForm, PositionStatusForm
|
||||
from apps.models.position import Position
|
||||
from extensions import get_db_session
|
||||
from utils import R
|
||||
from utils.security import get_user_id
|
||||
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)
|
||||
# 岗位名称
|
||||
name = request.query_params.get('name')
|
||||
if name:
|
||||
query = query.filter(Position.name.like(like_contains(name), escape='\\'))
|
||||
# 岗位状态筛选
|
||||
status = request.query_params.get('status')
|
||||
if status:
|
||||
query = query.filter(Position.status == status)
|
||||
# 排序
|
||||
query = query.order_by(Position.sort.asc())
|
||||
# 记录总数
|
||||
count = query.count()
|
||||
# 分页查询
|
||||
position_list = query.limit(limit).offset((page - 1) * limit).all()
|
||||
# 若当前页超出末页（数据被并发删除），自动回退到第一页
|
||||
if page > 1 and not position_list:
|
||||
page = 1
|
||||
count = query.count()
|
||||
position_list = query.limit(limit).offset(0).all()
|
||||
# 实例化结果
|
||||
result = []
|
||||
# 遍历数据源
|
||||
if len(position_list) > 0:
|
||||
for item in position_list:
|
||||
# 对象转字典
|
||||
data = item.to_dict()
|
||||
# 加入列表
|
||||
result.append(data)
|
||||
# 返回结果
|
||||
return R.ok(data=result, count=count)
|
||||
# 根据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()
|
||||
# 查询结果判空
|
||||
if not position:
|
||||
return None
|
||||
# 对象转字典
|
||||
data = position.to_dict()
|
||||
# 返回结果
|
||||
return data
|
||||
# 添加岗位
|
||||
|
||||
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():
|
||||
return R.failed("岗位名称不能重复")
|
||||
# 表单数据赋值给对象
|
||||
position = Position(**data.model_dump(exclude={'id'}))
|
||||
position.create_user = get_user_id(request)
|
||||
# 插入数据
|
||||
position.save()
|
||||
# 返回结果
|
||||
return R.ok(msg="添加成功")
|
||||
|
||||
|
||||
# 更新岗位
|
||||
|
||||
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():
|
||||
return R.failed("岗位名称不能重复")
|
||||
|
||||
# 根据ID查询记录
|
||||
position = db.query(Position).filter(and_(Position.id == data.id, Position.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not position:
|
||||
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)
|
||||
# 提交数据
|
||||
if not result:
|
||||
return R.failed("更新失败")
|
||||
# 返回结果
|
||||
return R.ok(msg="更新成功")
|
||||
# 删除岗位
|
||||
|
||||
def delete_position(position_id):
|
||||
return Position.batch_delete_r(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:
|
||||
return R.failed("记录不存在")
|
||||
|
||||
# 更新记录
|
||||
result = db.query(Position).filter_by(id=data.id).update({
|
||||
"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="设置成功")
|
||||
# 获取岗位数据列表
|
||||
|
||||
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.sort.asc()).all()
|
||||
# 实例化列表
|
||||
position_list = []
|
||||
# 遍历数据源
|
||||
if position_rows:
|
||||
for v in position_rows:
|
||||
# 对象转字典
|
||||
item = v.to_dict()
|
||||
# 加入数组
|
||||
position_list.append(item)
|
||||
# 返回结果
|
||||
return position_list
|
||||
# 兼容垫片：由 modules.system.position.service 迁移
|
||||
from modules.system.position.service import * # noqa: F401,F403
|
||||
|
||||
+2
-177
@@ -1,177 +1,2 @@
|
||||
import asyncio
|
||||
from datetime import datetime, timezone
|
||||
|
||||
from fastapi.logger import logger
|
||||
from sqlalchemy import and_
|
||||
|
||||
from apps.constants.message import PAGE_SIZE
|
||||
from apps.forms.role import RoleForm, RoleStatusForm
|
||||
from apps.models.role import Role
|
||||
from extensions import get_db_session
|
||||
from utils import R
|
||||
from utils.security import get_user_id
|
||||
from utils.request import like_contains, parse_id_list
|
||||
from utils.perm_cache import invalidate_role_perms
|
||||
|
||||
|
||||
# 查询角色分页数据
|
||||
|
||||
def get_role_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(Role).filter(Role.is_delete == 0)
|
||||
# 角色名称
|
||||
name = request.query_params.get('name')
|
||||
if name:
|
||||
query = query.filter(Role.name.like(like_contains(name), escape='\\'))
|
||||
# 排序
|
||||
query = query.order_by(Role.sort.asc())
|
||||
# 记录总数
|
||||
count = query.count()
|
||||
# 查询分页数据
|
||||
role_list = query.limit(limit).offset((page - 1) * limit).all()
|
||||
# 若当前页超出末页（数据被并发删除），自动回退到第一页
|
||||
if page > 1 and not role_list:
|
||||
page = 1
|
||||
count = query.count()
|
||||
role_list = query.limit(limit).offset(0).all()
|
||||
# 实例化返回对象
|
||||
result = []
|
||||
# 遍历数据源
|
||||
if len(role_list) > 0:
|
||||
for item in role_list:
|
||||
# 对象转字典
|
||||
data = item.to_dict()
|
||||
# 加入列表
|
||||
result.append(data)
|
||||
# 返回结果
|
||||
return R.ok(data=result, count=count)
|
||||
# 根据角色ID查询详情
|
||||
|
||||
def get_role_detail(role_id):
|
||||
db = get_db_session()
|
||||
# 根据ID查询角色
|
||||
role = db.query(Role).filter(and_(Role.id == role_id, Role.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not role:
|
||||
return None
|
||||
# 对象转字典
|
||||
data = role.to_dict()
|
||||
# 返回结果
|
||||
return data
|
||||
# 添加角色
|
||||
|
||||
def add_role(request, data: RoleForm):
|
||||
db = get_db_session()
|
||||
# 唯一性校验
|
||||
if db.query(Role).filter(and_(Role.name == data.name, Role.is_delete == 0)).first():
|
||||
return R.failed("角色名称不能重复")
|
||||
# 表单数据赋值给对象
|
||||
role = Role(**data.model_dump(exclude={'id'}))
|
||||
role.create_user = get_user_id(request)
|
||||
# 插入数据
|
||||
role.save()
|
||||
# 返回结果
|
||||
return R.ok(msg="添加成功")
|
||||
|
||||
|
||||
# 更新角色
|
||||
|
||||
def update_role(request, data: RoleForm):
|
||||
db = get_db_session()
|
||||
# 记录ID判空
|
||||
if not data.id or data.id <= 0:
|
||||
return R.failed("记录ID不能为空")
|
||||
# 唯一性校验（排除自身）
|
||||
if db.query(Role).filter(and_(Role.name == data.name, Role.id != data.id, Role.is_delete == 0)).first():
|
||||
return R.failed("角色名称不能重复")
|
||||
|
||||
# 根据ID查询记录
|
||||
role = db.query(Role).filter(and_(Role.id == data.id, Role.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not role:
|
||||
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(Role).filter_by(id=data.id).update(updData)
|
||||
# 提交数据
|
||||
if not result:
|
||||
return R.failed("更新失败")
|
||||
# 返回结果
|
||||
return R.ok(msg="更新成功")
|
||||
# 删除角色
|
||||
|
||||
async def delete_role(role_id):
|
||||
def _delete():
|
||||
db = get_db_session()
|
||||
# 记录ID为空判断
|
||||
if not role_id:
|
||||
return R.failed("记录ID不存在"), None
|
||||
# 分裂字符串
|
||||
id_list = parse_id_list(role_id)
|
||||
if not id_list:
|
||||
return R.failed("记录ID不存在"), None
|
||||
# 批量查询并校验
|
||||
records = db.query(Role).filter(and_(Role.id.in_(id_list), Role.is_delete == 0)).all()
|
||||
if len(records) != len(id_list):
|
||||
return R.failed("记录不存在"), None
|
||||
# 批量设置删除标识
|
||||
for record in records:
|
||||
record.is_delete = 1
|
||||
return None, (id_list, records)
|
||||
|
||||
# 同步DB操作放入线程池，避免阻塞事件循环
|
||||
err, result = await asyncio.to_thread(_delete)
|
||||
if err:
|
||||
return err
|
||||
id_list, records = result
|
||||
|
||||
# 清理被删角色下所有用户的权限缓存
|
||||
for rid in id_list:
|
||||
await invalidate_role_perms(rid)
|
||||
# 返回结果
|
||||
return R.ok(msg="本次共删除{0}条数据".format(len(records)))
|
||||
# 设置状态
|
||||
|
||||
def update_role_status(request, data: RoleStatusForm):
|
||||
db = get_db_session()
|
||||
# 根据ID查询记录
|
||||
role = db.query(Role).filter(and_(Role.id == data.id, Role.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not role:
|
||||
return R.failed("记录不存在")
|
||||
|
||||
# 更新记录
|
||||
result = db.query(Role).filter_by(id=data.id).update({
|
||||
"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="设置成功")
|
||||
# 获取角色列表
|
||||
|
||||
def get_role_list():
|
||||
db = get_db_session()
|
||||
# 查询角色列表
|
||||
role_rows = db.query(Role).filter(and_(Role.is_delete == 0, Role.status == 1)).order_by(Role.sort.asc()).all()
|
||||
# 实例化角色列表
|
||||
role_list = []
|
||||
# 遍历数据源
|
||||
if role_rows:
|
||||
for v in role_rows:
|
||||
# 对象转字典
|
||||
item = v.to_dict()
|
||||
# 加入数组
|
||||
role_list.append(item)
|
||||
# 返回结果
|
||||
return role_list
|
||||
# 兼容垫片：由 modules.system.role.service 迁移
|
||||
from modules.system.role.service import * # noqa: F401,F403
|
||||
|
||||
@@ -1,80 +1,2 @@
|
||||
import asyncio
|
||||
|
||||
from fastapi.logger import logger
|
||||
from sqlalchemy import and_
|
||||
|
||||
from apps.forms.role_menu import RoleMenuForm
|
||||
from apps.models.menu import Menu
|
||||
from apps.models.role_menu import RoleMenu
|
||||
from extensions import get_db_session
|
||||
from utils import R
|
||||
from utils.perm_cache import invalidate_role_perms
|
||||
|
||||
|
||||
# 根据角色ID查询菜单列表
|
||||
|
||||
def get_role_menu_list(role_id):
|
||||
db = get_db_session()
|
||||
# 获取全部菜单列表（仅查询 id、title、parent_id，避免 SELECT * 全量拉取大字段）
|
||||
menuList = db.query(Menu.id, Menu.title, Menu.parent_id).filter(and_(Menu.is_delete == 0, Menu.status == 1)).order_by(Menu.sort.asc()).all()
|
||||
if len(menuList) == 0:
|
||||
return None
|
||||
# 根据角色ID查询角色菜单关系数据
|
||||
role_menu = db.query(RoleMenu).filter(RoleMenu.role_id == role_id).all()
|
||||
# 菜单ID集合
|
||||
idList = []
|
||||
# 遍历角色菜单数据源
|
||||
if role_menu:
|
||||
for v in role_menu:
|
||||
# 加入数组
|
||||
idList.append(v.menu_id)
|
||||
|
||||
# 实例化菜单列表
|
||||
menu_list = []
|
||||
# 遍历菜单数据
|
||||
for menu in menuList:
|
||||
# 菜单ID
|
||||
menu_id = menu.id
|
||||
data = {
|
||||
'id': menu_id,
|
||||
'title': menu.title,
|
||||
'open': True,
|
||||
'parentId': menu.parent_id,
|
||||
}
|
||||
if menu_id in idList:
|
||||
data['checked'] = True
|
||||
# 加入数组
|
||||
menu_list.append(data)
|
||||
# 返回结果
|
||||
return menu_list
|
||||
# 保存角色菜单数据
|
||||
|
||||
async def save_role_menu(request, data: RoleMenuForm):
|
||||
def _save():
|
||||
db = get_db_session()
|
||||
# 角色ID
|
||||
role_id = data.role_id
|
||||
# 菜单ID列表
|
||||
menuIdList = data.menu_id or []
|
||||
|
||||
# 删除当前角色ID相关菜单权限
|
||||
db.query(RoleMenu).filter(RoleMenu.role_id == role_id).delete()
|
||||
|
||||
# 处理菜单数据
|
||||
if menuIdList:
|
||||
new_menus = []
|
||||
for menu_id in menuIdList:
|
||||
if not menu_id:
|
||||
continue
|
||||
new_menus.append(RoleMenu(role_id=role_id, menu_id=menu_id))
|
||||
db.add_all(new_menus)
|
||||
return role_id
|
||||
|
||||
# 同步DB操作放入线程池，避免阻塞事件循环
|
||||
role_id = await asyncio.to_thread(_save)
|
||||
|
||||
# 清理该角色下所有用户的权限缓存
|
||||
await invalidate_role_perms(role_id)
|
||||
|
||||
# 返回结果
|
||||
return R.ok()
|
||||
# 兼容垫片：由 modules.system.role.service 迁移
|
||||
from modules.system.role.service import * # noqa: F401,F403
|
||||
|
||||
+2
-252
@@ -1,252 +1,2 @@
|
||||
import asyncio
|
||||
import io
|
||||
import logging
|
||||
import mimetypes
|
||||
import os
|
||||
import random
|
||||
import re
|
||||
import time
|
||||
|
||||
from config import FASTAPI_TEMP_PATH, FASTAPI_IMAGE_URL, FASTAPI_UPLOAD_DIR
|
||||
from config.app import UPLOAD_ALLOWED_EXTS, UPLOAD_MAX_SIZE_MB
|
||||
from utils import R
|
||||
from utils.file import mkdir, verify_file_magic
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def _parse_allowed_extensions(exts):
|
||||
"""解析允许的扩展名参数，统一转为带点的列表格式
|
||||
|
||||
支持列表或字符串输入，字符串支持逗号/竖线分隔
|
||||
"""
|
||||
if not exts:
|
||||
return []
|
||||
|
||||
if isinstance(exts, list):
|
||||
return [ext if ext.startswith('.') else f'.{ext}' for ext in exts]
|
||||
|
||||
if isinstance(exts, str):
|
||||
if '|' in exts:
|
||||
parts = exts.split('|')
|
||||
elif ',' in exts:
|
||||
parts = exts.split(',')
|
||||
else:
|
||||
parts = [exts]
|
||||
|
||||
result = []
|
||||
for part in parts:
|
||||
part = part.strip().lower()
|
||||
if part:
|
||||
if not part.startswith('.'):
|
||||
part = f'.{part}'
|
||||
result.append(part)
|
||||
return result
|
||||
|
||||
return []
|
||||
|
||||
|
||||
def _is_safe_filename(filename: str) -> bool:
|
||||
"""校验文件名安全性，防止路径遍历攻击
|
||||
|
||||
拒绝包含路径分隔符或 .. 的文件名，确保不会跳出目标目录。
|
||||
"""
|
||||
if not filename:
|
||||
return False
|
||||
# 规范化后检测路径遍历
|
||||
normalized = os.path.normpath(filename)
|
||||
if '..' in normalized.split(os.sep):
|
||||
return False
|
||||
# 文件名不应包含路径分隔符
|
||||
basename = os.path.basename(normalized)
|
||||
return basename == normalized or basename == filename
|
||||
|
||||
|
||||
def _guess_mime_type(ext_with_dot):
|
||||
"""根据扩展名推断MIME类型"""
|
||||
mime_map = {
|
||||
'.jpg': 'image/jpeg', '.jpeg': 'image/jpeg', '.png': 'image/png',
|
||||
'.gif': 'image/gif', '.bmp': 'image/bmp', '.webp': 'image/webp',
|
||||
'.svg': 'image/svg+xml', '.ico': 'image/x-icon',
|
||||
'.txt': 'text/plain', '.pdf': 'application/pdf',
|
||||
'.doc': 'application/msword',
|
||||
'.docx': 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
|
||||
'.xls': 'application/vnd.ms-excel',
|
||||
'.xlsx': 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
|
||||
'.ppt': 'application/vnd.ms-powerpoint',
|
||||
'.pptx': 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
|
||||
'.mp3': 'audio/mpeg', '.mp4': 'video/mp4',
|
||||
'.zip': 'application/zip', '.rar': 'application/x-rar-compressed',
|
||||
'.7z': 'application/x-7z-compressed',
|
||||
}
|
||||
return mime_map.get(ext_with_dot, 'application/octet-stream')
|
||||
|
||||
|
||||
def _get_mime_type(filename, ext_with_dot):
|
||||
"""获取文件的MIME类型"""
|
||||
mime_type, _ = mimetypes.guess_type(filename)
|
||||
if not mime_type:
|
||||
mime_type = _guess_mime_type(ext_with_dot)
|
||||
return mime_type
|
||||
|
||||
|
||||
def _generate_filename(ext_with_dot):
|
||||
"""生成唯一文件名：年月日时分秒 + 5位随机数 + 扩展名"""
|
||||
timestamp = time.strftime('%Y%m%d%H%M%S')
|
||||
random_num = '%05d' % random.randint(0, 99999)
|
||||
return f"{timestamp}{random_num}{ext_with_dot}"
|
||||
|
||||
|
||||
# SVG中需要移除的危险标签和属性
|
||||
_SVG_DANGEROUS_TAGS = re.compile(
|
||||
r'<\s*/?(script|iframe|object|embed|applet|form|input|button|textarea|select|link|meta|base)'
|
||||
r'\b[^>]*>',
|
||||
re.IGNORECASE | re.DOTALL,
|
||||
)
|
||||
|
||||
_SVG_DANGEROUS_ATTRS = re.compile(
|
||||
r'\s+'
|
||||
r'(on\w+' # on* 事件属性：onclick, onload, onerror 等
|
||||
r'|href\s*=\s*["\']?\s*javascript' # javascript: 链接
|
||||
r'|xlink:href\s*=\s*["\']?\s*javascript)'
|
||||
r'[^>]*>',
|
||||
re.IGNORECASE,
|
||||
)
|
||||
|
||||
|
||||
def _sanitize_svg(content: bytes) -> bytes:
|
||||
"""清洗SVG内容，移除可能导致XSS攻击的危险标签和属性"""
|
||||
try:
|
||||
text = content.decode('utf-8')
|
||||
except UnicodeDecodeError:
|
||||
return content
|
||||
|
||||
# 移除危险标签
|
||||
text = _SVG_DANGEROUS_TAGS.sub('', text)
|
||||
# 移除危险属性
|
||||
text = _SVG_DANGEROUS_ATTRS.sub('>', text)
|
||||
return text.encode('utf-8')
|
||||
|
||||
|
||||
def _save_upload(content, original_name, file_ext_with_dot):
|
||||
"""同步校验文件内容并落盘，返回 R 结果（在线程池中执行）"""
|
||||
file_size = len(content)
|
||||
|
||||
# 校验文件大小
|
||||
max_size_bytes = UPLOAD_MAX_SIZE_MB * 1024 * 1024
|
||||
if file_size > max_size_bytes:
|
||||
return R.failed(msg=f"文件大小超过限制，最大允许 {UPLOAD_MAX_SIZE_MB}MB")
|
||||
|
||||
# 校验魔术字节
|
||||
is_valid, magic_msg = verify_file_magic(io.BytesIO(content), file_ext_with_dot)
|
||||
if not is_valid:
|
||||
return R.failed(msg=magic_msg)
|
||||
|
||||
# 生成文件名和路径
|
||||
generated_name = _generate_filename(file_ext_with_dot)
|
||||
date_dir = time.strftime('%Y%m%d')
|
||||
save_dir = os.path.join(FASTAPI_TEMP_PATH, date_dir)
|
||||
mkdir(save_dir)
|
||||
file_path = os.path.join(save_dir, generated_name)
|
||||
|
||||
# 保存文件
|
||||
if file_ext_with_dot == '.svg':
|
||||
content = _sanitize_svg(content)
|
||||
with open(file_path, 'wb') as f:
|
||||
f.write(content)
|
||||
|
||||
# 生成访问信息
|
||||
relative_path = file_path.replace(FASTAPI_UPLOAD_DIR, "").replace("\\", "/")
|
||||
file_url = FASTAPI_IMAGE_URL + relative_path
|
||||
file_ext = file_ext_with_dot[1:] if file_ext_with_dot.startswith('.') else file_ext_with_dot
|
||||
mime_type = _get_mime_type(original_name, file_ext_with_dot)
|
||||
|
||||
result = {
|
||||
'originalName': original_name,
|
||||
'fileExtension': file_ext,
|
||||
'fileType': mime_type,
|
||||
'fileSize': file_size,
|
||||
'fileName': generated_name,
|
||||
'filePath': relative_path,
|
||||
'fileUrl': file_url,
|
||||
}
|
||||
|
||||
return R.ok(msg="上传成功", data=result)
|
||||
|
||||
|
||||
async def upload_image(file):
|
||||
"""上传图片
|
||||
|
||||
Args:
|
||||
file: FastAPI UploadFile 对象
|
||||
|
||||
Returns:
|
||||
R: 上传结果，包含文件信息
|
||||
"""
|
||||
try:
|
||||
if not file or not file.filename:
|
||||
return R.failed(msg="请选择要上传的文件")
|
||||
|
||||
# 获取文件基本信息
|
||||
original_name = file.filename
|
||||
|
||||
# 校验文件名安全性，防止路径遍历
|
||||
if not _is_safe_filename(original_name):
|
||||
return R.failed(msg="文件名不合法")
|
||||
|
||||
file_ext_with_dot = os.path.splitext(original_name)[1].lower()
|
||||
|
||||
# 验证图片扩展名
|
||||
allowed_image_exts = ['.jpg', '.jpeg', '.png', '.gif', '.bmp', '.webp', '.svg', '.ico']
|
||||
if file_ext_with_dot not in allowed_image_exts:
|
||||
return R.failed(msg="文件格式不支持，仅支持图片格式")
|
||||
|
||||
# 读取文件内容
|
||||
content = await file.read()
|
||||
|
||||
# 同步校验与落盘放入线程池，避免阻塞事件循环
|
||||
return await asyncio.to_thread(_save_upload, content, original_name, file_ext_with_dot)
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"图片上传异常: {str(e)}")
|
||||
return R.failed(msg=f"上传失败: {str(e)}")
|
||||
|
||||
|
||||
async def upload_file(file, file_exts=None):
|
||||
"""上传文件（兼容图片和各类文件）
|
||||
|
||||
Args:
|
||||
file: FastAPI UploadFile 对象
|
||||
file_exts: 允许的文件扩展名，默认使用 UPLOAD_ALLOWED_EXTS 全局配置
|
||||
|
||||
Returns:
|
||||
R: 上传结果，包含文件信息
|
||||
"""
|
||||
try:
|
||||
if not file or not file.filename:
|
||||
return R.failed(msg="请选择要上传的文件")
|
||||
|
||||
# 获取文件基本信息
|
||||
original_name = file.filename
|
||||
|
||||
# 校验文件名安全性，防止路径遍历
|
||||
if not _is_safe_filename(original_name):
|
||||
return R.failed(msg="文件名不合法")
|
||||
|
||||
file_ext_with_dot = os.path.splitext(original_name)[1].lower()
|
||||
file_ext = file_ext_with_dot[1:] if file_ext_with_dot.startswith('.') else ''
|
||||
|
||||
# 验证文件扩展名
|
||||
allowed_exts = _parse_allowed_extensions(file_exts or UPLOAD_ALLOWED_EXTS)
|
||||
if allowed_exts and file_ext_with_dot not in allowed_exts:
|
||||
return R.failed(msg=f"文件格式不支持，仅支持 {', '.join(allowed_exts)} 格式")
|
||||
|
||||
# 读取文件内容
|
||||
content = await file.read()
|
||||
|
||||
# 同步校验与落盘放入线程池，避免阻塞事件循环
|
||||
return await asyncio.to_thread(_save_upload, content, original_name, file_ext_with_dot)
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"文件上传异常: {str(e)}")
|
||||
return R.failed(msg=f"上传失败: {str(e)}")
|
||||
# 兼容垫片：由 modules.upload.service 迁移
|
||||
from modules.upload.service import * # noqa: F401,F403
|
||||
|
||||
+2
-381
@@ -1,381 +1,2 @@
|
||||
from datetime import datetime, timezone
|
||||
import asyncio
|
||||
|
||||
from fastapi.logger import logger
|
||||
from sqlalchemy import and_
|
||||
|
||||
from apps.constants.constants import GENDER_LIST
|
||||
from apps.constants.message import PAGE_SIZE, DEFAULT_PASSWORD
|
||||
from apps.forms.user import UserForm, UserStatusForm, UpdatePwdForm, UserInfoForm, ResetPwdForm
|
||||
from apps.models.dept import Dept
|
||||
from apps.models.level import Level
|
||||
from apps.models.position import Position
|
||||
from apps.models.user import User
|
||||
from apps.models.user_role import UserRole
|
||||
from apps.services import user_role
|
||||
from extensions import get_db_session
|
||||
from utils import R
|
||||
from utils import password
|
||||
from utils.rich_text import get_file_url, save_file
|
||||
from utils.request import like_contains
|
||||
from utils.security import get_user_id
|
||||
from utils.perm_cache import invalidate_user_perms
|
||||
|
||||
|
||||
# 查询用户分页数据
|
||||
|
||||
def get_user_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(User).filter(User.is_delete == 0)
|
||||
# 用户账号
|
||||
username = request.query_params.get('username')
|
||||
if username:
|
||||
query = query.filter(User.username.like(like_contains(username), escape='\\'))
|
||||
# 性别
|
||||
gender = request.query_params.get('gender')
|
||||
if gender:
|
||||
query = query.filter(User.gender == gender)
|
||||
# 用户状态
|
||||
status = request.query_params.get('status')
|
||||
if status:
|
||||
query = query.filter(User.status == status)
|
||||
# 排序
|
||||
query = query.order_by(User.id.asc())
|
||||
# 记录总数
|
||||
count = query.count()
|
||||
# 分页查询
|
||||
user_list = query.limit(limit).offset((page - 1) * limit).all()
|
||||
# 若当前页超出末页（数据被并发删除），自动回退到第一页
|
||||
if page > 1 and not user_list:
|
||||
page = 1
|
||||
count = query.count()
|
||||
user_list = query.limit(limit).offset(0).all()
|
||||
# 实例化结果
|
||||
result = []
|
||||
# 遍历数据源
|
||||
if len(user_list) > 0:
|
||||
# 仅查询当前页用到的部门ID
|
||||
dept_ids = {item.dept_id for item in user_list if item.dept_id}
|
||||
deptList = {}
|
||||
if dept_ids:
|
||||
for dept in db.query(Dept).filter(Dept.id.in_(dept_ids), Dept.is_delete == 0).all():
|
||||
deptList[dept.id] = dept.name
|
||||
|
||||
# 仅查询当前页用到的职级ID
|
||||
level_ids = {item.level_id for item in user_list if item.level_id}
|
||||
levelList = {}
|
||||
if level_ids:
|
||||
for level in db.query(Level).filter(Level.id.in_(level_ids), Level.is_delete == 0).all():
|
||||
levelList[level.id] = level.name
|
||||
|
||||
# 仅查询当前页用到的岗位ID
|
||||
position_ids = {item.position_id for item in user_list if item.position_id}
|
||||
positionList = {}
|
||||
if position_ids:
|
||||
for position in db.query(Position).filter(Position.id.in_(position_ids), Position.is_delete == 0).all():
|
||||
positionList[position.id] = position.name
|
||||
|
||||
# 批量查询用户角色
|
||||
user_ids = [item.id for item in user_list]
|
||||
roleMap = user_role.get_user_role_map(user_ids)
|
||||
|
||||
for item in user_list:
|
||||
# 城市
|
||||
city_list = []
|
||||
# 省份编码
|
||||
city_list.append(item.province_code)
|
||||
# 城市编码
|
||||
city_list.append(item.city_code)
|
||||
# 县区编码
|
||||
city_list.append(item.district_code)
|
||||
|
||||
# 对象转字典
|
||||
data = item.to_dict()
|
||||
# 性别
|
||||
data['gender_name'] = GENDER_LIST.get(item.gender)
|
||||
# 头像
|
||||
data['avatar'] = get_file_url(item.avatar) if item.avatar else ""
|
||||
# 部门名称
|
||||
data['dept_name'] = deptList.get(item.dept_id) if deptList else None
|
||||
# 职级名称
|
||||
data['level_name'] = levelList.get(item.level_id) if levelList else None
|
||||
# 岗位名称
|
||||
data['position_name'] = positionList.get(item.position_id) if positionList else None
|
||||
# 角色列表
|
||||
data['roleList'] = roleMap.get(item.id, [])
|
||||
# 行政区划
|
||||
data['city'] = city_list
|
||||
# 加入列表
|
||||
result.append(data)
|
||||
# 返回结果
|
||||
return R.ok(data=result, count=count)
|
||||
# 根据ID查询用户详情
|
||||
|
||||
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()
|
||||
# 查询结果判空
|
||||
if not user:
|
||||
return None
|
||||
|
||||
# 获取用户角色数据
|
||||
roleList = db.query(UserRole).filter(UserRole.user_id == user.id).all()
|
||||
roles = []
|
||||
for role in roleList:
|
||||
roles.append(role.role_id)
|
||||
|
||||
# 城市编码
|
||||
cityList = []
|
||||
# 省份编号
|
||||
cityList.append(user.province_code)
|
||||
# 城市编码
|
||||
cityList.append(user.city_code)
|
||||
# 县区编码
|
||||
cityList.append(user.district_code)
|
||||
|
||||
# 对象转字典
|
||||
data = user.to_dict()
|
||||
# 头像
|
||||
data['avatar'] = get_file_url(user.avatar) if user.avatar else ""
|
||||
# 角色
|
||||
data['roles'] = roles
|
||||
# 行政区划
|
||||
data['city'] = cityList
|
||||
|
||||
# 返回结果
|
||||
return data
|
||||
# 添加用户
|
||||
|
||||
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():
|
||||
return R.failed("登录账号不能重复"), None
|
||||
# 获取表单数据（排除非数据列）
|
||||
formData = data.model_dump(exclude={'city', 'roles'})
|
||||
|
||||
# 图片处理
|
||||
avatar = data.avatar
|
||||
if avatar:
|
||||
formData['avatar'] = save_file(avatar, "user")
|
||||
|
||||
# 密码加密：未传密码时使用默认密码
|
||||
pwd = data.password or DEFAULT_PASSWORD
|
||||
salt = password.generate_salt()
|
||||
formData['password'] = password.encrypt_password(pwd, salt)
|
||||
formData['salt'] = salt
|
||||
|
||||
# 行政区划处理
|
||||
citys = data.city
|
||||
if citys and len(citys) == 3:
|
||||
formData['province_code'] = citys[0]
|
||||
formData['city_code'] = citys[1]
|
||||
formData['district_code'] = citys[2]
|
||||
|
||||
# 表单数据赋值给对象
|
||||
user = User(**formData)
|
||||
user.create_user = get_user_id(request)
|
||||
# 插入数据
|
||||
user.save()
|
||||
return None, user.id
|
||||
|
||||
# 同步DB/文件操作放入线程池，避免阻塞事件循环
|
||||
err, user_id = await asyncio.to_thread(_add)
|
||||
if err:
|
||||
return err
|
||||
|
||||
# 创建用户角色数据 + 清理权限缓存
|
||||
await add_user_role(user_id, data.roles)
|
||||
|
||||
# 返回结果
|
||||
return R.ok(msg="添加成功")
|
||||
|
||||
|
||||
# 更新用户
|
||||
|
||||
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():
|
||||
return R.failed("登录账号不能重复"), None
|
||||
|
||||
# 根据ID查询记录
|
||||
user = db.query(User).filter(and_(User.id == user_id, User.is_delete == 0)).first()
|
||||
# 查询结果判空
|
||||
if not user:
|
||||
return R.failed("记录不存在"), None
|
||||
|
||||
# 获取表单数据（排除敏感字段和非数据列）
|
||||
formData = data.model_dump(exclude={'id', 'password', 'city', 'roles'})
|
||||
|
||||
# 图片处理
|
||||
avatar = data.avatar
|
||||
if avatar:
|
||||
formData['avatar'] = save_file(avatar, "user")
|
||||
|
||||
# 密码加密：仅传入新密码时才更新，否则保留原值
|
||||
pwd = data.password
|
||||
if pwd:
|
||||
salt = password.generate_salt()
|
||||
formData['password'] = password.encrypt_password(pwd, salt)
|
||||
formData['salt'] = salt
|
||||
|
||||
# 行政区划处理
|
||||
citys = data.city
|
||||
if citys and len(citys) == 3:
|
||||
formData['province_code'] = citys[0]
|
||||
formData['city_code'] = citys[1]
|
||||
formData['district_code'] = citys[2]
|
||||
|
||||
updData = formData
|
||||
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)
|
||||
if not result:
|
||||
return R.failed("更新失败"), None
|
||||
return None, user_id
|
||||
|
||||
# 同步DB/文件操作放入线程池，避免阻塞事件循环
|
||||
err, user_id = await asyncio.to_thread(_update)
|
||||
if err:
|
||||
return err
|
||||
|
||||
# 创建用户角色数据 + 清理权限缓存
|
||||
await add_user_role(user_id, data.roles)
|
||||
|
||||
# 返回结果
|
||||
return R.ok(msg="更新成功")
|
||||
# 创建用户角色信息
|
||||
|
||||
async def add_user_role(user_id, roleIdList):
|
||||
def _save():
|
||||
db = get_db_session()
|
||||
# 删除用户角色关系数据
|
||||
db.query(UserRole).filter(UserRole.user_id == user_id).delete()
|
||||
# 创建新的用户角色关系
|
||||
if roleIdList:
|
||||
new_roles = []
|
||||
for roleId in roleIdList:
|
||||
if not roleId:
|
||||
continue
|
||||
new_roles.append(UserRole(user_id=user_id, role_id=roleId))
|
||||
db.add_all(new_roles)
|
||||
|
||||
# 同步DB操作放入线程池，避免阻塞事件循环
|
||||
await asyncio.to_thread(_save)
|
||||
# 清理该用户权限缓存
|
||||
await invalidate_user_perms(user_id)
|
||||
# 删除用户
|
||||
|
||||
def delete_user(user_id):
|
||||
return User.batch_delete_r(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:
|
||||
return R.failed("记录不存在")
|
||||
|
||||
# 更新记录
|
||||
result = db.query(User).filter_by(id=id).update({
|
||||
"status": status,
|
||||
"update_user": get_user_id(request),
|
||||
"update_time": datetime.now(tz=timezone.utc)
|
||||
})
|
||||
# 提交数据
|
||||
if not result:
|
||||
return R.failed("设置失败")
|
||||
# 返回结果
|
||||
return R.ok(msg="设置成功")
|
||||
# 更新用户信息
|
||||
|
||||
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:
|
||||
return R.failed("记录不存在")
|
||||
|
||||
# 更新记录
|
||||
updData = data.model_dump()
|
||||
result = db.query(User).filter_by(id=user_id).update(updData)
|
||||
# 提交数据
|
||||
if not result:
|
||||
return R.failed("更新失败")
|
||||
# 返回结果
|
||||
return R.ok(msg="更新成功")
|
||||
# 更新密码
|
||||
|
||||
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()
|
||||
if not user:
|
||||
return R.failed("用户不存在")
|
||||
|
||||
# 验证原始密码
|
||||
if not password.verify_password(data.oldPassword, user.salt or '', user.password or ''):
|
||||
return R.failed("原始密码不正确")
|
||||
|
||||
# 加密新密码
|
||||
salt = password.generate_salt()
|
||||
new_hash = password.encrypt_password(data.newPassword, salt)
|
||||
result = db.query(User).filter_by(id=user_id).update({
|
||||
"password": new_hash,
|
||||
"salt": salt
|
||||
})
|
||||
# 提交数据
|
||||
if not result:
|
||||
return R.failed("更新失败")
|
||||
# 返回结果
|
||||
return R.ok(msg="更新成功")
|
||||
# 重置密码
|
||||
|
||||
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:
|
||||
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({
|
||||
"password": new_hash,
|
||||
"salt": salt
|
||||
})
|
||||
# 提交数据
|
||||
if not result:
|
||||
return R.failed("重置密码失败")
|
||||
# 返回结果
|
||||
return R.ok(msg="重置密码成功")
|
||||
# 兼容垫片：由 modules.system.user.service 迁移
|
||||
from modules.system.user.service import * # noqa: F401,F403
|
||||
|
||||
@@ -1,48 +1,2 @@
|
||||
from apps.models.user_role import UserRole
|
||||
from apps.models.role import Role
|
||||
from extensions import get_db_session
|
||||
|
||||
|
||||
# 根据用户ID查询角色列表
|
||||
|
||||
def get_user_role_list(userId):
|
||||
db = get_db_session()
|
||||
rows = (
|
||||
db.query(Role.id, Role.name)
|
||||
.join(UserRole, UserRole.role_id == Role.id)
|
||||
.filter(UserRole.user_id == userId, Role.is_delete == 0)
|
||||
.all()
|
||||
)
|
||||
role_list = []
|
||||
if rows:
|
||||
for v in rows:
|
||||
item = {
|
||||
'id': v.id,
|
||||
'name': v.name,
|
||||
}
|
||||
role_list.append(item)
|
||||
return role_list
|
||||
|
||||
|
||||
# 根据用户ID列表批量查询角色，返回 {user_id: [{id, name}, ...]} 字典
|
||||
|
||||
def get_user_role_map(user_ids):
|
||||
if not user_ids:
|
||||
return {}
|
||||
db = get_db_session()
|
||||
# 用ORM查询替代原生SQL，避免tuple单元素/空列表的IN语法问题
|
||||
from apps.models.user_role import UserRole
|
||||
from apps.models.role import Role
|
||||
rows = (
|
||||
db.query(UserRole.user_id, Role.id.label('role_id'), Role.name.label('role_name'))
|
||||
.join(Role, Role.id == UserRole.role_id)
|
||||
.filter(UserRole.user_id.in_(user_ids), Role.is_delete == 0)
|
||||
.all()
|
||||
)
|
||||
role_map = {}
|
||||
for row in rows:
|
||||
uid = row.user_id
|
||||
if uid not in role_map:
|
||||
role_map[uid] = []
|
||||
role_map[uid].append({'id': row.role_id, 'name': row.role_name})
|
||||
return role_map
|
||||
# 兼容垫片：由 modules.system.user.service 迁移
|
||||
from modules.system.user.service import * # noqa: F401,F403
|
||||
|
||||
Reference in New Issue
Block a user