fix: 修复日志管理时间查询报错 #27

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

@@ -5,6 +5,7 @@ from module_admin.entity.do.log_do import SysLogininfor, SysOperLog
 from module_admin.entity.vo.log_vo import LogininforModel, LoginLogPageQueryModel, OperLogModel, OperLogPageQueryModel
 from utils.common_util import SnakeCaseUtil
 from utils.page_util import PageUtil
+from utils.time_format_util import TimeFormatUtil
 
 
 class OperationLogDao:
@@ -38,8 +39,8 @@ class OperationLogDao:
                 SysOperLog.business_type == query_object.business_type if query_object.business_type else True,
                 SysOperLog.status == query_object.status if query_object.status else True,
                 SysOperLog.oper_time.between(
-                    datetime.combine(datetime.strptime(query_object.begin_time, '%Y-%m-%d'), time(00, 00, 00)),
+                    datetime.combine(TimeFormatUtil.parse_date(query_object.begin_time), time(00, 00, 00)),
-                    datetime.combine(datetime.strptime(query_object.end_time, '%Y-%m-%d'), time(23, 59, 59)),
+                    datetime.combine(TimeFormatUtil.parse_date(query_object.end_time), time(23, 59, 59)),
                 )
                 if query_object.begin_time and query_object.end_time
                 else True,
@@ -120,8 +121,8 @@ class LoginLogDao:
                 SysLogininfor.user_name.like(f'%{query_object.user_name}%') if query_object.user_name else True,
                 SysLogininfor.status == query_object.status if query_object.status else True,
                 SysLogininfor.login_time.between(
-                    datetime.combine(datetime.strptime(query_object.begin_time, '%Y-%m-%d'), time(00, 00, 00)),
+                    datetime.combine(TimeFormatUtil.parse_date(query_object.begin_time), time(00, 00, 00)),
-                    datetime.combine(datetime.strptime(query_object.end_time, '%Y-%m-%d'), time(23, 59, 59)),
+                    datetime.combine(TimeFormatUtil.parse_date(query_object.end_time), time(23, 59, 59)),
                 )
                 if query_object.begin_time and query_object.end_time
                 else True,

ruoyi-fastapi-backend/utils/time_format_util.py

@@ -1,4 +1,7 @@
-import datetime
+from copy import deepcopy
+from datetime import datetime
+from dateutil.parser import parse
+from typing import Dict, List, Union
 
 
 def object_format_datetime(obj):
@@ -8,7 +11,7 @@ def object_format_datetime(obj):
     """
     for attr in dir(obj):
         value = getattr(obj, attr)
-        if isinstance(value, datetime.datetime):
+        if isinstance(value, datetime):
             setattr(obj, attr, value.strftime('%Y-%m-%d %H:%M:%S'))
     return obj
 
@@ -21,7 +24,7 @@ def list_format_datetime(lst):
     for obj in lst:
         for attr in dir(obj):
             value = getattr(obj, attr)
-            if isinstance(value, datetime.datetime):
+            if isinstance(value, datetime):
                 setattr(obj, attr, value.strftime('%Y-%m-%d %H:%M:%S'))
     return lst
 
@@ -41,7 +44,7 @@ def format_datetime_dict_list(dicts):
             if isinstance(v, dict):
                 # 递归遍历子字典
                 new_item[k] = format_datetime_dict_list([v])[0]
-            elif isinstance(v, datetime.datetime):
+            elif isinstance(v, datetime):
                 # 如果值是 datetime 类型，则格式化为字符串
                 new_item[k] = v.strftime('%Y-%m-%d %H:%M:%S')
             else:
@@ -50,3 +53,89 @@ def format_datetime_dict_list(dicts):
         result.append(new_item)
 
     return result
+
+
+class TimeFormatUtil:
+    """
+    时间格式化工具类
+    """
+
+    @classmethod
+    def format_time(cls, time_info: Union[str, datetime], format: str = '%Y-%m-%d %H:%M:%S'):
+        """
+        格式化时间字符串或datetime对象为指定格式
+
+        :param time_info: 时间字符串或datetime对象
+        :param format: 格式化格式，默认为'%Y-%m-%d %H:%M:%S'
+        :return: 格式化后的时间字符串
+        """
+        if isinstance(time_info, datetime):
+            format_date = time_info.strftime(format)
+        else:
+            try:
+                date = parse(time_info)
+                format_date = date.strftime(format)
+            except Exception:
+                format_date = time_info
+
+        return format_date
+
+    @classmethod
+    def parse_date(cls, time_str: str):
+        """
+        解析时间字符串提取日期部分
+
+        :param time_str: 时间字符串
+        :return: 日期部分
+        """
+        try:
+            dt = parse(time_str)
+            return dt.date()
+        except Exception:
+            return time_str
+
+    @classmethod
+    def format_time_dict(cls, time_dict: Dict, format: str = '%Y-%m-%d %H:%M:%S'):
+        """
+        格式化时间字典
+
+        :param time_dict: 时间字典
+        :param format: 格式化格式，默认为'%Y-%m-%d %H:%M:%S'
+        :return: 格式化后的时间字典
+        """
+        copy_time_dict = deepcopy(time_dict)
+        for k, v in copy_time_dict.items():
+            if isinstance(v, (str, datetime)):
+                copy_time_dict[k] = cls.format_time(v, format)
+            elif isinstance(v, dict):
+                copy_time_dict[k] = cls.format_time_dict(v, format)
+            elif isinstance(v, list):
+                copy_time_dict[k] = cls.format_time_list(v, format)
+            else:
+                copy_time_dict[k] = v
+
+        return copy_time_dict
+
+    @classmethod
+    def format_time_list(cls, time_list: List, format: str = '%Y-%m-%d %H:%M:%S'):
+        """
+        格式化时间列表
+
+        :param time_list: 时间列表
+        :param format: 格式化格式，默认为'%Y-%m-%d %H:%M:%S'
+        :return: 格式化后的时间列表
+        """
+        format_time_list = []
+        for item in time_list:
+            if isinstance(item, (str, datetime)):
+                format_item = cls.format_time(item, format)
+            elif isinstance(item, dict):
+                format_item = cls.format_time_dict(item, format)
+            elif isinstance(item, list):
+                format_item = cls.format_time_list(item, format)
+            else:
+                format_item = item
+
+            format_time_list.append(format_item)
+
+        return format_time_list