refactor: 重构数据库orm为异步 #I9MRQS

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

@@ -1,4 +1,5 @@
-from sqlalchemy.orm import Session
+from sqlalchemy import select, update, delete
+from sqlalchemy.ext.asyncio import AsyncSession
 from module_admin.entity.do.job_do import SysJob
 from module_admin.entity.vo.job_vo import *
 from utils.page_util import PageUtil
@@ -10,38 +11,40 @@ class JobDao:
     """
 
     @classmethod
-    def get_job_detail_by_id(cls, db: Session, job_id: int):
+    async def get_job_detail_by_id(cls, db: AsyncSession, job_id: int):
         """
         根据定时任务id获取定时任务详细信息
         :param db: orm对象
         :param job_id: 定时任务id
         :return: 定时任务信息对象
         """
-        job_info = db.query(SysJob) \
-            .filter(SysJob.job_id == job_id) \
-            .first()
+        job_info = (await db.execute(
+            select(SysJob)
+                .where(SysJob.job_id == job_id)
+        )).scalars().first()
 
         return job_info
 
     @classmethod
-    def get_job_detail_by_info(cls, db: Session, job: JobModel):
+    async def get_job_detail_by_info(cls, db: AsyncSession, job: JobModel):
         """
         根据定时任务参数获取定时任务信息
         :param db: orm对象
         :param job: 定时任务参数对象
         :return: 定时任务信息对象
         """
-        job_info = db.query(SysJob) \
-            .filter(SysJob.job_name == job.job_name if job.job_name else True,
-                    SysJob.job_group == job.job_group if job.job_group else True,
-                    SysJob.invoke_target == job.invoke_target if job.invoke_target else True,
-                    SysJob.cron_expression == job.cron_expression if job.cron_expression else True) \
-            .first()
+        job_info = (await db.execute(
+            select(SysJob)
+                .where(SysJob.job_name == job.job_name if job.job_name else True,
+                       SysJob.job_group == job.job_group if job.job_group else True,
+                       SysJob.invoke_target == job.invoke_target if job.invoke_target else True,
+                       SysJob.cron_expression == job.cron_expression if job.cron_expression else True)
+        )).scalars().first()
 
         return job_info
 
     @classmethod
-    def get_job_list(cls, db: Session, query_object: JobPageQueryModel, is_page: bool = False):
+    async def get_job_list(cls, db: AsyncSession, query_object: JobPageQueryModel, is_page: bool = False):
         """
         根据查询参数获取定时任务列表信息
         :param db: orm对象
@@ -49,31 +52,32 @@ class JobDao:
         :param is_page: 是否开启分页
         :return: 定时任务列表信息对象
         """
-        query = db.query(SysJob) \
-            .filter(SysJob.job_name.like(f'%{query_object.job_name}%') if query_object.job_name else True,
-                    SysJob.job_group == query_object.job_group if query_object.job_group else True,
-                    SysJob.status == query_object.status if query_object.status else True
-                    ) \
+        query = select(SysJob) \
+            .where(SysJob.job_name.like(f'%{query_object.job_name}%') if query_object.job_name else True,
+                   SysJob.job_group == query_object.job_group if query_object.job_group else True,
+                   SysJob.status == query_object.status if query_object.status else True) \
             .distinct()
-        job_list = PageUtil.paginate(query, query_object.page_num, query_object.page_size, is_page)
+        job_list = await PageUtil.paginate(db, query, query_object.page_num, query_object.page_size, is_page)
 
         return job_list
 
     @classmethod
-    def get_job_list_for_scheduler(cls, db: Session):
+    async def get_job_list_for_scheduler(cls, db: AsyncSession):
         """
         获取定时任务列表信息
         :param db: orm对象
         :return: 定时任务列表信息对象
         """
-        job_list = db.query(SysJob) \
-            .filter(SysJob.status == 0) \
-            .distinct().all()
+        job_list = (await db.execute(
+            select(SysJob)
+                .where(SysJob.status == 0)
+                .distinct()
+        )).scalars().all()
 
         return job_list
 
     @classmethod
-    def add_job_dao(cls, db: Session, job: JobModel):
+    async def add_job_dao(cls, db: AsyncSession, job: JobModel):
         """
         新增定时任务数据库操作
         :param db: orm对象
@@ -82,30 +86,32 @@ class JobDao:
         """
         db_job = SysJob(**job.model_dump())
         db.add(db_job)
-        db.flush()
+        await db.flush()
 
         return db_job
 
     @classmethod
-    def edit_job_dao(cls, db: Session, job: dict):
+    async def edit_job_dao(cls, db: AsyncSession, job: dict):
         """
         编辑定时任务数据库操作
         :param db: orm对象
         :param job: 需要更新的定时任务字典
         :return:
         """
-        db.query(SysJob) \
-            .filter(SysJob.job_id == job.get('job_id')) \
-            .update(job)
+        await db.execute(
+            update(SysJob),
+            [job]
+        )
 
     @classmethod
-    def delete_job_dao(cls, db: Session, job: JobModel):
+    async def delete_job_dao(cls, db: AsyncSession, job: JobModel):
         """
         删除定时任务数据库操作
         :param db: orm对象
         :param job: 定时任务对象
         :return:
         """
-        db.query(SysJob) \
-            .filter(SysJob.job_id == job.job_id) \
-            .delete()
+        await db.execute(
+            delete(SysJob)
+                .where(SysJob.job_id.in_([job.job_id]))
+        )