Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
X
XXL-JOB
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
靳帅
XXL-JOB
Commits
34ff10b9
提交
34ff10b9
authored
10月 22, 2019
作者:
Z-Beatles
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
移除重复的子任务ID拼接
上级
99e7bfc6
隐藏空白字符变更
内嵌
并排
正在显示
1 个修改的文件
包含
11 行增加
和
21 行删除
+11
-21
XxlJobServiceImpl.java
...ava/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java
+11
-21
没有找到文件。
xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java
浏览文件 @
34ff10b9
...
...
@@ -91,11 +91,12 @@ public class XxlJobServiceImpl implements XxlJobService {
}
// ChildJobId valid
if
(
jobInfo
.
getChildJobId
()!=
null
&&
jobInfo
.
getChildJobId
().
trim
().
length
()>
0
)
{
String
[]
childJobIds
=
jobInfo
.
getChildJobId
().
split
(
","
);
String
childJobId
=
jobInfo
.
getChildJobId
();
if
(
childJobId
!=
null
&&
childJobId
.
trim
().
length
()>
0
)
{
String
[]
childJobIds
=
childJobId
.
split
(
","
);
for
(
String
childJobIdItem:
childJobIds
)
{
if
(
childJobIdItem
!=
null
&&
childJobIdItem
.
trim
().
length
()>
0
&&
isNumeric
(
childJobIdItem
))
{
XxlJobInfo
childJobInfo
=
xxlJobInfoDao
.
loadById
(
Integer
.
valueOf
(
childJobIdItem
));
XxlJobInfo
childJobInfo
=
xxlJobInfoDao
.
loadById
(
Integer
.
parseInt
(
childJobIdItem
));
if
(
childJobInfo
==
null
)
{
return
new
ReturnT
<
String
>(
ReturnT
.
FAIL_CODE
,
MessageFormat
.
format
((
I18nUtil
.
getString
(
"jobinfo_field_childJobId"
)+
"({0})"
+
I18nUtil
.
getString
(
"system_not_found"
)),
childJobIdItem
));
...
...
@@ -106,13 +107,7 @@ public class XxlJobServiceImpl implements XxlJobService {
}
}
String
temp
=
""
;
// join ,
for
(
String
item:
childJobIds
)
{
temp
+=
item
+
","
;
}
temp
=
temp
.
substring
(
0
,
temp
.
length
()-
1
);
jobInfo
.
setChildJobId
(
temp
);
jobInfo
.
setChildJobId
(
childJobId
);
}
// add in db
...
...
@@ -154,11 +149,12 @@ public class XxlJobServiceImpl implements XxlJobService {
}
// ChildJobId valid
if
(
jobInfo
.
getChildJobId
()!=
null
&&
jobInfo
.
getChildJobId
().
trim
().
length
()>
0
)
{
String
[]
childJobIds
=
jobInfo
.
getChildJobId
().
split
(
","
);
String
childJobId
=
jobInfo
.
getChildJobId
();
if
(
childJobId
!=
null
&&
childJobId
.
trim
().
length
()>
0
)
{
String
[]
childJobIds
=
childJobId
.
split
(
","
);
for
(
String
childJobIdItem:
childJobIds
)
{
if
(
childJobIdItem
!=
null
&&
childJobIdItem
.
trim
().
length
()>
0
&&
isNumeric
(
childJobIdItem
))
{
XxlJobInfo
childJobInfo
=
xxlJobInfoDao
.
loadById
(
Integer
.
valueOf
(
childJobIdItem
));
XxlJobInfo
childJobInfo
=
xxlJobInfoDao
.
loadById
(
Integer
.
parseInt
(
childJobIdItem
));
if
(
childJobInfo
==
null
)
{
return
new
ReturnT
<
String
>(
ReturnT
.
FAIL_CODE
,
MessageFormat
.
format
((
I18nUtil
.
getString
(
"jobinfo_field_childJobId"
)+
"({0})"
+
I18nUtil
.
getString
(
"system_not_found"
)),
childJobIdItem
));
...
...
@@ -169,13 +165,7 @@ public class XxlJobServiceImpl implements XxlJobService {
}
}
String
temp
=
""
;
// join ,
for
(
String
item:
childJobIds
)
{
temp
+=
item
+
","
;
}
temp
=
temp
.
substring
(
0
,
temp
.
length
()-
1
);
jobInfo
.
setChildJobId
(
temp
);
jobInfo
.
setChildJobId
(
childJobId
);
}
// group valid
...
...
@@ -216,7 +206,7 @@ public class XxlJobServiceImpl implements XxlJobService {
exists_jobInfo
.
setExecutorBlockStrategy
(
jobInfo
.
getExecutorBlockStrategy
());
exists_jobInfo
.
setExecutorTimeout
(
jobInfo
.
getExecutorTimeout
());
exists_jobInfo
.
setExecutorFailRetryCount
(
jobInfo
.
getExecutorFailRetryCount
());
exists_jobInfo
.
setChildJobId
(
jobInfo
.
getChildJobId
()
);
exists_jobInfo
.
setChildJobId
(
childJobId
);
exists_jobInfo
.
setTriggerNextTime
(
nextTriggerTime
);
xxlJobInfoDao
.
update
(
exists_jobInfo
);
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论