bugfix:修复定时任务页面bug
This commit is contained in:
@@ -251,7 +251,6 @@ public class BaseQuartzConfigController{
|
||||
String remark = StringDUtil.changeNullToEmpty(map.get("remark"));
|
||||
String quartzType=StringDUtil.changeNullToEmpty(map.get("jobType"));
|
||||
String time=StringDUtil.changeNullToEmpty(map.get("time"));
|
||||
String status=StringDUtil.changeNullToEmpty(map.get("status"));
|
||||
|
||||
if(time==null || "".equals(time)){
|
||||
throw new RuntimeException("time为空");
|
||||
@@ -269,7 +268,9 @@ public class BaseQuartzConfigController{
|
||||
updateMap.put("quartzType", quartzType);
|
||||
this.baseQuartzConfigService.updateQuartzConfigById(updateMap);
|
||||
|
||||
if("0".equals(status)){
|
||||
// 查询当前任务状态,如果是运行中状态则重启任务
|
||||
BaseQuartzConfigEntity currentEntity = baseQuartzConfigService.get(configId);
|
||||
if(currentEntity != null && "1".equals(currentEntity.getStatus())){
|
||||
mySchedulerFactory.pauseJob(configId);
|
||||
Thread.sleep(100);
|
||||
mySchedulerFactory.resumeJob(configId);
|
||||
@@ -341,6 +342,11 @@ public class BaseQuartzConfigController{
|
||||
//拼接cron表达式
|
||||
String cronStr= "";
|
||||
|
||||
// 如果dataStr包含空格,说明是完整的cron表达式,直接返回
|
||||
if(StringDUtil.isNotBlank(dataStr) && dataStr.contains(" ")){
|
||||
return dataStr;
|
||||
}
|
||||
|
||||
//拆分时分秒
|
||||
String[] split = dataStr.split(":");
|
||||
|
||||
|
||||
Reference in New Issue
Block a user