Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
X
XXL-JOB
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
靳帅
XXL-JOB
Commits
c35c23d7
提交
c35c23d7
authored
10月 25, 2019
作者:
xuxueli
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
update document
上级
71fe908b
隐藏空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
23 行增加
和
6 行删除
+23
-6
XxlJobServiceImpl.java
...ava/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java
+22
-6
jobinfo.index.1.js
...job-admin/src/main/resources/static/js/jobinfo.index.1.js
+1
-0
没有找到文件。
xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java
浏览文件 @
c35c23d7
...
@@ -91,9 +91,8 @@ public class XxlJobServiceImpl implements XxlJobService {
...
@@ -91,9 +91,8 @@ public class XxlJobServiceImpl implements XxlJobService {
}
}
// ChildJobId valid
// ChildJobId valid
String
childJobId
=
jobInfo
.
getChildJobId
();
if
(
jobInfo
.
getChildJobId
()!=
null
&&
jobInfo
.
getChildJobId
().
trim
().
length
()>
0
)
{
if
(
childJobId
!=
null
&&
childJobId
.
trim
().
length
()>
0
)
{
String
[]
childJobIds
=
jobInfo
.
getChildJobId
().
split
(
","
);
String
[]
childJobIds
=
childJobId
.
split
(
","
);
for
(
String
childJobIdItem:
childJobIds
)
{
for
(
String
childJobIdItem:
childJobIds
)
{
if
(
childJobIdItem
!=
null
&&
childJobIdItem
.
trim
().
length
()>
0
&&
isNumeric
(
childJobIdItem
))
{
if
(
childJobIdItem
!=
null
&&
childJobIdItem
.
trim
().
length
()>
0
&&
isNumeric
(
childJobIdItem
))
{
XxlJobInfo
childJobInfo
=
xxlJobInfoDao
.
loadById
(
Integer
.
parseInt
(
childJobIdItem
));
XxlJobInfo
childJobInfo
=
xxlJobInfoDao
.
loadById
(
Integer
.
parseInt
(
childJobIdItem
));
...
@@ -106,6 +105,15 @@ public class XxlJobServiceImpl implements XxlJobService {
...
@@ -106,6 +105,15 @@ public class XxlJobServiceImpl implements XxlJobService {
MessageFormat
.
format
((
I18nUtil
.
getString
(
"jobinfo_field_childJobId"
)+
"({0})"
+
I18nUtil
.
getString
(
"system_unvalid"
)),
childJobIdItem
));
MessageFormat
.
format
((
I18nUtil
.
getString
(
"jobinfo_field_childJobId"
)+
"({0})"
+
I18nUtil
.
getString
(
"system_unvalid"
)),
childJobIdItem
));
}
}
}
}
// join , avoid "xxx,,"
String
temp
=
""
;
for
(
String
item:
childJobIds
)
{
temp
+=
item
+
","
;
}
temp
=
temp
.
substring
(
0
,
temp
.
length
()-
1
);
jobInfo
.
setChildJobId
(
temp
);
}
}
// add in db
// add in db
...
@@ -147,9 +155,8 @@ public class XxlJobServiceImpl implements XxlJobService {
...
@@ -147,9 +155,8 @@ public class XxlJobServiceImpl implements XxlJobService {
}
}
// ChildJobId valid
// ChildJobId valid
String
childJobId
=
jobInfo
.
getChildJobId
();
if
(
jobInfo
.
getChildJobId
()!=
null
&&
jobInfo
.
getChildJobId
().
trim
().
length
()>
0
)
{
if
(
childJobId
!=
null
&&
childJobId
.
trim
().
length
()>
0
)
{
String
[]
childJobIds
=
jobInfo
.
getChildJobId
().
split
(
","
);
String
[]
childJobIds
=
childJobId
.
split
(
","
);
for
(
String
childJobIdItem:
childJobIds
)
{
for
(
String
childJobIdItem:
childJobIds
)
{
if
(
childJobIdItem
!=
null
&&
childJobIdItem
.
trim
().
length
()>
0
&&
isNumeric
(
childJobIdItem
))
{
if
(
childJobIdItem
!=
null
&&
childJobIdItem
.
trim
().
length
()>
0
&&
isNumeric
(
childJobIdItem
))
{
XxlJobInfo
childJobInfo
=
xxlJobInfoDao
.
loadById
(
Integer
.
parseInt
(
childJobIdItem
));
XxlJobInfo
childJobInfo
=
xxlJobInfoDao
.
loadById
(
Integer
.
parseInt
(
childJobIdItem
));
...
@@ -162,6 +169,15 @@ public class XxlJobServiceImpl implements XxlJobService {
...
@@ -162,6 +169,15 @@ public class XxlJobServiceImpl implements XxlJobService {
MessageFormat
.
format
((
I18nUtil
.
getString
(
"jobinfo_field_childJobId"
)+
"({0})"
+
I18nUtil
.
getString
(
"system_unvalid"
)),
childJobIdItem
));
MessageFormat
.
format
((
I18nUtil
.
getString
(
"jobinfo_field_childJobId"
)+
"({0})"
+
I18nUtil
.
getString
(
"system_unvalid"
)),
childJobIdItem
));
}
}
}
}
// join , avoid "xxx,,"
String
temp
=
""
;
for
(
String
item:
childJobIds
)
{
temp
+=
item
+
","
;
}
temp
=
temp
.
substring
(
0
,
temp
.
length
()-
1
);
jobInfo
.
setChildJobId
(
temp
);
}
}
// group valid
// group valid
...
...
xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js
浏览文件 @
c35c23d7
...
@@ -119,6 +119,7 @@ $(function() {
...
@@ -119,6 +119,7 @@ $(function() {
if
(
'BEAN'
!=
row
.
glueType
)
{
if
(
'BEAN'
!=
row
.
glueType
)
{
var
codeUrl
=
base_url
+
'/jobcode?jobId='
+
row
.
id
;
var
codeUrl
=
base_url
+
'/jobcode?jobId='
+
row
.
id
;
codeBtn
=
'<li><a href="'
+
codeUrl
+
'" target="_blank" >GLUE IDE</a></li>
\
n'
;
codeBtn
=
'<li><a href="'
+
codeUrl
+
'" target="_blank" >GLUE IDE</a></li>
\
n'
;
codeBtn
+=
'<li class="divider"></li>
\
n'
;
}
}
// data
// data
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论