xueli.xue hace 9 años
padre
commit
7d31e9838a

+ 11 - 13
xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java Ver fichero

168
 
168
 
169
 		// stage job info
169
 		// stage job info
170
 		XxlJobInfo exists_jobInfo = xxlJobInfoDao.loadById(jobInfo.getId());
170
 		XxlJobInfo exists_jobInfo = xxlJobInfoDao.loadById(jobInfo.getId());
171
+        String old_cron = exists_jobInfo.getJobCron();
171
 		if (exists_jobInfo == null) {
172
 		if (exists_jobInfo == null) {
172
 			return new ReturnT<String>(500, "参数异常");
173
 			return new ReturnT<String>(500, "参数异常");
173
 		}
174
 		}
181
 		exists_jobInfo.setExecutorParam(jobInfo.getExecutorParam());
182
 		exists_jobInfo.setExecutorParam(jobInfo.getExecutorParam());
182
 		exists_jobInfo.setGlueSwitch(jobInfo.getGlueSwitch());
183
 		exists_jobInfo.setGlueSwitch(jobInfo.getGlueSwitch());
183
 		exists_jobInfo.setChildJobKey(jobInfo.getChildJobKey());
184
 		exists_jobInfo.setChildJobKey(jobInfo.getChildJobKey());
184
-		
185
-		try {
186
-			// fresh quartz
187
-			boolean ret = XxlJobDynamicScheduler.rescheduleJob(String.valueOf(exists_jobInfo.getJobGroup()), String.valueOf(exists_jobInfo.getId()), exists_jobInfo.getJobCron());
188
-			if (ret) {
189
-				xxlJobInfoDao.update(exists_jobInfo);
190
-				return ReturnT.SUCCESS;
191
-			} else {
192
-				return new ReturnT<String>(500, "更新任务失败");
193
-			}
194
-		} catch (SchedulerException e) {
195
-			logger.error("", e);
196
-		}
185
+        xxlJobInfoDao.update(exists_jobInfo);
186
+
187
+        try {
188
+            // fresh quartz
189
+            boolean ret = XxlJobDynamicScheduler.rescheduleJob(String.valueOf(exists_jobInfo.getJobGroup()), String.valueOf(exists_jobInfo.getId()), exists_jobInfo.getJobCron());
190
+            return ret?ReturnT.SUCCESS:ReturnT.FAIL;
191
+        } catch (SchedulerException e) {
192
+            logger.error("", e);
193
+        }
194
+
197
 		return ReturnT.FAIL;
195
 		return ReturnT.FAIL;
198
 	}
196
 	}
199
 
197
 

+ 1 - 1
xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js Ver fichero

11
 			dataType : "json",
11
 			dataType : "json",
12
 			success : function(data){
12
 			success : function(data){
13
 				if (data.code == 200) {
13
 				if (data.code == 200) {
14
-					$("#jobId").html('<option value="" >请选择</option>');
14
+					$("#jobId").html('<option value="0" >请选择</option>');
15
 					$.each(data.content, function (n, value) {
15
 					$.each(data.content, function (n, value) {
16
                         $("#jobId").append('<option value="' + value.id + '" >' + value.jobDesc + '</option>');
16
                         $("#jobId").append('<option value="' + value.id + '" >' + value.jobDesc + '</option>');
17
                     });
17
                     });