JAVA节点支持

byit-myth-core/myth-admin-core/src/main/java/com/byit/task/JavaBeanJobTask.java

@@ -32,6 +32,7 @@ import java.util.Date;
  * @date: 2019/11/20 15:08
  **/
 @Slf4j
+@Deprecated
 public class JavaBeanJobTask implements TimerTask {
 
     private final String HTTP_PRE = "http://";

byit-myth-core/myth-admin-core/src/main/java/com/byit/thread/helper/ScheduleThreadRunHelper.java

 package com.byit.thread.helper;
 
 import cn.hutool.core.collection.CollectionUtil;
+import com.byit.dto.plugin.JavaTask;
 import com.byit.enums.NodeTypeEnum;
 import com.byit.enums.PlaceholderEnum;
 import com.byit.enums.ScheduleTypeEnum;
@@ -12,6 +13,7 @@ import com.byit.model.JobTaskSchedule;
 import com.byit.service.JobTaskScheduleService;
 import com.byit.service.impl.JobTaskRunLogServiceImpl;
 import com.byit.task.JavaBeanJobTask;
+import com.byit.task.JavaTaskJobTask;
 import com.byit.task.ScriptExecutorJobTask;
 import com.byit.thread.BaseThreadRunHelper;
 import com.byit.util.SpringUtil;
@@ -66,7 +68,12 @@ public class ScheduleThreadRunHelper extends BaseThreadRunHelper {
                 if (NodeTypeEnum.JAVA.getType().equals(mythJobTaskSchedule.getJobType())) {
                     log.debug("------节点{}，开始构建java执行器-------",mythJobTaskSchedule);
                     //构建调度执行器
-                    timerTask = new JavaBeanJobTask(mythJobTaskSchedule);
+                    JavaTask javaTask = new JavaTask();
+                    javaTask.setTriggerTime(mythJobTaskSchedule.getTriggerTime());
+                    javaTask.setJobName(mythJobTaskSchedule.getNodeName());
+                    javaTask.setTaskName(mythJobTaskSchedule.getNodeName());
+                    javaTask.setParam(mythJobTaskSchedule.getRunParam());
+                    timerTask = new JavaTaskJobTask(javaTask);
                 }else if(NodeTypeEnum.PYTHON.getCode().equals(mythJobTaskSchedule.getJobType())){
                     log.debug("------节点{}，开始构建脚本执行器-------",mythJobTaskSchedule);
                     //构建脚本调度执行器

byit-myth-core/myth-dto-core/src/main/java/com/byit/dto/plugin/JavaTask.java

@@ -76,6 +76,16 @@ public class JavaTask implements Serializable {
     private String alarmEmail;
 
     /**
+     * 调度类型
+     */
+    private String scheduleType;
+
+    /**
+     * 任务类型
+     */
+    private String jobType;
+
+    /**
      */
     private static final long serialVersionUID = 1L;
 }