change job log id to id

martin-bian · martin-bian · commit d18ebfc999cf · 2023-04-02T21:53:00.000+08:00
diff --git a/dimple-modules/dimple-job/dimple-job-service/src/main/java/com/dimple/job/service/entity/SysJobLog.java b/dimple-modules/dimple-job/dimple-job-service/src/main/java/com/dimple/job/service/entity/SysJobLog.java
@@ -2,8 +2,7 @@
 
 import com.dimple.common.core.annotation.Excel;
 import com.dimple.common.core.web.entity.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import lombok.Data;
 
 import java.util.Date;
 
@@ -12,14 +11,15 @@
  *
  * @author Dimple
  */
+@Data
 public class SysJobLog extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     /**
      * ID
      */
     @Excel(name = "日志序号")
-    private Long jobLogId;
+    private Long id;
 
     /**
      * 任务名称
@@ -67,89 +67,5 @@ public class SysJobLog extends BaseEntity {
      */
     private Date stopTime;
 
-    public Long getJobLogId() {
-        return jobLogId;
-    }
 
-    public void setJobLogId(Long jobLogId) {
-        this.jobLogId = jobLogId;
-    }
-
-    public String getJobName() {
-        return jobName;
-    }
-
-    public void setJobName(String jobName) {
-        this.jobName = jobName;
-    }
-
-    public String getJobGroup() {
-        return jobGroup;
-    }
-
-    public void setJobGroup(String jobGroup) {
-        this.jobGroup = jobGroup;
-    }
-
-    public String getInvokeTarget() {
-        return invokeTarget;
-    }
-
-    public void setInvokeTarget(String invokeTarget) {
-        this.invokeTarget = invokeTarget;
-    }
-
-    public String getJobMessage() {
-        return jobMessage;
-    }
-
-    public void setJobMessage(String jobMessage) {
-        this.jobMessage = jobMessage;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getExceptionInfo() {
-        return exceptionInfo;
-    }
-
-    public void setExceptionInfo(String exceptionInfo) {
-        this.exceptionInfo = exceptionInfo;
-    }
-
-    public Date getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(Date startTime) {
-        this.startTime = startTime;
-    }
-
-    public Date getStopTime() {
-        return stopTime;
-    }
-
-    public void setStopTime(Date stopTime) {
-        this.stopTime = stopTime;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("jobLogId", getJobLogId())
-                .append("jobName", getJobName())
-                .append("jobGroup", getJobGroup())
-                .append("jobMessage", getJobMessage())
-                .append("status", getStatus())
-                .append("exceptionInfo", getExceptionInfo())
-                .append("startTime", getStartTime())
-                .append("stopTime", getStopTime())
-                .toString();
-    }
 }
diff --git a/dimple-modules/dimple-job/dimple-job-service/src/main/java/com/dimple/job/service/mapper/SysJobLogMapper.java b/dimple-modules/dimple-job/dimple-job-service/src/main/java/com/dimple/job/service/mapper/SysJobLogMapper.java
@@ -28,10 +28,10 @@ public interface SysJobLogMapper {
     /**
      * 通过调度任务日志ID查询调度信息
      *
-     * @param jobLogId 调度任务日志ID
+     * @param id 调度任务日志ID
      * @return 调度任务日志对象信息
      */
-    SysJobLog selectJobLogById(Long jobLogId);
+    SysJobLog selectJobLogById(Long id);
 
     /**
      * 新增任务日志
diff --git a/dimple-modules/dimple-job/dimple-job-service/src/main/java/com/dimple/job/service/service/SysJobLogService.java b/dimple-modules/dimple-job/dimple-job-service/src/main/java/com/dimple/job/service/service/SysJobLogService.java
@@ -21,10 +21,10 @@ public interface SysJobLogService {
     /**
      * 通过调度任务日志ID查询调度信息
      *
-     * @param jobLogId 调度任务日志ID
+     * @param id 调度任务日志ID
      * @return 调度任务日志对象信息
      */
-    SysJobLogBO selectJobLogById(Long jobLogId);
+    SysJobLogBO selectJobLogById(Long id);
 
     /**
      * 新增任务日志
diff --git a/dimple-modules/dimple-job/dimple-job-service/src/main/java/com/dimple/job/service/service/bo/SysJobLogBO.java b/dimple-modules/dimple-job/dimple-job-service/src/main/java/com/dimple/job/service/service/bo/SysJobLogBO.java
@@ -19,7 +19,7 @@ public class SysJobLogBO extends BaseEntity {
      * ID
      */
     @Excel(name = "日志序号")
-    private Long jobLogId;
+    private Long id;
 
     /**
      * 任务名称
diff --git a/dimple-modules/dimple-job/dimple-job-service/src/main/java/com/dimple/job/service/service/impl/SysJobLogServiceImpl.java b/dimple-modules/dimple-job/dimple-job-service/src/main/java/com/dimple/job/service/service/impl/SysJobLogServiceImpl.java
@@ -35,12 +35,12 @@ public List<SysJobLogBO> selectJobLogList(SysJobLogBO jobLog) {
     /**
      * 通过调度任务日志ID查询调度信息
      *
-     * @param jobLogId 调度任务日志ID
+     * @param id 调度任务日志ID
      * @return 调度任务日志对象信息
      */
     @Override
-    public SysJobLogBO selectJobLogById(Long jobLogId) {
-        return BeanMapper.convert(jobLogMapper.selectJobLogById(jobLogId), SysJobLogBO.class);
+    public SysJobLogBO selectJobLogById(Long id) {
+        return BeanMapper.convert(jobLogMapper.selectJobLogById(id), SysJobLogBO.class);
     }
 
     /**
diff --git a/dimple-modules/dimple-job/dimple-job-web/src/main/java/com/dimple/job/web/controller/SysJobLogController.java b/dimple-modules/dimple-job/dimple-job-web/src/main/java/com/dimple/job/web/controller/SysJobLogController.java
@@ -61,19 +61,19 @@ public void export(HttpServletResponse response, SysJobLogVOParams sysJobLog) {
      * 根据调度编号获取详细信息
      */
     @RequiresPermissions("monitor:job:query")
-    @GetMapping("/{jobLogId}")
-    public AjaxResult getInfo(@PathVariable Long jobLogId) {
-        return success(jobLogService.selectJobLogById(jobLogId));
+    @GetMapping("/{id}")
+    public AjaxResult getInfo(@PathVariable Long id) {
+        return success(jobLogService.selectJobLogById(id));
     }
 
     /**
      * 删除定时任务调度日志
      */
     @RequiresPermissions("monitor:job:remove")
     @OperationLog(title = "定时任务调度日志", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{jobLogIds}")
-    public AjaxResult remove(@PathVariable Long[] jobLogIds) {
-        return toAjax(jobLogService.deleteJobLogByIds(jobLogIds));
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(jobLogService.deleteJobLogByIds(ids));
     }
 
     /**
diff --git a/dimple-modules/dimple-job/dimple-job-web/src/main/java/com/dimple/job/web/controller/vo/SysJobLogVO.java b/dimple-modules/dimple-job/dimple-job-web/src/main/java/com/dimple/job/web/controller/vo/SysJobLogVO.java
@@ -19,7 +19,7 @@ public class SysJobLogVO extends BaseEntity {
      * ID
      */
     @Excel(name = "日志序号")
-    private Long jobLogId;
+    private Long id;
 
     /**
      * 任务名称
diff --git a/dimple-modules/dimple-job/dimple-job-web/src/main/java/com/dimple/job/web/controller/vo/params/SysJobLogVOParams.java b/dimple-modules/dimple-job/dimple-job-web/src/main/java/com/dimple/job/web/controller/vo/params/SysJobLogVOParams.java
@@ -19,7 +19,7 @@ public class SysJobLogVOParams extends BaseVOParams {
      * ID
      */
     @Excel(name = "日志序号")
-    private Long jobLogId;
+    private Long id;
 
     /**
      * 任务名称
diff --git a/dimple-modules/dimple-job/dimple-job-web/src/main/resources/mapper/job/SysJobLogMapper.xml b/dimple-modules/dimple-job/dimple-job-web/src/main/resources/mapper/job/SysJobLogMapper.xml
@@ -5,7 +5,7 @@
 <mapper namespace="com.dimple.job.service.mapper.SysJobLogMapper">
 
     <resultMap type="SysJobLog" id="SysJobLogResult">
-        <id property="jobLogId" column="job_log_id"/>
+        <id property="id" column="id"/>
         <result property="jobName" column="job_name"/>
         <result property="jobGroup" column="job_group"/>
         <result property="invokeTarget" column="invoke_target"/>
@@ -16,7 +16,7 @@
     </resultMap>
 
     <sql id="selectJobLogVo">
-        select job_log_id,
+        select id,
                job_name,
                job_group,
                invoke_target,
@@ -57,19 +57,19 @@
 
     <select id="selectJobLogById" parameterType="Long" resultMap="SysJobLogResult">
         <include refid="selectJobLogVo"/>
-        where job_log_id = #{jobLogId}
+        where id = #{id}
     </select>
 
     <delete id="deleteJobLogById" parameterType="Long">
         delete
         from sys_job_log
-        where job_log_id = #{jobLogId}
+        where id = #{id}
     </delete>
 
     <delete id="deleteJobLogByIds" parameterType="Long">
-        delete from sys_job_log where job_log_id in
-        <foreach collection="array" item="jobLogId" open="(" separator="," close=")">
-            #{jobLogId}
+        delete from sys_job_log where id in
+        <foreach collection="array" item="id" open="(" separator="," close=")">
+            #{id}
         </foreach>
     </delete>
 
@@ -79,7 +79,7 @@
 
     <insert id="insertJobLog" parameterType="SysJobLog">
         insert into sys_job_log(
-        <if test="jobLogId != null and jobLogId != 0">job_log_id,</if>
+        <if test="id != null and id != 0">id,</if>
         <if test="jobName != null and jobName != ''">job_name,</if>
         <if test="jobGroup != null and jobGroup != ''">job_group,</if>
         <if test="invokeTarget != null and invokeTarget != ''">invoke_target,</if>
@@ -88,7 +88,7 @@
         <if test="exceptionInfo != null and exceptionInfo != ''">exception_info,</if>
         create_time
         )values(
-        <if test="jobLogId != null and jobLogId != 0">#{jobLogId},</if>
+        <if test="id != null and id != 0">#{id},</if>
         <if test="jobName != null and jobName != ''">#{jobName},</if>
         <if test="jobGroup != null and jobGroup != ''">#{jobGroup},</if>
         <if test="invokeTarget != null and invokeTarget != ''">#{invokeTarget},</if>
diff --git a/dimple-ui-admin/src/api/monitor/jobLog.js b/dimple-ui-admin/src/api/monitor/jobLog.js
@@ -10,9 +10,9 @@ export function listJobLog(query) {
 }
 
 // 删除调度日志
-export function delJobLog(jobLogId) {
+export function delJobLog(id) {
   return request({
-    url: '/schedule/job/log/' + jobLogId,
+    url: '/schedule/job/log/' + id,
     method: 'delete'
   })
 }
diff --git a/dimple-ui-admin/src/views/monitor/job/log.vue b/dimple-ui-admin/src/views/monitor/job/log.vue
@@ -107,7 +107,7 @@
 
     <el-table v-loading="loading" :data="jobLogList" @selection-change="handleSelectionChange">
       <el-table-column align="center" type="selection" width="55"/>
-      <el-table-column align="center" label="日志编号" prop="jobLogId" width="80"/>
+      <el-table-column align="center" label="日志编号" prop="id" width="80"/>
       <el-table-column :show-overflow-tooltip="true" align="center" label="任务名称" prop="jobName"/>
       <el-table-column :show-overflow-tooltip="true" align="center" label="任务组名" prop="jobGroup">
         <template slot-scope="scope">
@@ -153,7 +153,7 @@
       <el-form ref="form" :model="form" label-width="100px" size="mini">
         <el-row>
           <el-col :span="12">
-            <el-form-item label="日志序号：">{{ form.jobLogId }}</el-form-item>
+            <el-form-item label="日志序号：">{{ form.id }}</el-form-item>
             <el-form-item label="任务名称：">{{ form.jobName }}</el-form-item>
           </el-col>
           <el-col :span="12">
@@ -264,7 +264,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.jobLogId);
+      this.ids = selection.map(item => item.id);
       this.multiple = !selection.length;
     },
     /** 详细按钮操作 */
@@ -274,9 +274,9 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const jobLogIds = this.ids;
-      this.$modal.confirm('是否确认删除调度日志编号为"' + jobLogIds + '"的数据项？').then(function () {
-        return delJobLog(jobLogIds);
+      const ids = this.ids;
+      this.$modal.confirm('是否确认删除调度日志编号为"' + ids + '"的数据项？').then(function () {
+        return delJobLog(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
diff --git a/sql/dimple.sql b/sql/dimple.sql
@@ -592,15 +592,15 @@ values (3, '系统默认（多参）', 'DEFAULT', 'dimpleTask.dimpleMultiplePara
 drop table if exists sys_job_log;
 create table sys_job_log
 (
-    job_log_id     bigint(20)   not null auto_increment comment '任务日志ID',
+    id     bigint(20)   not null auto_increment comment '任务日志ID',
     job_name       varchar(64)  not null comment '任务名称',
     job_group      varchar(64)  not null comment '任务组名',
     invoke_target  varchar(500) not null comment '调用目标字符串',
     job_message    varchar(500) comment '日志信息',
     status         char(1)       default '0' comment '执行状态（0正常 1失败）',
     exception_info varchar(2000) default '' comment '异常信息',
     create_time    datetime comment '创建时间',
-    primary key (job_log_id)
+    primary key (id)
 ) engine = innodb comment = '定时任务调度日志表';
 
 

Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,9 @@ export function listJobLog(query) {`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`// 删除调度日志`
`13`		`-export function delJobLog(jobLogId) {`
	`13`	`+export function delJobLog(id) {`
`14`	`14`	`return request({`
`15`		`- url: '/schedule/job/log/' + jobLogId,`
	`15`	`+ url: '/schedule/job/log/' + id,`
`16`	`16`	`method: 'delete'`
`17`	`17`	`})`
`18`	`18`	`}`