From 76ea949d32a91d7af6f20717ca647e0671404176 Mon Sep 17 00:00:00 2001
From: insistence <3055204202@qq.com>
Date: Sun, 4 Feb 2024 11:35:44 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=97=A5=E5=BF=97=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module_admin/dao/log_dao.py                | 18 ++++++++++++++++--
 .../module_admin/entity/vo/log_vo.py           |  4 ++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/ruoyi-fastapi-backend/module_admin/dao/log_dao.py b/ruoyi-fastapi-backend/module_admin/dao/log_dao.py
index 7fefc8f..b2abd54 100644
--- a/ruoyi-fastapi-backend/module_admin/dao/log_dao.py
+++ b/ruoyi-fastapi-backend/module_admin/dao/log_dao.py
@@ -1,7 +1,9 @@
+from sqlalchemy import asc, desc
 from sqlalchemy.orm import Session
 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 datetime import datetime, time
 
 
@@ -18,6 +20,12 @@ class OperationLogDao:
         :param is_page: 是否开启分页
         :return: 操作日志列表信息对象
         """
+        if query_object.is_asc == 'ascending':
+            order_by_column = asc(getattr(SysOperLog, CamelCaseUtil.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))
+        else:
+            order_by_column = desc(SysOperLog.oper_time)
         query = db.query(SysOperLog) \
             .filter(SysOperLog.title.like(f'%{query_object.title}%') if query_object.title else True,
                     SysOperLog.oper_name.like(f'%{query_object.oper_name}%') if query_object.oper_name else True,
@@ -28,7 +36,7 @@ class OperationLogDao:
                         datetime.combine(datetime.strptime(query_object.end_time, '%Y-%m-%d'), time(23, 59, 59)))
                                 if query_object.begin_time and query_object.end_time else True
                     )\
-            .distinct()
+            .distinct().order_by(order_by_column)
         operation_log_list = PageUtil.paginate(query, query_object.page_num, query_object.page_size, is_page)
 
         return operation_log_list
@@ -84,6 +92,12 @@ class LoginLogDao:
         :param is_page: 是否开启分页
         :return: 登录日志列表信息对象
         """
+        if query_object.is_asc == 'ascending':
+            order_by_column = asc(getattr(SysLogininfor, CamelCaseUtil.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))
+        else:
+            order_by_column = desc(SysLogininfor.login_time)
         query = db.query(SysLogininfor) \
             .filter(SysLogininfor.ipaddr.like(f'%{query_object.ipaddr}%') if query_object.ipaddr else True,
                     SysLogininfor.user_name.like(f'%{query_object.user_name}%') if query_object.user_name else True,
@@ -93,7 +107,7 @@ class LoginLogDao:
                         datetime.combine(datetime.strptime(query_object.end_time, '%Y-%m-%d'), time(23, 59, 59)))
                                 if query_object.begin_time and query_object.end_time else True
                     )\
-            .distinct()
+            .distinct().order_by(order_by_column)
         login_log_list = PageUtil.paginate(query, query_object.page_num, query_object.page_size, is_page)
 
         return login_log_list
diff --git a/ruoyi-fastapi-backend/module_admin/entity/vo/log_vo.py b/ruoyi-fastapi-backend/module_admin/entity/vo/log_vo.py
index d410a23..604bb5d 100644
--- a/ruoyi-fastapi-backend/module_admin/entity/vo/log_vo.py
+++ b/ruoyi-fastapi-backend/module_admin/entity/vo/log_vo.py
@@ -51,6 +51,8 @@ class OperLogQueryModel(OperLogModel):
     """
     操作日志管理不分页查询模型
     """
+    order_by_column: Optional[str] = None
+    is_asc: Optional[str] = None
     begin_time: Optional[str] = None
     end_time: Optional[str] = None
 
@@ -78,6 +80,8 @@ class LoginLogQueryModel(LogininforModel):
     """
     登录日志管理不分页查询模型
     """
+    order_by_column: Optional[str] = None
+    is_asc: Optional[str] = None
     begin_time: Optional[str] = None
     end_time: Optional[str] = None