Skip to content

Commit 8b7ed23

Browse files
martin-bianmartin-bian
committed
change job and job log into tool and job tab
1 parent d18ebfc commit 8b7ed23

File tree

20 files changed

+149
-158
lines changed

20 files changed

+149
-158
lines changed

‎dimple-modules/dimple-job/dimple-job-service/src/main/java/com/dimple/job/service/entity/SysJob.java‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import com.dimple.common.core.web.entity.BaseEntity;
88
import com.dimple.job.service.util.CronUtils;
99
import com.fasterxml.jackson.annotation.JsonFormat;
10+
import lombok.Data;
1011

1112
import javax.validation.constraints.NotBlank;
1213
import javax.validation.constraints.Size;
@@ -17,14 +18,15 @@
1718
*
1819
* @author Dimple
1920
*/
21+
@Data
2022
public class SysJob extends BaseEntity {
2123
private static final long serialVersionUID = 1L;
2224

2325
/**
2426
* 任务ID
2527
*/
2628
@Excel(name = "任务序号", cellType = ColumnType.NUMERIC)
27-
private Long jobId;
29+
private Long id;
2830

2931
/**
3032
* 任务名称
@@ -68,13 +70,7 @@ public class SysJob extends BaseEntity {
6870
@Excel(name = "任务状态", readConverterExp = "0=正常,1=暂停")
6971
private String status;
7072

71-
public Long getJobId() {
72-
return jobId;
73-
}
7473

75-
public void setJobId(Long jobId) {
76-
this.jobId = jobId;
77-
}
7874

7975
@NotBlank(message = "任务名称不能为空")
8076
@Size(min = 0, max = 64, message = "任务名称不能超过64个字符")

‎dimple-modules/dimple-job/dimple-job-service/src/main/java/com/dimple/job/service/mapper/SysJobLogMapper.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ public interface SysJobLogMapper {
5252
/**
5353
* 删除任务日志
5454
*
55-
* @param jobId 调度日志ID
55+
* @param id 调度日志ID
5656
* @return affected lines
5757
*/
58-
int deleteJobLogById(Long jobId);
58+
int deleteJobLogById(Long id);
5959

6060
/**
6161
* 清空任务日志

‎dimple-modules/dimple-job/dimple-job-service/src/main/java/com/dimple/job/service/mapper/SysJobMapper.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,18 @@ public interface SysJobMapper {
2929
/**
3030
* 通过调度ID查询调度任务信息
3131
*
32-
* @param jobId 调度ID
32+
* @param id 调度ID
3333
* @return 角色对象信息
3434
*/
35-
SysJob selectJobById(Long jobId);
35+
SysJob selectJobById(Long id);
3636

3737
/**
3838
* 通过调度ID删除调度任务信息
3939
*
40-
* @param jobId 调度ID
40+
* @param id 调度ID
4141
* @return affected lines
4242
*/
43-
int deleteJobById(Long jobId);
43+
int deleteJobById(Long id);
4444

4545
/**
4646
* 批量删除调度任务信息

‎dimple-modules/dimple-job/dimple-job-service/src/main/java/com/dimple/job/service/service/SysJobLogService.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ public interface SysJobLogService {
4444
/**
4545
* 删除任务日志
4646
*
47-
* @param jobId 调度日志ID
47+
* @param id 调度日志ID
4848
* @return affected lines
4949
*/
50-
int deleteJobLogById(Long jobId);
50+
int deleteJobLogById(Long id);
5151

5252
/**
5353
* 清空任务日志

‎dimple-modules/dimple-job/dimple-job-service/src/main/java/com/dimple/job/service/service/SysJobService.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ public interface SysJobService {
2323
/**
2424
* 通过调度任务ID查询调度信息
2525
*
26-
* @param jobId 调度任务ID
26+
* @param id 调度任务ID
2727
* @return 调度任务对象信息
2828
*/
29-
SysJobBO selectJobById(Long jobId);
29+
SysJobBO selectJobById(Long id);
3030

3131
/**
3232
* 暂停任务
@@ -55,10 +55,10 @@ public interface SysJobService {
5555
/**
5656
* 批量删除调度信息
5757
*
58-
* @param jobIds 需要删除的任务ID
58+
* @param ids 需要删除的任务ID
5959
* @return affected lines
6060
*/
61-
void deleteJobByIds(Long[] jobIds) throws SchedulerException;
61+
void deleteJobByIds(Long[] ids) throws SchedulerException;
6262

6363
/**
6464
* 任务调度状态修改

‎dimple-modules/dimple-job/dimple-job-service/src/main/java/com/dimple/job/service/service/bo/SysJobBO.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class SysJobBO extends BaseEntity {
2121
/**
2222
* 任务ID
2323
*/
24-
private Long jobId;
24+
private Long id;
2525

2626
/**
2727
* 任务名称

‎dimple-modules/dimple-job/dimple-job-service/src/main/java/com/dimple/job/service/service/impl/SysJobLogServiceImpl.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,11 @@ public int deleteJobLogByIds(Long[] logIds) {
6767
/**
6868
* 删除任务日志
6969
*
70-
* @param jobId 调度日志ID
70+
* @param id 调度日志ID
7171
*/
7272
@Override
73-
public int deleteJobLogById(Long jobId) {
74-
return jobLogMapper.deleteJobLogById(jobId);
73+
public int deleteJobLogById(Long id) {
74+
return jobLogMapper.deleteJobLogById(id);
7575
}
7676

7777
/**

‎dimple-modules/dimple-job/dimple-job-service/src/main/java/com/dimple/job/service/service/impl/SysJobServiceImpl.java‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,12 @@ public List<SysJobBO> selectJobList(SysJobBO job) {
5959
/**
6060
* 通过调度任务ID查询调度信息
6161
*
62-
* @param jobId 调度任务ID
62+
* @param id 调度任务ID
6363
* @return 调度任务对象信息
6464
*/
6565
@Override
66-
public SysJobBO selectJobById(Long jobId) {
67-
return BeanMapper.convert(jobMapper.selectJobById(jobId), SysJobBO.class);
66+
public SysJobBO selectJobById(Long id) {
67+
return BeanMapper.convert(jobMapper.selectJobById(id), SysJobBO.class);
6868
}
6969

7070
/**
@@ -76,12 +76,12 @@ public SysJobBO selectJobById(Long jobId) {
7676
@Transactional(rollbackFor = Exception.class)
7777
public int pauseJob(SysJobBO job) throws SchedulerException {
7878
SysJob sysJob = BeanMapper.convert(job, SysJob.class);
79-
Long jobId = sysJob.getJobId();
79+
Long id = sysJob.getId();
8080
String jobGroup = sysJob.getJobGroup();
8181
sysJob.setStatus(ScheduleConstants.Status.PAUSE.getValue());
8282
int rows = jobMapper.updateJob(sysJob);
8383
if (rows > 0) {
84-
scheduler.pauseJob(ScheduleUtils.getJobKey(jobId, jobGroup));
84+
scheduler.pauseJob(ScheduleUtils.getJobKey(id, jobGroup));
8585
}
8686
return rows;
8787
}
@@ -95,12 +95,12 @@ public int pauseJob(SysJobBO job) throws SchedulerException {
9595
@Transactional(rollbackFor = Exception.class)
9696
public int resumeJob(SysJobBO job) throws SchedulerException {
9797
SysJob sysJob = BeanMapper.convert(job, SysJob.class);
98-
Long jobId = sysJob.getJobId();
98+
Long id = sysJob.getId();
9999
String jobGroup = sysJob.getJobGroup();
100100
sysJob.setStatus(ScheduleConstants.Status.NORMAL.getValue());
101101
int rows = jobMapper.updateJob(sysJob);
102102
if (rows > 0) {
103-
scheduler.resumeJob(ScheduleUtils.getJobKey(jobId, jobGroup));
103+
scheduler.resumeJob(ScheduleUtils.getJobKey(id, jobGroup));
104104
}
105105
return rows;
106106
}
@@ -113,26 +113,26 @@ public int resumeJob(SysJobBO job) throws SchedulerException {
113113
@Override
114114
@Transactional(rollbackFor = Exception.class)
115115
public int deleteJob(SysJobBO job) throws SchedulerException {
116-
Long jobId = job.getJobId();
116+
Long id = job.getId();
117117
String jobGroup = job.getJobGroup();
118-
int rows = jobMapper.deleteJobById(jobId);
118+
int rows = jobMapper.deleteJobById(id);
119119
if (rows > 0) {
120-
scheduler.deleteJob(ScheduleUtils.getJobKey(jobId, jobGroup));
120+
scheduler.deleteJob(ScheduleUtils.getJobKey(id, jobGroup));
121121
}
122122
return rows;
123123
}
124124

125125
/**
126126
* 批量删除调度信息
127127
*
128-
* @param jobIds 需要删除的任务ID
128+
* @param ids 需要删除的任务ID
129129
* @return affected lines
130130
*/
131131
@Override
132132
@Transactional(rollbackFor = Exception.class)
133-
public void deleteJobByIds(Long[] jobIds) throws SchedulerException {
134-
for (Long jobId : jobIds) {
135-
SysJob job = jobMapper.selectJobById(jobId);
133+
public void deleteJobByIds(Long[] ids) throws SchedulerException {
134+
for (Long id : ids) {
135+
SysJob job = jobMapper.selectJobById(id);
136136
deleteJob(BeanMapper.convert(job, SysJobBO.class));
137137
}
138138
}
@@ -164,13 +164,13 @@ public int changeStatus(SysJobBO job) throws SchedulerException {
164164
@Transactional(rollbackFor = Exception.class)
165165
public boolean run(SysJobBO job) throws SchedulerException {
166166
boolean result = false;
167-
Long jobId = job.getJobId();
167+
Long id = job.getId();
168168
String jobGroup = job.getJobGroup();
169-
SysJobBO properties = selectJobById(job.getJobId());
169+
SysJobBO properties = selectJobById(job.getId());
170170
// 参数
171171
JobDataMap dataMap = new JobDataMap();
172172
dataMap.put(ScheduleConstants.TASK_PROPERTIES, properties);
173-
JobKey jobKey = ScheduleUtils.getJobKey(jobId, jobGroup);
173+
JobKey jobKey = ScheduleUtils.getJobKey(id, jobGroup);
174174
if (scheduler.checkExists(jobKey)) {
175175
result = true;
176176
scheduler.triggerJob(jobKey, dataMap);
@@ -203,7 +203,7 @@ public int insertJob(SysJobBO job) throws SchedulerException, TaskException {
203203
@Override
204204
@Transactional(rollbackFor = Exception.class)
205205
public int updateJob(SysJobBO job) throws SchedulerException, TaskException {
206-
SysJobBO properties = selectJobById(job.getJobId());
206+
SysJobBO properties = selectJobById(job.getId());
207207
SysJob sysJob = BeanMapper.convert(job, SysJob.class);
208208
int rows = jobMapper.updateJob(sysJob);
209209
if (rows > 0) {
@@ -219,9 +219,9 @@ public int updateJob(SysJobBO job) throws SchedulerException, TaskException {
219219
* @param jobGroup 任务组名
220220
*/
221221
public void updateSchedulerJob(SysJobBO job, String jobGroup) throws SchedulerException, TaskException {
222-
Long jobId = job.getJobId();
222+
Long id = job.getId();
223223
// 判断是否存在
224-
JobKey jobKey = ScheduleUtils.getJobKey(jobId, jobGroup);
224+
JobKey jobKey = ScheduleUtils.getJobKey(id, jobGroup);
225225
if (scheduler.checkExists(jobKey)) {
226226
// 防止创建时存在数据问题 先移除，然后在执行创建操作
227227
scheduler.deleteJob(jobKey);

‎dimple-modules/dimple-job/dimple-job-service/src/main/java/com/dimple/job/service/util/ScheduleUtils.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@ private static Class<? extends Job> getQuartzJobClass(SysJobBO sysJob) {
3838
/**
3939
* 构建任务触发对象
4040
*/
41-
public static TriggerKey getTriggerKey(Long jobId, String jobGroup) {
42-
return TriggerKey.triggerKey(ScheduleConstants.TASK_CLASS_NAME + jobId, jobGroup);
41+
public static TriggerKey getTriggerKey(Long id, String jobGroup) {
42+
return TriggerKey.triggerKey(ScheduleConstants.TASK_CLASS_NAME + id, jobGroup);
4343
}
4444

4545
/**
4646
* 构建任务键对象
4747
*/
48-
public static JobKey getJobKey(Long jobId, String jobGroup) {
49-
return JobKey.jobKey(ScheduleConstants.TASK_CLASS_NAME + jobId, jobGroup);
48+
public static JobKey getJobKey(Long id, String jobGroup) {
49+
return JobKey.jobKey(ScheduleConstants.TASK_CLASS_NAME + id, jobGroup);
5050
}
5151

5252
/**
@@ -55,25 +55,25 @@ public static JobKey getJobKey(Long jobId, String jobGroup) {
5555
public static void createScheduleJob(Scheduler scheduler, SysJobBO job) throws SchedulerException, TaskException {
5656
Class<? extends Job> jobClass = getQuartzJobClass(job);
5757
// 构建job信息
58-
Long jobId = job.getJobId();
58+
Long id = job.getId();
5959
String jobGroup = job.getJobGroup();
60-
JobDetail jobDetail = JobBuilder.newJob(jobClass).withIdentity(getJobKey(jobId, jobGroup)).build();
60+
JobDetail jobDetail = JobBuilder.newJob(jobClass).withIdentity(getJobKey(id, jobGroup)).build();
6161

6262
// 表达式调度构建器
6363
CronScheduleBuilder cronScheduleBuilder = CronScheduleBuilder.cronSchedule(job.getCronExpression());
6464
cronScheduleBuilder = handleCronScheduleMisfirePolicy(job, cronScheduleBuilder);
6565

6666
// 按新的cronExpression表达式构建一个新的trigger
67-
CronTrigger trigger = TriggerBuilder.newTrigger().withIdentity(getTriggerKey(jobId, jobGroup))
67+
CronTrigger trigger = TriggerBuilder.newTrigger().withIdentity(getTriggerKey(id, jobGroup))
6868
.withSchedule(cronScheduleBuilder).build();
6969

7070
// 放入参数，运行时的方法可以获取
7171
jobDetail.getJobDataMap().put(ScheduleConstants.TASK_PROPERTIES, job);
7272

7373
// 判断是否存在
74-
if (scheduler.checkExists(getJobKey(jobId, jobGroup))) {
74+
if (scheduler.checkExists(getJobKey(id, jobGroup))) {
7575
// 防止创建时存在数据问题 先移除，然后在执行创建操作
76-
scheduler.deleteJob(getJobKey(jobId, jobGroup));
76+
scheduler.deleteJob(getJobKey(id, jobGroup));
7777
}
7878

7979
// 判断任务是否过期
@@ -84,7 +84,7 @@ public static void createScheduleJob(Scheduler scheduler, SysJobBO job) throws S
8484

8585
// 暂停任务
8686
if (job.getStatus().equals(ScheduleConstants.Status.PAUSE.getValue())) {
87-
scheduler.pauseJob(ScheduleUtils.getJobKey(jobId, jobGroup));
87+
scheduler.pauseJob(ScheduleUtils.getJobKey(id, jobGroup));
8888
}
8989
}
9090

0 commit comments

Comments
 (0)