ak
/
xx-job
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update document

This commit is contained in:
xuxueli 2019-10-25 12:17:33 +08:00
parent 71fe908b29
commit c35c23d75a
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java
View File

@ -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 {
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 {
} }
// 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 {
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

1
xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js
View File

@ -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