Quellcode durchsuchen

update document

xuxueli vor 5 Jahren
Ursprung
Commit
c35c23d75a

+ 22 - 6
xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java Datei anzeigen

91
 		}
91
 		}
92
 
92
 
93
 		// ChildJobId valid
93
 		// ChildJobId valid
94
-        String childJobId = jobInfo.getChildJobId();
95
-        if (childJobId !=null && childJobId.trim().length()>0) {
96
-			String[] childJobIds = childJobId.split(",");
94
+        if (jobInfo.getChildJobId()!=null && jobInfo.getChildJobId().trim().length()>0) {
95
+			String[] childJobIds = jobInfo.getChildJobId().split(",");
97
 			for (String childJobIdItem: childJobIds) {
96
 			for (String childJobIdItem: childJobIds) {
98
 				if (childJobIdItem!=null && childJobIdItem.trim().length()>0 && isNumeric(childJobIdItem)) {
97
 				if (childJobIdItem!=null && childJobIdItem.trim().length()>0 && isNumeric(childJobIdItem)) {
99
 					XxlJobInfo childJobInfo = xxlJobInfoDao.loadById(Integer.parseInt(childJobIdItem));
98
 					XxlJobInfo childJobInfo = xxlJobInfoDao.loadById(Integer.parseInt(childJobIdItem));
106
 							MessageFormat.format((I18nUtil.getString("jobinfo_field_childJobId")+"({0})"+I18nUtil.getString("system_unvalid")), childJobIdItem));
105
 							MessageFormat.format((I18nUtil.getString("jobinfo_field_childJobId")+"({0})"+I18nUtil.getString("system_unvalid")), childJobIdItem));
107
 				}
106
 				}
108
 			}
107
 			}
108
+
109
+			// join , avoid "xxx,,"
110
+			String temp = "";
111
+			for (String item:childJobIds) {
112
+				temp += item + ",";
113
+			}
114
+			temp = temp.substring(0, temp.length()-1);
115
+
116
+			jobInfo.setChildJobId(temp);
109
 		}
117
 		}
110
 
118
 
111
 		// add in db
119
 		// add in db
147
 		}
155
 		}
148
 
156
 
149
 		// ChildJobId valid
157
 		// ChildJobId valid
150
-        String childJobId = jobInfo.getChildJobId();
151
-        if (childJobId !=null && childJobId.trim().length()>0) {
152
-			String[] childJobIds = childJobId.split(",");
158
+        if (jobInfo.getChildJobId()!=null && jobInfo.getChildJobId().trim().length()>0) {
159
+			String[] childJobIds = jobInfo.getChildJobId().split(",");
153
 			for (String childJobIdItem: childJobIds) {
160
 			for (String childJobIdItem: childJobIds) {
154
 				if (childJobIdItem!=null && childJobIdItem.trim().length()>0 && isNumeric(childJobIdItem)) {
161
 				if (childJobIdItem!=null && childJobIdItem.trim().length()>0 && isNumeric(childJobIdItem)) {
155
 					XxlJobInfo childJobInfo = xxlJobInfoDao.loadById(Integer.parseInt(childJobIdItem));
162
 					XxlJobInfo childJobInfo = xxlJobInfoDao.loadById(Integer.parseInt(childJobIdItem));
162
 							MessageFormat.format((I18nUtil.getString("jobinfo_field_childJobId")+"({0})"+I18nUtil.getString("system_unvalid")), childJobIdItem));
169
 							MessageFormat.format((I18nUtil.getString("jobinfo_field_childJobId")+"({0})"+I18nUtil.getString("system_unvalid")), childJobIdItem));
163
 				}
170
 				}
164
 			}
171
 			}
172
+
173
+			// join , avoid "xxx,,"
174
+			String temp = "";
175
+			for (String item:childJobIds) {
176
+				temp += item + ",";
177
+			}
178
+			temp = temp.substring(0, temp.length()-1);
179
+
180
+			jobInfo.setChildJobId(temp);
165
 		}
181
 		}
166
 
182
 
167
 		// group valid
183
 		// group valid

+ 1 - 0
xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js Datei anzeigen

119
                                 if ('BEAN' != row.glueType) {
119
                                 if ('BEAN' != row.glueType) {
120
                                     var codeUrl = base_url +'/jobcode?jobId='+ row.id;
120
                                     var codeUrl = base_url +'/jobcode?jobId='+ row.id;
121
                                     codeBtn = '<li><a href="'+ codeUrl +'" target="_blank" >GLUE IDE</a></li>\n';
121
                                     codeBtn = '<li><a href="'+ codeUrl +'" target="_blank" >GLUE IDE</a></li>\n';
122
+                                    codeBtn += '<li class="divider"></li>\n';
122
                                 }
123
                                 }
123
 
124
 
124
                                 // data
125
                                 // data