!3 RuoYi-Vue-FastAPI v1.0.1

Merge pull request !3 from insistence/develop

Author: insistence

README.md

@@ -1,17 +1,18 @@
 <p align="center">
 	<img alt="logo" src="https://oscimg.oschina.net/oscnet/up-d3d0a9303e11d522a06cd263f3079027715.png">
 </p>
-<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">RuoYi-Vue-FastAPI v1.0.0</h1>
+<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">RuoYi-Vue-FastAPI v1.0.1</h1>
 <h4 align="center">基于RuoYi-Vue+FastAPI前后端分离的快速开发框架</h4>
 <p align="center">
 	<a href="https://gitee.com/insistence2022/RuoYi-Vue-FastAPI/stargazers"><img src="https://gitee.com/insistence2022/RuoYi-Vue-FastAPI/badge/star.svg?theme=dark"></a>
     <a href="https://github.com/insistence/RuoYi-Vue-FastAPI"><img src="https://img.shields.io/github/stars/insistence/RuoYi-Vue-FastAPI?style=social"></a>
-	<a href="https://gitee.com/insistence2022/RuoYi-Vue-FastAPI"><img src="https://img.shields.io/badge/RuoYiVueFastAPI-v1.0.0-brightgreen.svg"></a>
+	<a href="https://gitee.com/insistence2022/RuoYi-Vue-FastAPI"><img src="https://img.shields.io/badge/RuoYiVueFastAPI-v1.0.1-brightgreen.svg"></a>
 	<a href="https://gitee.com/insistence2022/RuoYi-Vue-FastAPI/blob/master/LICENSE"><img src="https://img.shields.io/github/license/mashape/apistatus.svg"></a>
     <img src="https://img.shields.io/badge/python-≥3.8-blue">
     <img src="https://img.shields.io/badge/MySQL-≥5.7-blue">
 </p>
 
+
 ## 平台简介
 
 RuoYi-Vue-FastAPI是一套全部开源的快速开发平台，毫无保留给个人及企业免费使用。

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 @@ def get_operation_log_list(cls, db: Session, query_object: OperLogPageQueryModel
         :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 @@ def get_operation_log_list(cls, db: Session, query_object: OperLogPageQueryModel
                         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 @@ def get_login_log_list(cls, db: Session, query_object: LoginLogPageQueryModel, i
         :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 @@ def get_login_log_list(cls, db: Session, query_object: LoginLogPageQueryModel, i
                         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

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
 

ruoyi-fastapi-backend/requirements.txt

@@ -1,6 +1,6 @@
 APScheduler==3.10.4
 DateTime==5.4
-fastapi[all]==0.109.0
+fastapi[all]==0.109.1
 loguru==0.7.2
 openpyxl==3.1.2
 pandas==2.1.4

ruoyi-fastapi-backend/utils/common_util.py

@@ -1,6 +1,7 @@
 import pandas as pd
 import io
 import os
+import re
 from openpyxl import Workbook
 from openpyxl.styles import Alignment, PatternFill
 from openpyxl.utils import get_column_letter
@@ -39,10 +40,21 @@ def worship():
 
 class CamelCaseUtil:
     """
-    下划线形式(snake_case)转换为小驼峰形式(camelCase)工具方法
+    小驼峰形式(camelCase)与下划线形式(snake_case)互相转换工具方法
     """
     @classmethod
-    def __to_camel_case(cls, snake_str):
+    def camel_to_snake(cls, camel_str):
+        """
+        小驼峰形式字符串(camelCase)转换为下划线形式字符串(snake_case)
+        :param camel_str: 小驼峰形式字符串
+        :return: 下划线形式字符串
+        """
+        # 在大写字母前添加一个下划线，然后将整个字符串转为小写
+        words = re.sub('(.)([A-Z][a-z]+)', r'\1_\2', camel_str)
+        return re.sub('([a-z0-9])([A-Z])', r'\1_\2', words).lower()
+
+    @classmethod
+    def snake_to_camel(cls, snake_str):
         """
         下划线形式字符串(snake_case)转换为小驼峰形式字符串(camelCase)
         :param snake_str: 下划线形式字符串
@@ -64,7 +76,7 @@ def transform_result(cls, result):
             return result
         # 如果是字典，直接转换键
         elif isinstance(result, dict):
-            return {cls.__to_camel_case(k): v for k, v in result.items()}
+            return {cls.snake_to_camel(k): v for k, v in result.items()}
         # 如果是一组字典或其他类型的列表，遍历列表进行转换
         elif isinstance(result, list):
             return [cls.transform_result(row) if isinstance(row, (dict, Row)) else (cls.transform_result({c.name: getattr(row, c.name) for c in row.__table__.columns}) if row else row) for row in result]