Commit 88676f99 by huangfusuper

..

parent a941cfbe
...@@ -229,7 +229,7 @@ public class ApiNodeServiceImpl implements ApiNodeService { ...@@ -229,7 +229,7 @@ public class ApiNodeServiceImpl implements ApiNodeService {
javaTask.setJobName(javaTask.getTaskName()); javaTask.setJobName(javaTask.getTaskName());
} }
javaTask.setTriggerTime(0L); javaTask.setTriggerTime(0L);
if (!"0".equals(javaTask.getAlarmlAction())){ if (!"0".equals(javaTask.getAlarmlAction()) && StringUtils.isBlank(javaTask.getAlarmEmail())){
ValidationUtil.dataNotBank(javaTask.getAlarmEmail(), "设置为告警时告警邮箱不允许为空"); ValidationUtil.dataNotBank(javaTask.getAlarmEmail(), "设置为告警时告警邮箱不允许为空");
} }
TimerTask timerTask = new JavaTaskJobTask(javaTask); TimerTask timerTask = new JavaTaskJobTask(javaTask);
...@@ -347,7 +347,7 @@ public class ApiNodeServiceImpl implements ApiNodeService { ...@@ -347,7 +347,7 @@ public class ApiNodeServiceImpl implements ApiNodeService {
if(null != javaTask.getRepeatCount() && -1 != javaTask.getRepeatCount()){ if(null != javaTask.getRepeatCount() && -1 != javaTask.getRepeatCount()){
javaTask.setRemainingCount(javaTask.getRemainingCount()); javaTask.setRemainingCount(javaTask.getRemainingCount());
} }
if (null != javaTask.getAlarmlAction() && "0".equals(javaTask.getRepeatCount())){ if (null != javaTask.getAlarmlAction() && "0".equals(javaTask.getAlarmlAction())){
ValidationUtil.dataNotBank(javaTask.getAlarmEmail(), "设置为告警时告警邮箱不允许为空"); ValidationUtil.dataNotBank(javaTask.getAlarmEmail(), "设置为告警时告警邮箱不允许为空");
} }
return javaTask; return javaTask;
......
...@@ -69,7 +69,7 @@ public class JavaTask implements Serializable { ...@@ -69,7 +69,7 @@ public class JavaTask implements Serializable {
/** /**
* 当前节点的告警的时机(0 不告警, 1 完成时告警, 2 失败时告警, 3 成功时告警) * 当前节点的告警的时机(0 不告警, 1 完成时告警, 2 失败时告警, 3 成功时告警)
*/ */
private String alarmlAction; private String alarmlAction = "0";
/** /**
* 告警邮箱 * 告警邮箱
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment