Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
X
XXL-JOB
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
靳帅
XXL-JOB
Commits
19d1ac2e
提交
19d1ac2e
authored
5月 22, 2019
作者:
xuxueli
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
update document
上级
5c1f5932
显示空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
9 行增加
和
16 行删除
+9
-16
JobScheduleHelper.java
...java/com/xxl/job/admin/core/thread/JobScheduleHelper.java
+2
-2
XxlJobServiceImpl.java
...ava/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java
+7
-14
没有找到文件。
xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java
浏览文件 @
19d1ac2e
...
@@ -58,8 +58,8 @@ public class JobScheduleHelper {
...
@@ -58,8 +58,8 @@ public class JobScheduleHelper {
// tx start
// tx start
// 1、
查询JOB:"下次调度30s内"
// 1、
预读10s内调度任务
long
maxNextTime
=
System
.
currentTimeMillis
()
+
3
0000
;
long
maxNextTime
=
System
.
currentTimeMillis
()
+
1
0000
;
long
nowTime
=
System
.
currentTimeMillis
();
long
nowTime
=
System
.
currentTimeMillis
();
List
<
XxlJobInfo
>
scheduleList
=
XxlJobAdminConfig
.
getAdminConfig
().
getXxlJobInfoDao
().
scheduleJobQuery
(
maxNextTime
);
List
<
XxlJobInfo
>
scheduleList
=
XxlJobAdminConfig
.
getAdminConfig
().
getXxlJobInfoDao
().
scheduleJobQuery
(
maxNextTime
);
if
(
scheduleList
!=
null
&&
scheduleList
.
size
()>
0
)
{
if
(
scheduleList
!=
null
&&
scheduleList
.
size
()>
0
)
{
...
...
xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java
浏览文件 @
19d1ac2e
...
@@ -189,14 +189,16 @@ public class XxlJobServiceImpl implements XxlJobService {
...
@@ -189,14 +189,16 @@ public class XxlJobServiceImpl implements XxlJobService {
return
new
ReturnT
<
String
>(
ReturnT
.
FAIL_CODE
,
(
I18nUtil
.
getString
(
"jobinfo_field_id"
)+
I18nUtil
.
getString
(
"system_not_found"
))
);
return
new
ReturnT
<
String
>(
ReturnT
.
FAIL_CODE
,
(
I18nUtil
.
getString
(
"jobinfo_field_id"
)+
I18nUtil
.
getString
(
"system_not_found"
))
);
}
}
// next trigger time
// next trigger time
(10s后生效,避开预读周期)
long
nextTriggerTime
=
0
;
long
nextTriggerTime
=
0
;
if
(
exists_jobInfo
.
getTriggerStatus
()
==
1
)
{
try
{
try
{
nextTriggerTime
=
new
CronExpression
(
jobInfo
.
getJobCron
()).
getNextValidTimeAfter
(
new
Date
(
)).
getTime
();
nextTriggerTime
=
new
CronExpression
(
jobInfo
.
getJobCron
()).
getNextValidTimeAfter
(
new
Date
(
System
.
currentTimeMillis
()
+
10000
)).
getTime
();
}
catch
(
ParseException
e
)
{
}
catch
(
ParseException
e
)
{
logger
.
error
(
e
.
getMessage
(),
e
);
logger
.
error
(
e
.
getMessage
(),
e
);
return
new
ReturnT
<
String
>(
ReturnT
.
FAIL_CODE
,
I18nUtil
.
getString
(
"jobinfo_field_cron_unvalid"
)+
" | "
+
e
.
getMessage
());
return
new
ReturnT
<
String
>(
ReturnT
.
FAIL_CODE
,
I18nUtil
.
getString
(
"jobinfo_field_cron_unvalid"
)+
" | "
+
e
.
getMessage
());
}
}
}
exists_jobInfo
.
setJobGroup
(
jobInfo
.
getJobGroup
());
exists_jobInfo
.
setJobGroup
(
jobInfo
.
getJobGroup
());
exists_jobInfo
.
setJobCron
(
jobInfo
.
getJobCron
());
exists_jobInfo
.
setJobCron
(
jobInfo
.
getJobCron
());
...
@@ -234,10 +236,10 @@ public class XxlJobServiceImpl implements XxlJobService {
...
@@ -234,10 +236,10 @@ public class XxlJobServiceImpl implements XxlJobService {
public
ReturnT
<
String
>
start
(
int
id
)
{
public
ReturnT
<
String
>
start
(
int
id
)
{
XxlJobInfo
xxlJobInfo
=
xxlJobInfoDao
.
loadById
(
id
);
XxlJobInfo
xxlJobInfo
=
xxlJobInfoDao
.
loadById
(
id
);
// next trigger time
// next trigger time
(10s后生效,避开预读周期)
long
nextTriggerTime
=
0
;
long
nextTriggerTime
=
0
;
try
{
try
{
nextTriggerTime
=
new
CronExpression
(
xxlJobInfo
.
getJobCron
()).
getNextValidTimeAfter
(
new
Date
()).
getTime
();
nextTriggerTime
=
new
CronExpression
(
xxlJobInfo
.
getJobCron
()).
getNextValidTimeAfter
(
new
Date
(
System
.
currentTimeMillis
()
+
10000
)).
getTime
();
}
catch
(
ParseException
e
)
{
}
catch
(
ParseException
e
)
{
logger
.
error
(
e
.
getMessage
(),
e
);
logger
.
error
(
e
.
getMessage
(),
e
);
return
new
ReturnT
<
String
>(
ReturnT
.
FAIL_CODE
,
I18nUtil
.
getString
(
"jobinfo_field_cron_unvalid"
)+
" | "
+
e
.
getMessage
());
return
new
ReturnT
<
String
>(
ReturnT
.
FAIL_CODE
,
I18nUtil
.
getString
(
"jobinfo_field_cron_unvalid"
)+
" | "
+
e
.
getMessage
());
...
@@ -255,18 +257,9 @@ public class XxlJobServiceImpl implements XxlJobService {
...
@@ -255,18 +257,9 @@ public class XxlJobServiceImpl implements XxlJobService {
public
ReturnT
<
String
>
stop
(
int
id
)
{
public
ReturnT
<
String
>
stop
(
int
id
)
{
XxlJobInfo
xxlJobInfo
=
xxlJobInfoDao
.
loadById
(
id
);
XxlJobInfo
xxlJobInfo
=
xxlJobInfoDao
.
loadById
(
id
);
// next trigger time
long
nextTriggerTime
=
0
;
try
{
nextTriggerTime
=
new
CronExpression
(
xxlJobInfo
.
getJobCron
()).
getNextValidTimeAfter
(
new
Date
()).
getTime
();
}
catch
(
ParseException
e
)
{
logger
.
error
(
e
.
getMessage
(),
e
);
return
new
ReturnT
<
String
>(
ReturnT
.
FAIL_CODE
,
I18nUtil
.
getString
(
"jobinfo_field_cron_unvalid"
)+
" | "
+
e
.
getMessage
());
}
xxlJobInfo
.
setTriggerStatus
(
0
);
xxlJobInfo
.
setTriggerStatus
(
0
);
xxlJobInfo
.
setTriggerLastTime
(
0
);
xxlJobInfo
.
setTriggerLastTime
(
0
);
xxlJobInfo
.
setTriggerNextTime
(
nextTriggerTime
);
xxlJobInfo
.
setTriggerNextTime
(
0
);
xxlJobInfoDao
.
update
(
xxlJobInfo
);
xxlJobInfoDao
.
update
(
xxlJobInfo
);
return
ReturnT
.
SUCCESS
;
return
ReturnT
.
SUCCESS
;
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论