feat: 日志管理模块新增字段排序查询

Author: insistence

dash-fastapi-backend/module_admin/dao/log_dao.py

@@ -1,3 +1,4 @@
+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 OperLogModel, LogininforModel, OperLogQueryModel, LoginLogQueryModel
@@ -32,6 +33,12 @@ def get_operation_log_list(cls, db: Session, query_object: OperLogQueryModel):
         :param query_object: 查询参数对象
         :return: 操作日志列表信息对象
         """
+        if query_object.is_asc == 'ascend':
+            order_by_column = asc(getattr(SysOperLog, query_object.order_by_column, None))
+        elif query_object.is_asc == 'descend':
+            order_by_column = desc(getattr(SysOperLog, query_object.order_by_column, None))
+        else:
+            order_by_column = asc(SysOperLog.oper_time)
         operation_log_list = 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,
@@ -42,7 +49,7 @@ def get_operation_log_list(cls, db: Session, query_object: OperLogQueryModel):
                         datetime.combine(datetime.strptime(query_object.oper_time_end, '%Y-%m-%d'), time(23, 59, 59)))
                                 if query_object.oper_time_start and query_object.oper_time_end else True
                     )\
-            .distinct().all()
+            .distinct().order_by(order_by_column).all()
 
         return list_format_datetime(operation_log_list)
 
@@ -96,6 +103,12 @@ def get_login_log_list(cls, db: Session, query_object: LoginLogQueryModel):
         :param query_object: 查询参数对象
         :return: 登录日志列表信息对象
         """
+        if query_object.is_asc == 'ascend':
+            order_by_column = asc(getattr(SysLogininfor, query_object.order_by_column, None))
+        elif query_object.is_asc == 'descend':
+            order_by_column = desc(getattr(SysLogininfor, query_object.order_by_column, None))
+        else:
+            order_by_column = asc(SysLogininfor.login_time)
         login_log_list = 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,
@@ -105,7 +118,7 @@ def get_login_log_list(cls, db: Session, query_object: LoginLogQueryModel):
                         datetime.combine(datetime.strptime(query_object.login_time_end, '%Y-%m-%d'), time(23, 59, 59)))
                                 if query_object.login_time_start and query_object.login_time_end else True
                     )\
-            .distinct().all()
+            .distinct().order_by(order_by_column).all()
 
         return list_format_datetime(login_log_list)
 

dash-fastapi-backend/module_admin/entity/vo/log_vo.py

@@ -50,6 +50,8 @@ class OperLogQueryModel(OperLogModel):
     """
     操作日志管理不分页查询模型
     """
+    order_by_column: Optional[str]
+    is_asc: Optional[str]
     oper_time_start: Optional[str]
     oper_time_end: Optional[str]
 
@@ -91,6 +93,8 @@ class LoginLogQueryModel(LogininforModel):
     """
     登录日志管理不分页查询模型
     """
+    order_by_column: Optional[str]
+    is_asc: Optional[str]
     login_time_start: Optional[str]
     login_time_end: Optional[str]
 

dash-fastapi-frontend/callbacks/monitor_c/logininfor_c.py

@@ -21,6 +21,7 @@
     inputs=dict(
         search_click=Input('login_log-search', 'nClicks'),
         refresh_click=Input('login_log-refresh', 'nClicks'),
+        sorter=Input('login_log-list-table', 'sorter'),
         pagination=Input('login_log-list-table', 'pagination'),
         operations=Input('login_log-operations-store', 'data')
     ),
@@ -33,7 +34,7 @@
     ),
     prevent_initial_call=True
 )
-def get_login_log_table_data(search_click, refresh_click, pagination, operations, ipaddr, user_name, status_select, login_time_range, button_perms):
+def get_login_log_table_data(search_click, refresh_click, sorter, pagination, operations, ipaddr, user_name, status_select, login_time_range, button_perms):
     """
     获取登录日志表格数据回调（进行表格相关增删查改操作后均会触发此回调）
     """
@@ -49,17 +50,21 @@ def get_login_log_table_data(search_click, refresh_click, pagination, operations
         status=status_select,
         login_time_start=login_time_start,
         login_time_end=login_time_end,
+        order_by_column=sorter.get('columns')[0] if sorter else None,
+        is_asc=sorter.get('orders')[0] if sorter else None,
         page_num=1,
         page_size=10
     )
-    triggered_id = dash.ctx.triggered_id
-    if triggered_id == 'login_log-list-table':
+    triggered_prop = dash.ctx.triggered[0].get('prop_id')
+    if triggered_prop == 'login_log-list-table.pagination':
         query_params = dict(
             ipaddr=ipaddr,
             user_name=user_name,
             status=status_select,
             login_time_start=login_time_start,
             login_time_end=login_time_end,
+            order_by_column=sorter.get('columns')[0] if sorter else None,
+            is_asc=sorter.get('orders')[0] if sorter else None,
             page_num=pagination['current'],
             page_size=pagination['pageSize']
         )

dash-fastapi-frontend/callbacks/monitor_c/operlog_c.py

@@ -23,6 +23,7 @@
     inputs=dict(
         search_click=Input('operation_log-search', 'nClicks'),
         refresh_click=Input('operation_log-refresh', 'nClicks'),
+        sorter=Input('operation_log-list-table', 'sorter'),
         pagination=Input('operation_log-list-table', 'pagination'),
         operations=Input('operation_log-operations-store', 'data')
     ),
@@ -36,7 +37,7 @@
     ),
     prevent_initial_call=True
 )
-def get_operation_log_table_data(search_click, refresh_click, pagination, operations, title, oper_name, business_type, status_select, oper_time_range, button_perms):
+def get_operation_log_table_data(search_click, refresh_click, sorter, pagination, operations, title, oper_name, business_type, status_select, oper_time_range, button_perms):
     """
     获取操作日志表格数据回调（进行表格相关增删查改操作后均会触发此回调）
     """
@@ -53,18 +54,22 @@ def get_operation_log_table_data(search_click, refresh_click, pagination, operat
         status=status_select,
         oper_time_start=oper_time_start,
         oper_time_end=oper_time_end,
+        order_by_column=sorter.get('columns')[0] if sorter else None,
+        is_asc=sorter.get('orders')[0] if sorter else None,
         page_num=1,
         page_size=10
     )
-    triggered_id = dash.ctx.triggered_id
-    if triggered_id == 'operation_log-list-table':
+    triggered_prop = dash.ctx.triggered[0].get('prop_id')
+    if triggered_prop == 'operation_log-list-table.pagination':
         query_params = dict(
             title=title,
             oper_name=oper_name,
             business_type=business_type,
             status=status_select,
             oper_time_start=oper_time_start,
             oper_time_end=oper_time_end,
+            order_by_column=sorter.get('columns')[0] if sorter else None,
+            is_asc=sorter.get('orders')[0] if sorter else None,
             page_num=pagination['current'],
             page_size=pagination['pageSize']
         )

dash-fastapi-frontend/views/monitor/logininfor/__init__.py

@@ -331,6 +331,10 @@ def render(button_perms):
                                             rowSelectionType='checkbox',
                                             rowSelectionWidth=50,
                                             bordered=True,
+                                            sortOptions={
+                                                'sortDataIndexes': ['user_name', 'login_time'],
+                                                'multiple': False
+                                            },
                                             pagination={
                                                 'pageSize': page_size,
                                                 'current': page_num,

dash-fastapi-frontend/views/monitor/operlog/__init__.py

@@ -361,6 +361,10 @@ def render(button_perms):
                                             rowSelectionType='checkbox',
                                             rowSelectionWidth=50,
                                             bordered=True,
+                                            sortOptions={
+                                                'sortDataIndexes': ['oper_name', 'oper_time'],
+                                                'multiple': False
+                                            },
                                             pagination={
                                                 'pageSize': page_size,
                                                 'current': page_num,