PowLu/RuoYi-Vue3-FastAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 新增SnakeCaseUtil工具类，将原CamelCaseUtil工具类的camel_to_snake函数迁移至SnakeCaseUtil工具类

Browse Source
This commit is contained in:
insistence
2024-05-17 15:59:12 +08:00
parent 4b13e492fc
commit 8b3d04ca06
2 changed files with 44 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ruoyi-fastapi-backend/module_admin/dao/log_dao.py
View File

@@ -3,7 +3,7 @@ from sqlalchemy.ext.asyncio import AsyncSession
from module_admin.entity.do.log_do import SysOperLog, SysLogininfor
from module_admin.entity.vo.log_vo import *
from utils.page_util import PageUtil
from utils.common_util import CamelCaseUtil
from utils.common_util import SnakeCaseUtil
from datetime import datetime, time
@@ -22,10 +22,10 @@ class OperationLogDao:
:return: 操作日志列表信息对象
"""
if query_object.is_asc == 'ascending':
order_by_column = asc(getattr(SysOperLog, CamelCaseUtil.camel_to_snake(query_object.order_by_column), None))
order_by_column = asc(getattr(SysOperLog, SnakeCaseUtil.camel_to_snake(query_object.order_by_column), None))
elif query_object.is_asc == 'descending':
order_by_column = desc(
getattr(SysOperLog, CamelCaseUtil.camel_to_snake(query_object.order_by_column), None))
getattr(SysOperLog, SnakeCaseUtil.camel_to_snake(query_object.order_by_column), None))
else:
order_by_column = desc(SysOperLog.oper_time)
query = select(SysOperLog) \
@@ -98,10 +98,10 @@ class LoginLogDao:
"""
if query_object.is_asc == 'ascending':
order_by_column = asc(
getattr(SysLogininfor, CamelCaseUtil.camel_to_snake(query_object.order_by_column), None))
getattr(SysLogininfor, SnakeCaseUtil.camel_to_snake(query_object.order_by_column), None))
elif query_object.is_asc == 'descending':
order_by_column = desc(
getattr(SysLogininfor, CamelCaseUtil.camel_to_snake(query_object.order_by_column), None))
getattr(SysLogininfor, SnakeCaseUtil.camel_to_snake(query_object.order_by_column), None))
else:
order_by_column = desc(SysLogininfor.login_time)
query = select(SysLogininfor) \