From 97c11dd43e8bbb80c7e7fa04b6d7b97f3e9cf92c Mon Sep 17 00:00:00 2001
From: bunny <1319900154@qq.com>
Date: Fri, 18 Oct 2024 16:57:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=93=E8=A1=A8=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/entity/quartz/QuartzExecuteLog.java   |  2 +-
 .../dao/entity/quartz/SchedulersGroup.java    |  2 +-
 .../mapper/QuartzExecuteLogMapper.xml         | 68 +++++++++----------
 .../mapper/SchedulersGroupMapper.xml          |  4 +-
 4 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/dao/src/main/java/cn/bunny/dao/entity/quartz/QuartzExecuteLog.java b/dao/src/main/java/cn/bunny/dao/entity/quartz/QuartzExecuteLog.java
index b4dcd0a..f5cf902 100644
--- a/dao/src/main/java/cn/bunny/dao/entity/quartz/QuartzExecuteLog.java
+++ b/dao/src/main/java/cn/bunny/dao/entity/quartz/QuartzExecuteLog.java
@@ -20,7 +20,7 @@ import java.time.LocalDateTime;
 @Getter
 @Setter
 @Accessors(chain = true)
-@TableName("quartz_execute_log")
+@TableName("log_quartz_execute")
 @Schema(name = "QuartzExecuteLog对象", title = "调度任务执行日志", description = "调度任务执行日志")
 public class QuartzExecuteLog extends BaseEntity {
 
diff --git a/dao/src/main/java/cn/bunny/dao/entity/quartz/SchedulersGroup.java b/dao/src/main/java/cn/bunny/dao/entity/quartz/SchedulersGroup.java
index b6ec1a1..49fb7e8 100644
--- a/dao/src/main/java/cn/bunny/dao/entity/quartz/SchedulersGroup.java
+++ b/dao/src/main/java/cn/bunny/dao/entity/quartz/SchedulersGroup.java
@@ -18,7 +18,7 @@ import lombok.experimental.Accessors;
 @Getter
 @Setter
 @Accessors(chain = true)
-@TableName("quartz_schedulers_group")
+@TableName("qrtz_schedulers_group")
 @Schema(name = "SchedulersGroup对象", title = "任务调度分组", description = "任务调度分组")
 public class SchedulersGroup extends BaseEntity {
 
diff --git a/service/src/main/resources/mapper/QuartzExecuteLogMapper.xml b/service/src/main/resources/mapper/QuartzExecuteLogMapper.xml
index 795e47c..d384a35 100644
--- a/service/src/main/resources/mapper/QuartzExecuteLogMapper.xml
+++ b/service/src/main/resources/mapper/QuartzExecuteLogMapper.xml
@@ -4,20 +4,20 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="cn.bunny.dao.entity.quartz.QuartzExecuteLog">
-            <id column="id" property="id"/>
-            <id column="create_time" property="createTime"/>
-            <id column="update_time" property="updateTime"/>
-            <id column="create_user" property="createUser"/>
-            <id column="update_user" property="updateUser"/>
-            <id column="is_deleted" property="isDeleted"/>
-            <id column="job_name" property="jobName"/>
-            <id column="job_group" property="jobGroup"/>
-            <id column="job_class_name" property="jobClassName"/>
-            <id column="cron_expression" property="cronExpression"/>
-            <id column="trigger_name" property="triggerName"/>
-            <id column="execute_result" property="executeResult"/>
-            <id column="duration" property="duration"/>
-            <id column="end_time" property="endTime"/>
+        <id column="id" property="id"/>
+        <id column="create_time" property="createTime"/>
+        <id column="update_time" property="updateTime"/>
+        <id column="create_user" property="createUser"/>
+        <id column="update_user" property="updateUser"/>
+        <id column="is_deleted" property="isDeleted"/>
+        <id column="job_name" property="jobName"/>
+        <id column="job_group" property="jobGroup"/>
+        <id column="job_class_name" property="jobClassName"/>
+        <id column="cron_expression" property="cronExpression"/>
+        <id column="trigger_name" property="triggerName"/>
+        <id column="execute_result" property="executeResult"/>
+        <id column="duration" property="duration"/>
+        <id column="end_time" property="endTime"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -29,26 +29,26 @@
     <select id="selectListByPage" resultType="cn.bunny.dao.entity.quartz.QuartzExecuteLog">
         select
         <include refid="Base_Column_List"/>
-        from quartz_execute_log
+        from log_quartz_execute
         <where>
-                <if test="dto.jobName != null and dto.jobName != ''">
-                    and job_name like CONCAT('%',#{dto.jobName},'%')
-                </if>
-                <if test="dto.jobGroup != null and dto.jobGroup != ''">
-                    and job_group like CONCAT('%',#{dto.jobGroup},'%')
-                </if>
-                <if test="dto.jobClassName != null and dto.jobClassName != ''">
-                    and job_class_name like CONCAT('%',#{dto.jobClassName},'%')
-                </if>
-                <if test="dto.cronExpression != null and dto.cronExpression != ''">
-                    and cron_expression like CONCAT('%',#{dto.cronExpression},'%')
-                </if>
-                <if test="dto.triggerName != null and dto.triggerName != ''">
-                    and trigger_name like CONCAT('%',#{dto.triggerName},'%')
-                </if>
-                <if test="dto.endTime != null and dto.endTime != ''">
-                    and end_time like CONCAT('%',#{dto.endTime},'%')
-                </if>
+            <if test="dto.jobName != null and dto.jobName != ''">
+                and job_name like CONCAT('%',#{dto.jobName},'%')
+            </if>
+            <if test="dto.jobGroup != null and dto.jobGroup != ''">
+                and job_group like CONCAT('%',#{dto.jobGroup},'%')
+            </if>
+            <if test="dto.jobClassName != null and dto.jobClassName != ''">
+                and job_class_name like CONCAT('%',#{dto.jobClassName},'%')
+            </if>
+            <if test="dto.cronExpression != null and dto.cronExpression != ''">
+                and cron_expression like CONCAT('%',#{dto.cronExpression},'%')
+            </if>
+            <if test="dto.triggerName != null and dto.triggerName != ''">
+                and trigger_name like CONCAT('%',#{dto.triggerName},'%')
+            </if>
+            <if test="dto.endTime != null and dto.endTime != ''">
+                and end_time like CONCAT('%',#{dto.endTime},'%')
+            </if>
         </where>
         order by update_time desc
     </select>
@@ -56,7 +56,7 @@
     <!-- 物理删除调度任务执行日志 -->
     <delete id="deleteBatchIdsWithPhysics">
         delete
-        from quartz_execute_log
+        from log_quartz_execute
         where id in
         <foreach collection="ids" item="id" open="(" close=")" separator=",">
             #{id}
diff --git a/service/src/main/resources/mapper/SchedulersGroupMapper.xml b/service/src/main/resources/mapper/SchedulersGroupMapper.xml
index c5eac4d..ee74545 100644
--- a/service/src/main/resources/mapper/SchedulersGroupMapper.xml
+++ b/service/src/main/resources/mapper/SchedulersGroupMapper.xml
@@ -23,7 +23,7 @@
     <select id="selectListByPage" resultType="cn.bunny.dao.entity.quartz.SchedulersGroup">
         select
         <include refid="Base_Column_List"/>
-        from quartz_schedulers_group
+        from qrtz_schedulers_group
         <where>
             <if test="dto.groupName != null and dto.groupName != ''">
                 and group_name like CONCAT('%',#{dto.groupName},'%')
@@ -38,7 +38,7 @@
     <!-- 物理删除任务调度分组 -->
     <delete id="deleteBatchIdsWithPhysics">
         delete
-        from quartz_schedulers_group
+        from qrtz_schedulers_group
         where id in
         <foreach collection="ids" item="id" open="(" close=")" separator=",">
             #{id}