!23 RuoYi-Vue-FastAPI v1.6.2

Merge pull request !23 from insistence/develop

Author: insistence

README.md

@@ -1,12 +1,12 @@
 <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.6.1</h1>
+<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">RuoYi-Vue-FastAPI v1.6.2</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.6.1-brightgreen.svg"></a>
+	<a href="https://gitee.com/insistence2022/RuoYi-Vue-FastAPI"><img src="https://img.shields.io/badge/RuoYiVueFastAPI-v1.6.2-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.9-blue">
     <img src="https://img.shields.io/badge/MySQL-≥5.7-blue">

ruoyi-fastapi-backend/.env.dev

@@ -10,7 +10,7 @@ APP_HOST = '0.0.0.0'
 # 应用端口
 APP_PORT = 9099
 # 应用版本
-APP_VERSION= '1.6.1'
+APP_VERSION= '1.6.2'
 # 应用是否开启热重载
 APP_RELOAD = true
 # 应用是否开启IP归属区域查询

ruoyi-fastapi-backend/.env.prod

@@ -10,7 +10,7 @@ APP_HOST = '0.0.0.0'
 # 应用端口
 APP_PORT = 9099
 # 应用版本
-APP_VERSION= '1.6.1'
+APP_VERSION= '1.6.2'
 # 应用是否开启热重载
 APP_RELOAD = false
 # 应用是否开启IP归属区域查询

ruoyi-fastapi-backend/config/constant.py

@@ -252,6 +252,8 @@ class GenConstant:
         'double',
         'decimal',
     ]
+    COLUMNNAME_NOT_ADD_SHOW = ['create_by', 'create_time']
+    COLUMNNAME_NOT_EDIT_SHOW = ['update_by', 'update_time']
     COLUMNNAME_NOT_EDIT = ['id', 'create_by', 'create_time', 'del_flag']
     COLUMNNAME_NOT_LIST = ['id', 'create_by', 'create_time', 'del_flag', 'update_by', 'update_time']
     COLUMNNAME_NOT_QUERY = ['id', 'create_by', 'create_time', 'del_flag', 'update_by', 'update_time', 'remark']

ruoyi-fastapi-backend/config/get_scheduler.py

@@ -201,9 +201,12 @@ def execute_scheduler_job_once(cls, job_info: JobModel):
         job_executor = job_info.job_executor
         if iscoroutinefunction(job_func):
             job_executor = 'default'
+        job_trigger = DateTrigger()
+        if job_info.status == '0':
+            job_trigger = OrTrigger(triggers=[DateTrigger(), MyCronTrigger.from_crontab(job_info.cron_expression)])
         scheduler.add_job(
             func=eval(job_info.invoke_target),
-            trigger=OrTrigger(triggers=[DateTrigger(), MyCronTrigger.from_crontab(job_info.cron_expression)]),
+            trigger=job_trigger,
             args=job_info.job_args.split(',') if job_info.job_args else None,
             kwargs=json.loads(job_info.job_kwargs) if job_info.job_kwargs else None,
             id=str(job_info.job_id),

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

@@ -5,6 +5,7 @@
 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 @@ async def get_operation_log_list(cls, db: AsyncSession, query_object: OperLogPag
                 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(datetime.strptime(query_object.end_time, '%Y-%m-%d'), time(23, 59, 59)),
+                    datetime.combine(TimeFormatUtil.parse_date(query_object.begin_time), time(00, 00, 00)),
+                    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 @@ async def get_login_log_list(cls, db: AsyncSession, query_object: LoginLogPageQu
                 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(datetime.strptime(query_object.end_time, '%Y-%m-%d'), time(23, 59, 59)),
+                    datetime.combine(TimeFormatUtil.parse_date(query_object.begin_time), time(00, 00, 00)),
+                    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/module_admin/service/dict_service.py

@@ -103,9 +103,10 @@ async def edit_dict_type_services(cls, request: Request, query_db: AsyncSession,
                     if dict_type_info.dict_type != page_object.dict_type:
                         for dict_data in dict_data_list:
                             edit_dict_data = DictDataModel(
-                                dictCode=dict_data.dict_code,
+                                dictCode=dict_data.get('dict_code'),
                                 dictType=page_object.dict_type,
                                 updateBy=page_object.update_by,
+                                updateTime=page_object.update_time,
                             ).model_dump(exclude_unset=True)
                             await DictDataDao.edit_dict_data_dao(query_db, edit_dict_data)
                     await DictTypeDao.edit_dict_type_dao(query_db, edit_dict_type)

ruoyi-fastapi-backend/module_admin/service/user_service.py

@@ -494,6 +494,7 @@ async def export_user_list_services(user_list: List):
         }
 
         for item in user_list:
+            item['deptName'] = item.get('dept').get('deptName')
             if item.get('status') == '0':
                 item['status'] = '正常'
             else:

ruoyi-fastapi-backend/module_generator/templates/python/dao.py.jinja2

@@ -118,12 +118,12 @@ class {{ BusinessName }}Dao:
                 {{ ClassName }}.{{ field }} <= query_object.{{ field }} if query_object.{{ field }} else True,
                 {% elif column.query_type == "LIKE" %}
                 {{ ClassName }}.{{ field }}.like(f'%{% raw %}{{% endraw %}query_object.{{ field }}{% raw %}}{% endraw %}%') if query_object.{{ field }} else True,
-                {% elif column.query_type == "BETWEEN" %}
+                {% elif column.html_type == "datetime" and column.query_type == "BETWEEN" %}
                 {{ ClassName }}.{{ field }}.between(
-                    datetime.combine(datetime.strptime(query_object.begin_time, '%Y-%m-%d'), time(00, 00, 00)),
-                    datetime.combine(datetime.strptime(query_object.end_time, '%Y-%m-%d'), time(23, 59, 59)),
+                    datetime.combine(datetime.strptime(query_object.begin_{{ column.column_name }}, '%Y-%m-%d'), time(00, 00, 00)),
+                    datetime.combine(datetime.strptime(query_object.end_{{ column.column_name }}, '%Y-%m-%d'), time(23, 59, 59)),
                 )
-                if query_object.begin_time and query_object.end_time
+                if query_object.begin_{{ column.column_name }} and query_object.end_{{ column.column_name }}
                 else True,
                 {% endif %}
                 {% endif %}
@@ -145,7 +145,7 @@ class {{ BusinessName }}Dao:
         :param {{ businessName }}: {{ functionName }}对象
         :return:
         """
-        db_{{ businessName }} = {{ ClassName }}(**{{ businessName }}.model_dump(exclude={% raw %}{{% endraw %}{% if table.sub %}'{{ subclassName }}_list', {% endif %}{% for column in columns %}{% if not column.insert %}'{{ column.python_field | camel_to_snake  }}'{% if not loop.last %}, {% endif %}{% endif %}{% endfor %}{% raw %}}{% endraw %}))
+        db_{{ businessName }} = {{ ClassName }}(**{{ businessName }}.model_dump(exclude={% raw %}{{% endraw %}{% if table.sub %}'{{ subclassName }}_list', {% endif %}{% for column in columns %}{% if not column.insert and column.column_name not in column_not_add_show + column_not_edit_show %}'{{ column.python_field | camel_to_snake  }}'{% if not loop.last %}, {% endif %}{% endif %}{% endfor %}{% raw %}}{% endraw %}))
         db.add(db_{{ businessName }})
         await db.flush()
 

ruoyi-fastapi-backend/module_generator/templates/python/service.py.jinja2

@@ -103,7 +103,7 @@ class {{ BusinessName }}Service:
         :param page_object: 编辑{{ functionName }}对象
         :return: 编辑{{ functionName }}校验结果
         """
-        edit_{{ businessName }} = page_object.model_dump(exclude_unset=True, exclude={% raw %}{{% endraw %}{% if table.sub %}'{{ subclassName }}_list', {% endif %}{% for column in columns %}{% if not column.edit and not column.pk %}'{{ column.python_field | camel_to_snake  }}'{% if not loop.last %}, {% endif %}{% endif %}{% endfor %}{% raw %}}{% endraw %})
+        edit_{{ businessName }} = page_object.model_dump(exclude_unset=True, exclude={% raw %}{{% endraw %}{% if table.sub %}'{{ subclassName }}_list', {% endif %}{% for column in columns %}{% if not column.edit and not column.pk and column.column_name not in column_not_edit_show %}'{{ column.python_field | camel_to_snake  }}'{% if not loop.last %}, {% endif %}{% endif %}{% endfor %}{% raw %}}{% endraw %})
         {{ businessName }}_info = await cls.{{ businessName }}_detail_services(query_db, page_object.{{ pk_field }})
         if {{ businessName }}_info.{{ pk_field }}:
             {% for column in columns %}