Merge remote-tracking branch 'origin/developer' into developer

byit-myth-admin/src/main/java/com/byit/service/impl/ApiNodeServiceImpl.java

@@ -17,6 +17,7 @@ import com.byit.model.JobTaskRunLog;
 import com.byit.model.JobTaskRunLogWithBLOBs;
 import com.byit.model.JobTaskSchedule;
 import com.byit.service.ApiNodeService;
+import com.byit.task.JavaTaskJobTask;
 import com.byit.task.ScriptExecutorJobTask;
 import com.byit.utils.ValidationUtil;
 import io.netty.util.TimerTask;
@@ -207,28 +208,8 @@ public class ApiNodeServiceImpl implements ApiNodeService {
         JavaTask javaTask = javaTaskMapper.findByJobName(jobName);
         ValidationUtil.dataNotNull(javaTask, "没有此任务实例！");
         Long triggerTime = System.currentTimeMillis();
-        String runId = UUID.randomUUID().toString().replace("-","");
 
-        JobTaskSchedule schedule = new JobTaskSchedule();
-        schedule.setNodeId(Integer.valueOf(javaTask.getId()));
-        schedule.setRunId(runId);
-        schedule.setNodeName(javaTask.getJobName());
-        schedule.setIsVirtual(NodePropertyEnum.ISNOT_VIRTUAL.getCode());
-        schedule.setJobType(NodeTypeEnum.JAVA.getCode());
-        schedule.setTriggerTime(triggerTime);
-        schedule.setScheduleType(ScheduleTypeEnum.JAVA_SYNC.getCode());
-        schedule.setPriority("1");
-        schedule.setRunParam(javaTask.getParam());
-
-        JobTaskRunLogWithBLOBs jobTaskRunLog = new JobTaskRunLogWithBLOBs();
-        BeanUtils.copyProperties(schedule, jobTaskRunLog);
-
-        jobTaskRunLogMapper.saveJobTaskRunLog(jobTaskRunLog);
-        //获取日志id
-        Integer logId= jobTaskRunLog.getLogId();
-        //设置日志id
-        schedule.setLogId(logId);
-        TimerTask timerTask = new ScriptExecutorJobTask(schedule);
+        TimerTask timerTask = new JavaTaskJobTask(javaTask);
         WorkRoulette.addJob(timerTask, triggerTime);
 
     }