【基础代码重构】基础代码重构

byit-myth-admin/src/main/java/com/byit/controller/JobController.java

@@ -3,7 +3,6 @@ package com.byit.controller;
 import com.byit.conf.MythJobAutoConfigure;
 import com.byit.job.dto.JobRunResultDto;
 import com.byit.job.dto.PluginBeanJobInfo;
-import com.byit.model.JobTask;
 import com.byit.service.JobTaskService;
 import com.byit.thread.LogCallbackThread;
 import com.byit.util.SourceObj2TargetObjUtil;

byit-myth-core/myth-admin-core/src/main/java/com/byit/mapper/EmailAlarmMapper.java

+package com.byit.mapper;
+
+import com.byit.model.EmailAlarm;
+
+public interface EmailAlarmMapper {
+    int deleteById(Integer id);
+
+    int insert(EmailAlarm record);
+
+    int insertSelective(EmailAlarm record);
+
+    EmailAlarm getById(Integer id);
+
+    int updateByIdSelective(EmailAlarm record);
+
+    int updateByIdWithBLOBs(EmailAlarm record);
+
+    int updateById(EmailAlarm record);
+}
\ No newline at end of file

byit-myth-core/myth-admin-core/src/main/java/com/byit/mapper/FlowDependentMapper.java

+package com.byit.mapper;
+
+import com.byit.model.FlowDependentKey;
+
+public interface FlowDependentMapper {
+    int deleteById(FlowDependentKey key);
+
+    int insert(FlowDependentKey record);
+
+    int insertSelective(FlowDependentKey record);
+}
\ No newline at end of file

byit-myth-core/myth-admin-core/src/main/java/com/byit/mapper/FlowMapper.java

+package com.byit.mapper;
+
+import com.byit.model.Flow;
+
+public interface FlowMapper {
+    int deleteById(Integer flowId);
+
+    int insert(Flow record);
+
+    int insertSelective(Flow record);
+
+    Flow getById(Integer flowId);
+
+    int updateByIdSelective(Flow record);
+
+    int updateById(Flow record);
+}
\ No newline at end of file

byit-myth-core/myth-admin-core/src/main/java/com/byit/mapper/FlowVersionDependentMapper.java

+package com.byit.mapper;
+
+import com.byit.model.FlowVersionDependentKey;
+
+public interface FlowVersionDependentMapper {
+    int deleteById(FlowVersionDependentKey key);
+
+    int insert(FlowVersionDependentKey record);
+
+    int insertSelective(FlowVersionDependentKey record);
+}
\ No newline at end of file

byit-myth-core/myth-admin-core/src/main/java/com/byit/mapper/FlowVersionMapper.java

+package com.byit.mapper;
+
+import com.byit.model.FlowVersion;
+
+public interface FlowVersionMapper {
+    int deleteById(Integer flowVersionId);
+
+    int insert(FlowVersion record);
+
+    int insertSelective(FlowVersion record);
+
+    FlowVersion getById(Integer flowVersionId);
+
+    int updateByIdSelective(FlowVersion record);
+
+    int updateById(FlowVersion record);
+}
\ No newline at end of file

byit-myth-core/myth-admin-core/src/main/java/com/byit/mapper/JobFlowDependentMapper.java

-package com.byit.mapper;
-
-import com.byit.model.JobFlowDependentKey;
-
-public interface JobFlowDependentMapper {
-    int deleteById(JobFlowDependentKey key);
-
-    int insert(JobFlowDependentKey record);
-
-    int insertSelective(JobFlowDependentKey record);
-}
\ No newline at end of file

byit-myth-core/myth-admin-core/src/main/java/com/byit/mapper/JobFlowMapper.java

-package com.byit.mapper;
-
-import com.byit.model.JobFlow;
-
-public interface JobFlowMapper {
-    int deleteById(Integer flowId);
-
-    int insert(JobFlow record);
-
-    int insertSelective(JobFlow record);
-
-    JobFlow getById(Integer flowId);
-
-    int updateByIdSelective(JobFlow record);
-
-    int updateById(JobFlow record);
-}
\ No newline at end of file

byit-myth-core/myth-admin-core/src/main/java/com/byit/mapper/JobFlowNodeMapper.java

-package com.byit.mapper;
-
-import com.byit.model.JobFlowNode;
-
-public interface JobFlowNodeMapper {
-    int deleteById(Integer nodeId);
-
-    int insert(JobFlowNode record);
-
-    int insertSelective(JobFlowNode record);
-
-    JobFlowNode getById(Integer nodeId);
-
-    int updateByIdSelective(JobFlowNode record);
-
-    int updateByIdWithBLOBs(JobFlowNode record);
-
-    int updateById(JobFlowNode record);
-}
\ No newline at end of file

byit-myth-core/myth-admin-core/src/main/java/com/byit/mapper/JobFlowRunRecordingMapper.java

-package com.byit.mapper;
-
-import com.byit.model.JobFlowRunRecording;
-
-public interface JobFlowRunRecordingMapper {
-    int deleteById(Integer recordingId);
-
-    int insert(JobFlowRunRecording record);
-
-    int insertSelective(JobFlowRunRecording record);
-
-    JobFlowRunRecording getById(Integer recordingId);
-
-    int updateByIdSelective(JobFlowRunRecording record);
-
-    int updateById(JobFlowRunRecording record);
-}
\ No newline at end of file

byit-myth-core/myth-admin-core/src/main/java/com/byit/mapper/JobFlowVersionMapper.java

-package com.byit.mapper;
-
-import com.byit.model.JobFlowVersion;
-
-public interface JobFlowVersionMapper {
-    int deleteById(Integer flowVersionId);
-
-    int insert(JobFlowVersion record);
-
-    int insertSelective(JobFlowVersion record);
-
-    JobFlowVersion getById(Integer flowVersionId);
-
-    int updateByIdSelective(JobFlowVersion record);
-
-    int updateById(JobFlowVersion record);
-}
\ No newline at end of file

byit-myth-core/myth-admin-core/src/main/java/com/byit/mapper/JobTaskMapper.java

@@ -7,56 +7,48 @@ import org.springframework.stereotype.Repository;
 import java.util.List;
 
 /**
- * 任务表的操作
- * @author AutomaticGenerated
+ * 任务表操作
+ * @author huangfu
  */
 @Repository
 public interface JobTaskMapper {
     /**
-     * 查询七秒内即将执行的数据
-     * @param maxNextTime
+     * 七秒内要查询的数据
+     * @param triggerNextTime
      * @return
      */
-    List<JobTask> findJobTaskByTriggerNextTimeLessThanEqual(Long maxNextTime);
+    List<JobTask> findJobTaskByTriggerNextTimeLessThanEqual(@Param("triggerNextTime") Long triggerNextTime);
 
     /**
-     * 根据id返回
-     * @param id 节点的id
-     * @return
-     */
-    JobTask getById(Integer id);
-    /**
-     * 插入
-     * @param record
+     * 根据id查询
+     * @param id
      * @return
      */
-    int insert(JobTask record);
+    JobTask findJobTaskById(Integer id);
     /**
-     * 动态插入
-     * @param record
+     * 根据id删除一条数据
+     * @param id
      * @return
      */
-    int insertSelective(JobTask record);
+    int deleteById(Integer id);
 
     /**
-     * 动态修改根据id
-     * @param record
+     * 动态插入
+     * @param jobTask
      * @return
      */
-    int updateByIdSelective(JobTask record);
+    int saveJobTask(JobTask jobTask);
 
     /**
-     * 根据ID删除数据
-     * @param id
+     * 修改任务表
+     * @param jobTask
      * @return
      */
-    int deleteById(Integer id);
+    int updateJobTask(JobTask jobTask);
 
     /**
-     * 批量删除
-     * @param mythJobTasks
-     * @return
+     * 根据id删除多个
+     * @param jobTasks
      */
-    int deleteByIds(@Param("mythJobTasks") List<JobTask> mythJobTasks);
-
+    void deleteInId(List<JobTask> jobTasks);
 }
\ No newline at end of file

byit-myth-core/myth-admin-core/src/main/java/com/byit/mapper/JobTaskRunLogMapper.java

 package com.byit.mapper;
 
 import com.byit.model.JobTaskRunLog;
-import org.springframework.stereotype.Repository;
+import com.byit.model.JobTaskRunLogWithBLOBs;
 
-/**
- * 对执行后日志的操作
- * @author huangfu
- */
-@Repository
 public interface JobTaskRunLogMapper {
     int deleteById(Integer logId);
 
-    int insert(JobTaskRunLog record);
+    int insert(JobTaskRunLogWithBLOBs record);
 
-    /**
-     * 动态插入
-     * @param record
-     * @return
-     */
-    int insertSelective(JobTaskRunLog record);
+    int insertSelective(JobTaskRunLogWithBLOBs record);
 
-    JobTaskRunLog getById(Integer logId);
+    JobTaskRunLogWithBLOBs getById(Integer logId);
 
-    int updateByIdSelective(JobTaskRunLog record);
+    int updateByIdSelective(JobTaskRunLogWithBLOBs record);
 
-    int updateByPrimaryKeyWithBLOBs(JobTaskRunLog record);
+    int updateByIdWithBLOBs(JobTaskRunLogWithBLOBs record);
 
     int updateById(JobTaskRunLog record);
 }
\ No newline at end of file

byit-myth-core/myth-admin-core/src/main/java/com/byit/mapper/JobTaskScheduleMapper.java

 package com.byit.mapper;
 
 import com.byit.model.JobTaskSchedule;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
 
-import java.util.List;
-
-/**
- * @author huangfu
- */
-@Repository
 public interface JobTaskScheduleMapper {
-    /**
-     * 查询五秒内将要执行的数据
-     * @param maxNextTime
-     * @return
-     */
-    List<JobTaskSchedule> findJobTaskScheduleByTriggerNextTimeLessThanEqual(long maxNextTime);
-
-    /**
-     * 插入数据
-     * @param record
-     * @return
-     */
-    int insert(JobTaskSchedule record);
-
-    /**
-     * 根据条件插入一条数据
-     * @param record
-     * @return
-     */
-    int insertSelective(JobTaskSchedule record);
-
-    /**
-     * 批量插入
-     * @param jobTaskSchedules
-     * @return
-     */
-    int insertDataList(@Param("jobTaskSchedules") List<JobTaskSchedule> jobTaskSchedules);
-
     int deleteById(Integer id);
 
+    int insert(JobTaskSchedule record);
 
+    int insertSelective(JobTaskSchedule record);
 
     JobTaskSchedule getById(Integer id);
 
     int updateByIdSelective(JobTaskSchedule record);
 
+    int updateByIdWithBLOBs(JobTaskSchedule record);
+
+    int updateById(JobTaskSchedule record);
 }
\ No newline at end of file

byit-myth-core/myth-admin-core/src/main/java/com/byit/mapper/NodeDependencyMapper.java

+package com.byit.mapper;
+
+import com.byit.model.NodeDependencyKey;
+
+public interface NodeDependencyMapper {
+    int deleteById(NodeDependencyKey key);
+
+    int insert(NodeDependencyKey record);
+
+    int insertSelective(NodeDependencyKey record);
+}
\ No newline at end of file

byit-myth-core/myth-admin-core/src/main/java/com/byit/mapper/NodeMapper.java

+package com.byit.mapper;
+
+import com.byit.model.Node;
+
+public interface NodeMapper {
+    int deleteById(Integer nodeId);
+
+    int insert(Node record);
+
+    int insertSelective(Node record);
+
+    Node getById(Integer nodeId);
+
+    int updateByIdSelective(Node record);
+
+    int updateByIdWithBLOBs(Node record);
+
+    int updateById(Node record);
+}
\ No newline at end of file

byit-myth-core/myth-admin-core/src/main/java/com/byit/mapper/NodeVersionDependencyMapper.java

+package com.byit.mapper;
+
+import com.byit.model.NodeVersionDependencyKey;
+
+public interface NodeVersionDependencyMapper {
+    int deleteById(NodeVersionDependencyKey key);
+
+    int insert(NodeVersionDependencyKey record);
+
+    int insertSelective(NodeVersionDependencyKey record);
+}
\ No newline at end of file

byit-myth-core/myth-admin-core/src/main/java/com/byit/mapper/NodeVersionMapper.java

+package com.byit.mapper;
+
+import com.byit.model.NodeVersion;
+
+public interface NodeVersionMapper {
+    int deleteById(Integer nodeVersionId);
+
+    int insert(NodeVersion record);
+
+    int insertSelective(NodeVersion record);
+
+    NodeVersion getById(Integer nodeVersionId);
+
+    int updateByIdSelective(NodeVersion record);
+
+    int updateByIdWithBLOBs(NodeVersion record);
+
+    int updateById(NodeVersion record);
+}
\ No newline at end of file

byit-myth-core/myth-admin-core/src/main/java/com/byit/mapper/RunRecordingMapper.java

+package com.byit.mapper;
+
+import com.byit.model.RunRecording;
+
+public interface RunRecordingMapper {
+    int deleteById(Integer recordingId);
+
+    int insert(RunRecording record);
+
+    int insertSelective(RunRecording record);
+
+    RunRecording getById(Integer recordingId);
+
+    int updateByIdSelective(RunRecording record);
+
+    int updateById(RunRecording record);
+}
\ No newline at end of file

byit-myth-core/myth-admin-core/src/main/java/com/byit/mapper/SourceHistoryMapper.java

+package com.byit.mapper;
+
+import com.byit.model.SourceHistory;
+
+public interface SourceHistoryMapper {
+    int deleteById(String id);
+
+    int insert(SourceHistory record);
+
+    int insertSelective(SourceHistory record);
+
+    SourceHistory getById(String id);
+
+    int updateByIdSelective(SourceHistory record);
+
+    int updateByIdWithBLOBs(SourceHistory record);
+
+    int updateById(SourceHistory record);
+}
\ No newline at end of file

byit-myth-core/myth-admin-core/src/main/java/com/byit/mapper/jobFlowNodeVersionMapper.java

-package com.byit.mapper;
-
-import com.byit.model.jobFlowNodeVersion;
-
-public interface jobFlowNodeVersionMapper {
-    int deleteById(Integer nodeVersionId);
-
-    int insert(jobFlowNodeVersion record);
-
-    int insertSelective(jobFlowNodeVersion record);
-
-    jobFlowNodeVersion getById(Integer nodeVersionId);
-
-    int updateByIdSelective(jobFlowNodeVersion record);
-
-    int updateByIdWithBLOBs(jobFlowNodeVersion record);
-
-    int updateById(jobFlowNodeVersion record);
-}
\ No newline at end of file

byit-myth-core/myth-admin-core/src/main/java/com/byit/model/EmailAlarm.java

+package com.byit.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ *  
+ */
+@ApiModel
+@Data
+public class EmailAlarm implements Serializable {
+    /**
+     * 主键
+     */
+    @ApiModelProperty("主键")
+    private Integer id;
+
+    /**
+     * 工作流Id
+     */
+    @ApiModelProperty("工作流Id")
+    private Integer flowId;
+
+    /**
+     * 工作流名称
+     */
+    @ApiModelProperty("工作流名称")
+    private String flowName;
+
+    /**
+     * 运行标识
+     */
+    @ApiModelProperty("运行标识")
+    private String runId;
+
+    /**
+     * 版本名称
+     */
+    @ApiModelProperty("版本名称")
+    private String versionName;
+
+    /**
+     * 告警邮箱
+     */
+    @ApiModelProperty("告警邮箱")
+    private String alarmEmail;
+
+    /**
+     * 当前工作流版本的告警的时机(0 不告警， 1 完成时告警， 2 失败时告警， 3 成功时告警)
+     */
+    @ApiModelProperty("当前工作流版本的告警的时机(0 不告警， 1 完成时告警， 2 失败时告警， 3 成功时告警)")
+    private String alarmAction;
+
+    /**
+     * 告警结果(0, 未告警  1,告警成功  2,告警失败)
+     */
+    @ApiModelProperty("告警结果(0, 未告警  1,告警成功  2,告警失败)")
+    private String alarmResult;
+
+    /**
+     * 发送时间
+     */
+    @ApiModelProperty("发送时间")
+    private Date sendTime;
+
+    /**
+     * 告警内容
+     */
+    @ApiModelProperty("告警内容")
+    private String alarmContent;
+
+    /**
+     */
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

byit-myth-core/myth-admin-core/src/main/java/com/byit/model/JobFlow.java → byit-myth-core/myth-admin-core/src/main/java/com/byit/model/Flow.java

@@ -11,7 +11,7 @@ import lombok.Data;
  */
 @ApiModel
 @Data
-public class JobFlow implements Serializable {
+public class Flow implements Serializable {
     /**
      * 当前版本工作流主键
      */
@@ -49,15 +49,15 @@ public class JobFlow implements Serializable {
     private String flowName;
 
     /**
-     * 前版本工作流节点数目
+     * 工作流节点数目
      */
-    @ApiModelProperty("前版本工作流节点数目")
+    @ApiModelProperty("工作流节点数目")
     private Integer flowNodeCount;
 
     /**
-     * 档期啊版本的工作流的超时时间
+     * 工作流的超时时间
      */
-    @ApiModelProperty("档期啊版本的工作流的超时时间")
+    @ApiModelProperty("工作流的超时时间")
     private Long flowTimeout;
 
     /**
@@ -79,16 +79,10 @@ public class JobFlow implements Serializable {
     private String isTop;
 
     /**
-     * 当前工作流版本的告警的时机
+     * 当前工作流版本的告警的时机(0 不告警， 1 完成时告警， 2 失败时告警， 3 成功时告警)
      */
-    @ApiModelProperty("当前工作流版本的告警的时机")
-    private String mailAction;
-
-    /**
-     * 节点是否跟随任务流，1跟随  2不跟随
-     */
-    @ApiModelProperty("节点是否跟随任务流，1跟随  2不跟随")
-    private String nodeDateIsFollowFlow;
+    @ApiModelProperty("当前工作流版本的告警的时机(0 不告警， 1 完成时告警， 2 失败时告警， 3 成功时告警)")
+    private String alarmlAction;
 
     /**
      * 设置任务的优先级，1最低  2最高
@@ -97,18 +91,6 @@ public class JobFlow implements Serializable {
     private String priority;
 
     /**
-     * 当前工作流版本的执行剩余次数
-     */
-    @ApiModelProperty("当前工作流版本的执行剩余次数")
-    private Integer remainingCount;
-
-    /**
-     * 当前工作流版本额重复次数
-     */
-    @ApiModelProperty("当前工作流版本额重复次数")
-    private Integer repeatCount;
-
-    /**
      * 当前版本的工作流的下次执行时间
      */
     @ApiModelProperty("当前版本的工作流的下次执行时间")
@@ -139,6 +121,30 @@ public class JobFlow implements Serializable {
     private String startUp;
 
     /**
+     * 责任人
+     */
+    @ApiModelProperty("责任人")
+    private String principal;
+
+    /**
+     * 版本名称
+     */
+    @ApiModelProperty("版本名称")
+    private String versionName;
+
+    /**
+     * 工作流版本额重复次数
+     */
+    @ApiModelProperty("工作流版本额重复次数")
+    private Integer repeatCount;
+
+    /**
+     * 剩余执行次数
+     */
+    @ApiModelProperty("剩余执行次数")
+    private Integer remainingCount;
+
+    /**
      */
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

byit-myth-core/myth-admin-core/src/main/java/com/byit/model/JobFlowDependentKey.java → byit-myth-core/myth-admin-core/src/main/java/com/byit/model/FlowDependentKey.java

@@ -10,7 +10,7 @@ import lombok.Data;
  */
 @ApiModel
 @Data
-public class JobFlowDependentKey implements Serializable {
+public class FlowDependentKey implements Serializable {
     /**
      * 工作流Id
      */

byit-myth-core/myth-admin-core/src/main/java/com/byit/model/JobFlowVersion.java → byit-myth-core/myth-admin-core/src/main/java/com/byit/model/FlowVersion.java

@@ -11,7 +11,7 @@ import lombok.Data;
  */
 @ApiModel
 @Data
-public class JobFlowVersion implements Serializable {
+public class FlowVersion implements Serializable {
     /**
      * 版本工作流主键
      */
@@ -67,22 +67,16 @@ public class JobFlowVersion implements Serializable {
     private Integer flowNodeCount;
 
     /**
-     * 档期啊版本的工作流的超时时间
+     * 当前工作流版本的告警的时机(0 不告警， 1 完成时告警， 2 失败时告警， 3 成功时告警)
      */
-    @ApiModelProperty("档期啊版本的工作流的超时时间")
-    private Long flowTimeout;
-
-    /**
-     * 工作流版本的告警的时机
-     */
-    @ApiModelProperty("工作流版本的告警的时机")
-    private String mailAction;
+    @ApiModelProperty("当前工作流版本的告警的时机(0 不告警， 1 完成时告警， 2 失败时告警， 3 成功时告警)")
+    private String alarmlAction;
 
     /**
      * 节点是否跟随任务流，1跟随  2不跟随
      */
     @ApiModelProperty("节点是否跟随任务流，1跟随  2不跟随")
-    private String nodeDateIsFollowFlow;
+    private String scheduleFollow;
 
     /**
      * 设置任务的优先级，1最低  2最高
@@ -103,12 +97,6 @@ public class JobFlowVersion implements Serializable {
     private Integer repeatCount;
 
     /**
-     * 修改时间
-     */
-    @ApiModelProperty("修改时间")
-    private Date updateTime;
-
-    /**
      * 当前版本的标志  this
      */
     @ApiModelProperty("当前版本的标志  this")
@@ -127,6 +115,36 @@ public class JobFlowVersion implements Serializable {
     private String author;
 
     /**
+     * 责任人
+     */
+    @ApiModelProperty("责任人")
+    private String principal;
+
+    /**
+     * 版本名称
+     */
+    @ApiModelProperty("版本名称")
+    private String versionName;
+
+    /**
+     * 是否有下游节点  0 否，1 是
+     */
+    @ApiModelProperty("是否有下游节点  0 否，1 是")
+    private String isHaveDepend;
+
+    /**
+     * 是否是内嵌工作流 0 否， 1 是
+     */
+    @ApiModelProperty("是否是内嵌工作流 0 否， 1 是")
+    private String isInner;
+
+    /**
+     * 是否是顶级工作流 0 否， 1 是
+     */
+    @ApiModelProperty("是否是顶级工作流 0 否， 1 是")
+    private String isTop;
+
+    /**
      */
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

byit-myth-core/myth-admin-core/src/main/java/com/byit/model/FlowVersionDependentKey.java

+package com.byit.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import lombok.Data;
+
+/**
+ *  
+ */
+@ApiModel
+@Data
+public class FlowVersionDependentKey implements Serializable {
+    /**
+     * 工作流版本id
+     */
+    @ApiModelProperty("工作流版本id")
+    private Integer flowVersionId;
+
+    /**
+     * 依赖的工作流版本id
+     */
+    @ApiModelProperty("依赖的工作流版本id")
+    private Integer dependentId;
+
+    /**
+     */
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

byit-myth-core/myth-admin-core/src/main/java/com/byit/model/JobTask.java

@@ -3,7 +3,6 @@ package com.byit.model;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
-import java.util.Date;
 import lombok.Data;
 
 /**
@@ -14,7 +13,7 @@ import lombok.Data;
 public class JobTask implements Serializable {
     /**
      */
-    @ApiModelProperty("主键")
+    @ApiModelProperty("")
     private Integer id;
 
     /**
@@ -24,28 +23,16 @@ public class JobTask implements Serializable {
     private Integer nodeId;
 
     /**
-     * 当前工作流版本的报警邮箱
-     */
-    @ApiModelProperty("当前工作流版本的报警邮箱")
-    private String alarmEmail;
-
-    /**
      * 阻塞策略
      */
     @ApiModelProperty("阻塞策略")
     private String blockStrategy;
 
     /**
-     * 调度中心端请求插件时的令牌
-     */
-    @ApiModelProperty("调度中心端请求插件时的令牌")
-    private String callbackToken;
-
-    /**
-     * 该节点的依赖节点
+     * 插件的网络令牌
      */
-    @ApiModelProperty("该节点的依赖节点")
-    private String dependencyNodes;
+    @ApiModelProperty("插件的网络令牌")
+    private String pluginToken;
 
     /**
      * 当前节点的失败重试次数
@@ -60,12 +47,6 @@ public class JobTask implements Serializable {
     private Integer flowId;
 
     /**
-     * 是否跟随任务流 1跟随 2不跟随
-     */
-    @ApiModelProperty("是否跟随任务流 1跟随 2不跟随")
-    private String followTaskFlow;
-
-    /**
      * 插件端请求调度中心的令牌
      */
     @ApiModelProperty("插件端请求调度中心的令牌")
@@ -81,19 +62,7 @@ public class JobTask implements Serializable {
      * 本地节点（插件方） 的节点的名字
      */
     @ApiModelProperty("本地节点（插件方） 的节点的名字")
-    private String localNodeHandlerName;
-
-    /**
-     * 当前工作流版本的告警的时机
-     */
-    @ApiModelProperty("当前工作流版本的告警的时机")
-    private String mailAction;
-
-    /**
-     * 这个在设置节点执行时间跟随任务流的时候，他是没用的，但是设置不跟随的时候，节点的执行按照他自己的时间执行
-     */
-    @ApiModelProperty("这个在设置节点执行时间跟随任务流的时候，他是没用的，但是设置不跟随的时候，节点的执行按照他自己的时间执行")
-    private String nodeCron;
+    private String handlerName;
 
     /**
      * 节点的说明
@@ -108,10 +77,10 @@ public class JobTask implements Serializable {
     private String nodeName;
 
     /**
-     * nodeOfFlowId
+     * 映射的工作流id（当节点为虚节点，有意义）
      */
-    @ApiModelProperty("nodeOfFlowId")
-    private Integer nodeOfFlowId;
+    @ApiModelProperty("映射的工作流id（当节点为虚节点，有意义）")
+    private Integer mapFlowId;
 
     /**
      * 节点的超时时间 -1不超时
@@ -120,10 +89,10 @@ public class JobTask implements Serializable {
     private Long nodeTimeout;
 
     /**
-     * 节点的类型 node flow
+     * 是否是虚节点（0 是， 1 否），虚节点代表是内嵌工作流
      */
-    @ApiModelProperty("节点的类型 node flow")
-    private String nodeType;
+    @ApiModelProperty("是否是虚节点（0 是， 1 否），虚节点代表是内嵌工作流")
+    private String isVirtual;
 
     /**
      * 插件端的url集合
@@ -138,22 +107,10 @@ public class JobTask implements Serializable {
     private String priority;
 
     /**
-     * 节点的剩余次数
+     * 失败重试的间隔（单位毫秒）
      */
-    @ApiModelProperty("节点的剩余次数")
-    private Integer remainingCount;
-
-    /**
-     * 当前节点总共重复次数
-     */
-    @ApiModelProperty("当前节点总共重复次数")
-    private Integer repeatCount;
-
-    /**
-     * 重试的间隔
-     */
-    @ApiModelProperty("重试的间隔")
-    private Long retryInterval;
+    @ApiModelProperty("失败重试的间隔（单位毫秒）")
+    private Long failedRetryInterval;
 
     /**
      * 路由策略
@@ -192,16 +149,10 @@ public class JobTask implements Serializable {
     private String sourcePrincipal;
 
     /**
-     * 源码的修改时间
-     */
-    @ApiModelProperty("源码的修改时间")
-    private Date sourceUpdateTime;
-
-    /**
-     * 当前版本的节点的下次执行时间
+     * 节点的本次执行时间
      */
-    @ApiModelProperty("当前版本的节点的下次执行时间")
-    private Long triggerNextTime;
+    @ApiModelProperty("节点的本次执行时间")
+    private Long triggerTime;
 
     /**
      * 调度状态：0-暂停，1-运行
@@ -210,32 +161,23 @@ public class JobTask implements Serializable {
     private String triggerStatus;
 
     /**
-     * 源码
+     * 工作流版本名称
      */
-    @ApiModelProperty("源码")
-    private String runSource;
+    @ApiModelProperty("工作流版本名称")
+    private String versionName;
 
     /**
-     * 创建人
+     * 运行命令
      */
-    @ApiModelProperty("创建人")
-    private String author;
+    @ApiModelProperty("运行命令")
+    private String runCommand;
 
     /**
-     * 创建时间
-     */
-    @ApiModelProperty("创建时间")
-    private Date addTime;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty("版本id")
-    private Integer versionId;
-    /**
-     * 创建人
+     * 源码
      */
-    @ApiModelProperty("版本名称")
-    private String versionName;
+    @ApiModelProperty("源码")
+    private String runSource;
+
     /**
      */
     private static final long serialVersionUID = 1L;

byit-myth-core/myth-admin-core/src/main/java/com/byit/model/JobTaskRunLog.java

@@ -19,40 +19,28 @@ public class JobTaskRunLog implements Serializable {
     private Integer logId;
 
     /**
-     * 当前工作流版本的报警邮箱
-     */
-    @ApiModelProperty("当前工作流版本的报警邮箱")
-    private String alarmEmail;
-
-    /**
-     * 告警结果,1-告警成功 2-告警失败
-     */
-    @ApiModelProperty("告警结果,1-告警成功 2-告警失败")
-    private String alarmStatus;
-
-    /**
      * 当前节点的失败剩余重试次数  初始阶段为初始的重试次数
      */
     @ApiModelProperty("当前节点的失败剩余重试次数  初始阶段为初始的重试次数")
     private Integer failedRemainingCount;
 
     /**
-     * 任务流版本的主键
+     * 版本名称
      */
-    @ApiModelProperty("任务流版本的主键")
-    private Integer flowVersionId;
+    @ApiModelProperty("版本名称")
+    private String versionName;
 
     /**
      * 任务流主键
      */
     @ApiModelProperty("任务流主键")
-    private Integer jobFlowId;
+    private Integer flowId;
 
     /**
      * 所属任务流的名称
      */
     @ApiModelProperty("所属任务流的名称")
-    private String jobFlowName;
+    private String flowName;
 
     /**
      * 执行机主键
@@ -61,22 +49,10 @@ public class JobTaskRunLog implements Serializable {
     private Integer jobGroupId;
 
     /**
-     * 任务类型  BEAN  ACTUATOR
-     */
-    @ApiModelProperty("任务类型  BEAN  ACTUATOR")
-    private String jobType;
-
-    /**
      * 插件方节点key
      */
     @ApiModelProperty("插件方节点key")
-    private String localNodeHandlerName;
-
-    /**
-     * 当前工作流版本的告警的时机
-     */
-    @ApiModelProperty("当前工作流版本的告警的时机")
-    private String mailAction;
+    private String handlerName;
 
     /**
      * 节点名称
@@ -85,10 +61,10 @@ public class JobTaskRunLog implements Serializable {
     private String nodeName;
 
     /**
-     * 节点类型  node type
+     * 是否是虚节点（0 是， 1 否），虚节点代表是内嵌工作流
      */
-    @ApiModelProperty("节点类型  node type")
-    private String nodeType;
+    @ApiModelProperty("是否是虚节点（0 是， 1 否），虚节点代表是内嵌工作流")
+    private String isVirtual;
 
     /**
      * 运行结果
@@ -103,15 +79,15 @@ public class JobTaskRunLog implements Serializable {
     private String runParams;
 
     /**
-     * 执行时间
+     * 开始时间
      */
-    @ApiModelProperty("执行时间")
-    private Date runTime;
+    @ApiModelProperty("开始时间")
+    private Date startTime;
 
     /**
-     * 运行方式 1执行机运行，2本地运行
+     * 运行方式 1执行机运行，2插件运行
      */
-    @ApiModelProperty("运行方式 1执行机运行，2本地运行")
+    @ApiModelProperty("运行方式 1执行机运行，2插件运行")
     private String runType;
 
     /**
@@ -127,22 +103,34 @@ public class JobTaskRunLog implements Serializable {
     private Date triggerTime;
 
     /**
-     * 运行结果信息
+     * 执行机的IP地址
+     */
+    @ApiModelProperty("执行机的IP地址")
+    private String jobGroupIp;
+
+    /**
+     * 映射的工作流id（当节点为虚节点，有意义）
+     */
+    @ApiModelProperty("映射的工作流id（当节点为虚节点，有意义）")
+    private Integer mapFlowId;
+
+    /**
+     * 运行命令
      */
-    @ApiModelProperty("运行结果信息")
-    private String runMsg;
+    @ApiModelProperty("运行命令")
+    private String runCommand;
 
     /**
-     * 调度信息
+     * 结束时间
      */
-    @ApiModelProperty("调度信息")
-    private String triggerMsg;
+    @ApiModelProperty("结束时间")
+    private Date endTime;
 
     /**
-     * 任务版本名称
+     * 节点id
      */
-    @ApiModelProperty("任务版本名称")
-    private String jobVersionName;
+    @ApiModelProperty("节点id")
+    private Integer nodeId;
 
     /**
      */

byit-myth-core/myth-admin-core/src/main/java/com/byit/model/JobTaskRunLogWithBLOBs.java

+package com.byit.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import lombok.Data;
+
+/**
+ *  
+ */
+@ApiModel
+@Data
+public class JobTaskRunLogWithBLOBs extends JobTaskRunLog implements Serializable {
+    /**
+     * 运行结果信息
+     */
+    @ApiModelProperty("运行结果信息")
+    private String runMsg;
+
+    /**
+     * 调度信息
+     */
+    @ApiModelProperty("调度信息")
+    private String triggerMsg;
+
+    /**
+     */
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

byit-myth-core/myth-admin-core/src/main/java/com/byit/model/JobTaskSchedule.java

@@ -3,7 +3,6 @@ package com.byit.model;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
-import java.util.Date;
 import lombok.Data;
 
 /**
@@ -13,9 +12,8 @@ import lombok.Data;
 @Data
 public class JobTaskSchedule implements Serializable {
     /**
-     * 排期表的主键
      */
-    @ApiModelProperty("排期表的主键")
+    @ApiModelProperty("")
     private Integer id;
 
     /**
@@ -25,28 +23,16 @@ public class JobTaskSchedule implements Serializable {
     private Integer nodeId;
 
     /**
-     * 当前工作流版本的报警邮箱
-     */
-    @ApiModelProperty("当前工作流版本的报警邮箱")
-    private String alarmEmail;
-
-    /**
      * 阻塞策略
      */
     @ApiModelProperty("阻塞策略")
     private String blockStrategy;
 
     /**
-     * 调度中心端请求插件时的令牌
-     */
-    @ApiModelProperty("调度中心端请求插件时的令牌")
-    private String callbackToken;
-
-    /**
-     * 该节点的依赖节点
+     * 插件的网络令牌
      */
-    @ApiModelProperty("该节点的依赖节点")
-    private String dependencyNodes;
+    @ApiModelProperty("插件的网络令牌")
+    private String pluginToken;
 
     /**
      * 当前节点的失败重试次数
@@ -61,12 +47,6 @@ public class JobTaskSchedule implements Serializable {
     private Integer flowId;
 
     /**
-     * 是否跟随任务流 1跟随 2不跟随
-     */
-    @ApiModelProperty("是否跟随任务流 1跟随 2不跟随")
-    private String followTaskFlow;
-
-    /**
      * 插件端请求调度中心的令牌
      */
     @ApiModelProperty("插件端请求调度中心的令牌")
@@ -82,25 +62,7 @@ public class JobTaskSchedule implements Serializable {
      * 本地节点（插件方） 的节点的名字
      */
     @ApiModelProperty("本地节点（插件方） 的节点的名字")
-    private String localNodeHandlerName;
-
-    /**
-     * 日志ID
-     */
-    @ApiModelProperty("日志ID")
-    private Integer logId;
-
-    /**
-     * 当前工作流版本的告警的时机
-     */
-    @ApiModelProperty("当前工作流版本的告警的时机")
-    private String mailAction;
-
-    /**
-     * 这个在设置节点执行时间跟随任务流的时候，他是没用的，但是设置不跟随的时候，节点的执行按照他自己的时间执行
-     */
-    @ApiModelProperty("这个在设置节点执行时间跟随任务流的时候，他是没用的，但是设置不跟随的时候，节点的执行按照他自己的时间执行")
-    private String nodeCron;
+    private String handlerName;
 
     /**
      * 节点的说明
@@ -115,10 +77,10 @@ public class JobTaskSchedule implements Serializable {
     private String nodeName;
 
     /**
-     * nodeOfFlowId
+     * 映射的工作流id（当节点为虚节点，有意义）
      */
-    @ApiModelProperty("nodeOfFlowId")
-    private Integer nodeOfFlowId;
+    @ApiModelProperty("映射的工作流id（当节点为虚节点，有意义）")
+    private Integer mapFlowId;
 
     /**
      * 节点的超时时间 -1不超时
@@ -127,10 +89,10 @@ public class JobTaskSchedule implements Serializable {
     private Long nodeTimeout;
 
     /**
-     * 节点的类型 node flow
+     * 是否是虚节点（0 是， 1 否），虚节点代表是内嵌工作流
      */
-    @ApiModelProperty("节点的类型 node flow")
-    private String nodeType;
+    @ApiModelProperty("是否是虚节点（0 是， 1 否），虚节点代表是内嵌工作流")
+    private String isVirtual;
 
     /**
      * 插件端的url集合
@@ -145,22 +107,10 @@ public class JobTaskSchedule implements Serializable {
     private String priority;
 
     /**
-     * 节点的剩余次数
+     * 失败重试的间隔（单位毫秒）
      */
-    @ApiModelProperty("节点的剩余次数")
-    private Integer remainingCount;
-
-    /**
-     * 当前节点总共重复次数
-     */
-    @ApiModelProperty("当前节点总共重复次数")
-    private Integer repeatCount;
-
-    /**
-     * 重试的间隔
-     */
-    @ApiModelProperty("重试的间隔")
-    private Long retryInterval;
+    @ApiModelProperty("失败重试的间隔（单位毫秒）")
+    private Long failedRetryInterval;
 
     /**
      * 路由策略
@@ -199,16 +149,10 @@ public class JobTaskSchedule implements Serializable {
     private String sourcePrincipal;
 
     /**
-     * 源码的修改时间
-     */
-    @ApiModelProperty("源码的修改时间")
-    private Date sourceUpdateTime;
-
-    /**
-     * 当前版本的节点的下次执行时间
+     * 节点的本次执行时间
      */
-    @ApiModelProperty("当前版本的节点的下次执行时间")
-    private Long triggerNextTime;
+    @ApiModelProperty("节点的本次执行时间")
+    private Long triggerTime;
 
     /**
      * 调度状态：0-暂停，1-运行
@@ -217,32 +161,29 @@ public class JobTaskSchedule implements Serializable {
     private String triggerStatus;
 
     /**
-     * 源码
+     * 工作流版本名称
      */
-    @ApiModelProperty("源码")
-    private String runSource;
+    @ApiModelProperty("工作流版本名称")
+    private String versionName;
 
     /**
-     * 创建人
+     * 日志表id
      */
-    @ApiModelProperty("创建人")
-    private String author;
+    @ApiModelProperty("日志表id")
+    private Integer logId;
 
     /**
-     * 创建时间
+     * 运行命令
      */
-    @ApiModelProperty("创建时间")
-    private Date addTime;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty("版本id")
-    private Integer versionId;
+    @ApiModelProperty("运行命令")
+    private String runCommand;
+
     /**
-     * 创建人
+     * 源码
      */
-    @ApiModelProperty("版本名称")
-    private String versionName;
+    @ApiModelProperty("源码")
+    private String runSource;
+
     /**
      */
     private static final long serialVersionUID = 1L;

byit-myth-core/myth-admin-core/src/main/java/com/byit/model/JobFlowNode.java → byit-myth-core/myth-admin-core/src/main/java/com/byit/model/Node.java

@@ -11,7 +11,7 @@ import lombok.Data;
  */
 @ApiModel
 @Data
-public class JobFlowNode implements Serializable {
+public class Node implements Serializable {
     /**
      * 当前版本节点主键
      */
@@ -19,28 +19,16 @@ public class JobFlowNode implements Serializable {
     private Integer nodeId;
 
     /**
-     * 当前工作流版本的报警邮箱
-     */
-    @ApiModelProperty("当前工作流版本的报警邮箱")
-    private String alarmEmail;
-
-    /**
      * 阻塞策略
      */
     @ApiModelProperty("阻塞策略")
     private String blockStrategy;
 
     /**
-     * 调度中心端请求插件时的令牌
-     */
-    @ApiModelProperty("调度中心端请求插件时的令牌")
-    private String callbackToken;
-
-    /**
-     * 该节点的依赖节点
+     * 插件端网关令牌
      */
-    @ApiModelProperty("该节点的依赖节点")
-    private String dependencyNodes;
+    @ApiModelProperty("插件端网关令牌")
+    private String pluginToken;
 
     /**
      * 当前节点的失败重试次数
@@ -55,12 +43,6 @@ public class JobFlowNode implements Serializable {
     private Integer flowId;
 
     /**
-     * 是否跟随任务流 1跟随 2不跟随
-     */
-    @ApiModelProperty("是否跟随任务流 1跟随 2不跟随")
-    private String followTaskFlow;
-
-    /**
      * 插件端请求调度中心的令牌
      */
     @ApiModelProperty("插件端请求调度中心的令牌")
@@ -76,13 +58,7 @@ public class JobFlowNode implements Serializable {
      * 本地节点（插件方） 的节点的名字
      */
     @ApiModelProperty("本地节点（插件方） 的节点的名字")
-    private String localNodeHandlerName;
-
-    /**
-     * 当前工作流版本的告警的时机
-     */
-    @ApiModelProperty("当前工作流版本的告警的时机")
-    private String mailAction;
+    private String handlerName;
 
     /**
      * 这个在设置节点执行时间跟随任务流的时候，他是没用的，但是设置不跟随的时候，节点的执行按照他自己的时间执行
@@ -103,10 +79,10 @@ public class JobFlowNode implements Serializable {
     private String nodeName;
 
     /**
-     * nodeOfFlowId
+     * 映射的工作流id（当节点为虚节点，有意义）
      */
-    @ApiModelProperty("nodeOfFlowId")
-    private Integer nodeOfFlowId;
+    @ApiModelProperty("映射的工作流id（当节点为虚节点，有意义）")
+    private Integer mapFlowId;
 
     /**
      * 节点的超时时间 -1不超时
@@ -115,10 +91,10 @@ public class JobFlowNode implements Serializable {
     private Long nodeTimeout;
 
     /**
-     * 节点的类型 node flow
+     * 是否是虚节点（0 是， 1 否），虚节点代表是内嵌工作流
      */
-    @ApiModelProperty("节点的类型 node flow")
-    private String nodeType;
+    @ApiModelProperty("是否是虚节点（0 是， 1 否），虚节点代表是内嵌工作流")
+    private String isVirtual;
 
     /**
      * 插件端的url集合
@@ -133,22 +109,22 @@ public class JobFlowNode implements Serializable {
     private String priority;
 
     /**
-     * 节点的剩余次数
+     * 节点剩余执行次数
      */
-    @ApiModelProperty("节点的剩余次数")
+    @ApiModelProperty("节点剩余执行次数")
     private Integer remainingCount;
 
     /**
-     * 当前节点总共重复次数
+     * 节点可执行次数
      */
-    @ApiModelProperty("当前节点总共重复次数")
+    @ApiModelProperty("节点可执行次数")
     private Integer repeatCount;
 
     /**
-     * 重试的间隔
+     * 失败重试的间隔（毫秒）
      */
-    @ApiModelProperty("重试的间隔")
-    private Long retryInterval;
+    @ApiModelProperty("失败重试的间隔（毫秒）")
+    private Long failedRetryInterval;
 
     /**
      * 路由策略
@@ -205,6 +181,24 @@ public class JobFlowNode implements Serializable {
     private Date addTime;
 
     /**
+     * 版本名称
+     */
+    @ApiModelProperty("版本名称")
+    private String versionName;
+
+    /**
+     * 在调度上（0，在 1, 不在）
+     */
+    @ApiModelProperty("在调度上（0，在 1, 不在）")
+    private String onFork;
+
+    /**
+     * 运行命令
+     */
+    @ApiModelProperty("运行命令")
+    private String runCommand;
+
+    /**
      * 源码
      */
     @ApiModelProperty("源码")

byit-myth-core/myth-admin-core/src/main/java/com/byit/model/NodeDependencyKey.java

+package com.byit.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import lombok.Data;
+
+/**
+ *  
+ */
+@ApiModel
+@Data
+public class NodeDependencyKey implements Serializable {
+    /**
+     * 节点id
+     */
+    @ApiModelProperty("节点id")
+    private Integer nodeId;
+
+    /**
+     * 依赖的id
+     */
+    @ApiModelProperty("依赖的id")
+    private Integer dependencyId;
+
+    /**
+     */
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

byit-myth-core/myth-admin-core/src/main/java/com/byit/model/jobFlowNodeVersion.java → byit-myth-core/myth-admin-core/src/main/java/com/byit/model/NodeVersion.java

@@ -11,7 +11,7 @@ import lombok.Data;
  */
 @ApiModel
 @Data
-public class jobFlowNodeVersion implements Serializable {
+public class NodeVersion implements Serializable {
     /**
      * 当前版本节点主键
      */
@@ -25,28 +25,16 @@ public class jobFlowNodeVersion implements Serializable {
     private Integer nodeId;
 
     /**
-     * 当前工作流版本的报警邮箱
-     */
-    @ApiModelProperty("当前工作流版本的报警邮箱")
-    private String alarmEmail;
-
-    /**
      * 阻塞策略
      */
     @ApiModelProperty("阻塞策略")
     private String blockStrategy;
 
     /**
-     * 调度中心端请求插件时的令牌
-     */
-    @ApiModelProperty("调度中心端请求插件时的令牌")
-    private String callbackToken;
-
-    /**
-     * 该节点的依赖节点
+     * 插件端网关令牌
      */
-    @ApiModelProperty("该节点的依赖节点")
-    private String dependencyNodes;
+    @ApiModelProperty("插件端网关令牌")
+    private String puginToken;
 
     /**
      * 当前节点的失败重试次数
@@ -67,12 +55,6 @@ public class jobFlowNodeVersion implements Serializable {
     private Integer flowVersionId;
 
     /**
-     * 是否跟随任务流 1跟随 2不跟随
-     */
-    @ApiModelProperty("是否跟随任务流 1跟随 2不跟随")
-    private String followTaskFlow;
-
-    /**
      * 插件端请求调度中心的令牌
      */
     @ApiModelProperty("插件端请求调度中心的令牌")
@@ -88,13 +70,7 @@ public class jobFlowNodeVersion implements Serializable {
      * 本地节点（插件方） 的节点的名字
      */
     @ApiModelProperty("本地节点（插件方） 的节点的名字")
-    private String localNodeHandlerName;
-
-    /**
-     * 当前工作流版本的告警的时机
-     */
-    @ApiModelProperty("当前工作流版本的告警的时机")
-    private String mailAction;
+    private String handlerName;
 
     /**
      * 这个在设置节点执行时间跟随任务流的时候，他是没用的，但是设置不跟随的时候，节点的执行按照他自己的时间执行
@@ -115,10 +91,10 @@ public class jobFlowNodeVersion implements Serializable {
     private String nodeName;
 
     /**
-     * nodeOfFlowId
+     * 映射的工作流id（当节点为虚节点，有意义）
      */
-    @ApiModelProperty("nodeOfFlowId")
-    private Integer nodeOfFlowId;
+    @ApiModelProperty("映射的工作流id（当节点为虚节点，有意义）")
+    private Integer mapFlowId;
 
     /**
      * 节点的超时时间 -1不超时
@@ -127,10 +103,10 @@ public class jobFlowNodeVersion implements Serializable {
     private Long nodeTimeout;
 
     /**
-     * 节点的类型 node flow
+     * 是否是虚节点（0 是， 1 否），虚节点代表是内嵌工作流
      */
-    @ApiModelProperty("节点的类型 node flow")
-    private String nodeType;
+    @ApiModelProperty("是否是虚节点（0 是， 1 否），虚节点代表是内嵌工作流")
+    private String isVirtual;
 
     /**
      * 插件端的url集合
@@ -157,10 +133,10 @@ public class jobFlowNodeVersion implements Serializable {
     private Integer repeatCount;
 
     /**
-     * 重试的间隔
+     * 失败重试的间隔（毫秒）
      */
-    @ApiModelProperty("重试的间隔")
-    private Long retryInterval;
+    @ApiModelProperty("失败重试的间隔（毫秒）")
+    private Long failedRetryInterval;
 
     /**
      * 路由策略
@@ -199,15 +175,9 @@ public class jobFlowNodeVersion implements Serializable {
     private Date sourceUpdateTime;
 
     /**
-     * 当前版本的节点的下次执行时间
+     * 当前节点的版本标识 this
      */
-    @ApiModelProperty("当前版本的节点的下次执行时间")
-    private Long triggerNextTime;
-
-    /**
-     * 当前节点的版本标识
-     */
-    @ApiModelProperty("当前节点的版本标识")
+    @ApiModelProperty("当前节点的版本标识 this")
     private String versionMark;
 
     /**
@@ -223,6 +193,24 @@ public class jobFlowNodeVersion implements Serializable {
     private Date addTime;
 
     /**
+     * 版本名称
+     */
+    @ApiModelProperty("版本名称")
+    private String versionName;
+
+    /**
+     * 在调度上（0，在 1, 不在）
+     */
+    @ApiModelProperty("在调度上（0，在 1, 不在）")
+    private String onFork;
+
+    /**
+     * 运行命令
+     */
+    @ApiModelProperty("运行命令")
+    private String runCommand;
+
+    /**
      * 源码
      */
     @ApiModelProperty("源码")

byit-myth-core/myth-admin-core/src/main/java/com/byit/model/NodeVersionDependencyKey.java

+package com.byit.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import lombok.Data;
+
+/**
+ *  
+ */
+@ApiModel
+@Data
+public class NodeVersionDependencyKey implements Serializable {
+    /**
+     * 节点版本id
+     */
+    @ApiModelProperty("节点版本id")
+    private Integer nodeVersionId;
+
+    /**
+     * 依赖的id
+     */
+    @ApiModelProperty("依赖的id")
+    private Integer dependencyId;
+
+    /**
+     */
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

byit-myth-core/myth-admin-core/src/main/java/com/byit/model/JobFlowRunRecording.java → byit-myth-core/myth-admin-core/src/main/java/com/byit/model/RunRecording.java

@@ -11,7 +11,7 @@ import lombok.Data;
  */
 @ApiModel
 @Data
-public class JobFlowRunRecording implements Serializable {
+public class RunRecording implements Serializable {
     /**
      * 记录主键
      */
@@ -43,15 +43,15 @@ public class JobFlowRunRecording implements Serializable {
     private String flowName;
 
     /**
-     * 执行结果
+     * 执行结果  1 成功  2 失败
      */
-    @ApiModelProperty("执行结果")
+    @ApiModelProperty("执行结果  1 成功  2 失败")
     private String flowRunResult;
 
     /**
-     * 1 未开始  2运行中  3暂停  4成功  5失败
+     * 运行状态 1 未开始  2运行中  3暂停  4完成
      */
-    @ApiModelProperty("1 未开始  2运行中  3暂停  4成功  5失败")
+    @ApiModelProperty("运行状态 1 未开始  2运行中  3暂停  4完成")
     private String flowStatus;
 
     /**
@@ -61,22 +61,16 @@ public class JobFlowRunRecording implements Serializable {
     private Long flowTimeout;
 
     /**
-     * 工作流的版本id
+     * 工作流的版本名称
      */
-    @ApiModelProperty("工作流的版本id")
-    private Integer flowVersionId;
+    @ApiModelProperty("工作流的版本名称")
+    private Integer flowVersionName;
 
     /**
-     * 当前工作流版本的告警的时机
+     * 当前工作流版本的告警的时机(0 不告警， 1 完成时告警， 2 失败时告警， 3 成功时告警)
      */
-    @ApiModelProperty("当前工作流版本的告警的时机")
-    private String mailAction;
-
-    /**
-     * 节点数量
-     */
-    @ApiModelProperty("节点数量")
-    private Integer nodeCount;
+    @ApiModelProperty("当前工作流版本的告警的时机(0 不告警， 1 完成时告警， 2 失败时告警， 3 成功时告警)")
+    private String alarmlAction;
 
     /**
      * 设置任务的优先级，1最低  2最高
@@ -85,34 +79,40 @@ public class JobFlowRunRecording implements Serializable {
     private String priority;
 
     /**
-     * 初始值为节点总数，每次一个节点运行完就将总数-1
+     * 本次任务的执行时间
+     */
+    @ApiModelProperty("本次任务的执行时间")
+    private Long triggerTime;
+
+    /**
+     * 责任人
      */
-    @ApiModelProperty("初始值为节点总数，每次一个节点运行完就将总数-1")
-    private Integer remainingNode;
+    @ApiModelProperty("责任人")
+    private String principal;
 
     /**
-     * 调度状态：0-未开始，1-调度成功， 2-调度失败
+     * 工作流Id
      */
-    @ApiModelProperty("调度状态：0-未开始，1-调度成功， 2-调度失败")
-    private String triggerStatus;
+    @ApiModelProperty("工作流Id")
+    private Integer flowId;
 
     /**
-     * 本次任务的执行时间
+     * 开始时间
      */
-    @ApiModelProperty("本次任务的执行时间")
-    private Long triggerTime;
+    @ApiModelProperty("开始时间")
+    private Date startTime;
 
     /**
-     * 创建时间
+     * 结束时间
      */
-    @ApiModelProperty("创建时间")
-    private Date addTime;
+    @ApiModelProperty("结束时间")
+    private Date endTime;
 
     /**
-     * 创建人
+     * 是否已告警(0，是   1，否)
      */
-    @ApiModelProperty("创建人")
-    private String author;
+    @ApiModelProperty("是否已告警(0，是   1，否)")
+    private String isAlarm;
 
     /**
      */

byit-myth-core/myth-admin-core/src/main/java/com/byit/model/SourceHistory.java

+package com.byit.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ *  
+ */
+@ApiModel
+@Data
+public class SourceHistory implements Serializable {
+    /**
+     * 历史源码主键
+     */
+    @ApiModelProperty("历史源码主键")
+    private String id;
+
+    /**
+     * 节点主键
+     */
+    @ApiModelProperty("节点主键")
+    private String jobNodeId;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    private String glueRemark;
+
+    /**
+     * 添加时间
+     */
+    @ApiModelProperty("添加时间")
+    private Date addTime;
+
+    /**
+     * 源代码
+     */
+    @ApiModelProperty("源代码")
+    private String glueSource;
+
+    /**
+     */
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

byit-myth-core/myth-admin-core/src/main/java/com/byit/service/JobTaskRunLogService.java

 package com.byit.service;
 
-import com.byit.model.JobTaskRunLog;
-
 /**
  * @program: byit-myth-job->JobTaskRunLogService
  * @description: 日志业务表

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

 package com.byit.service.impl;
 
-import com.byit.mapper.JobTaskRunLogMapper;
-import com.byit.model.JobTaskRunLog;
 import com.byit.service.JobTaskRunLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

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

 package com.byit.service.impl;
 
-import com.byit.mapper.JobTaskScheduleMapper;
 import com.byit.model.JobTaskSchedule;
 import com.byit.service.JobTaskScheduleService;
 import org.springframework.beans.factory.annotation.Autowired;

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

 package com.byit.service.impl;
 
 import com.byit.mapper.JobTaskMapper;
+
 import com.byit.model.JobTask;
 import com.byit.service.JobTaskService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,7 +44,7 @@ public class JobTaskServiceImpl implements JobTaskService {
      */
     @Override
     public void addMythJobTask(JobTask jobTask) {
-        jobTaskMapper.insertSelective(jobTask);
+        jobTaskMapper.saveJobTask(jobTask);
     }
 
     /**
@@ -61,6 +62,6 @@ public class JobTaskServiceImpl implements JobTaskService {
      */
     @Override
     public void removeMythJobTaskInIds(List<JobTask> jobTasks) {
-        jobTaskMapper.deleteByIds(jobTasks);
+        jobTaskMapper.deleteInId(jobTasks);
     }
 }

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

@@ -6,8 +6,6 @@ import com.byit.job.dto.AdminSenPluginDto;
 import com.byit.job.dto.DispatchResponseDto;
 import com.byit.job.exceptions.plugin.PluginException;
 import com.byit.job.utils.IpUtil;
-import com.byit.model.JobTaskRunLog;
-import com.byit.model.JobTaskSchedule;
 import com.byit.rpc.remoting.invoker.route.LoadBalance;
 import com.byit.rpc.remoting.invoker.route.RpcLoadBalance;
 import com.byit.service.impl.JobTaskRunLogServiceImpl;
@@ -70,8 +68,8 @@ public class JavaBeanJobTask implements TimerTask {
         JobTaskRunLogServiceImpl jobTaskRunLogService = SpringUtil.getBean(JobTaskRunLogServiceImpl.class);
         JobTaskRunLog jobTaskRunLog = new JobTaskRunLog();
         jobTaskRunLog.setLogId(mythJobTaskSchedule.getLogId());
-        //版本id需要查验
-        //还需要携带版本的名字
+        jobTaskRunLog.setFlowVersionId(mythJobTaskSchedule.getVersionId());
+        jobTaskRunLog.setJobFlowName(mythJobTaskSchedule.getVersionName());
         jobTaskRunLog.setRunType("2");
         jobTaskRunLog.setJobType("BEAN");
         jobTaskRunLog.setLocalNodeHandlerName(mythJobTaskSchedule.getLocalNodeHandlerName());

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

@@ -2,9 +2,6 @@ package com.byit.thread;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.byit.job.WorkRoulette;
-import com.byit.model.JobTask;
-import com.byit.model.JobTaskRunLog;
-import com.byit.model.JobTaskSchedule;
 import com.byit.service.JobTaskScheduleService;
 import com.byit.service.JobTaskService;
 import com.byit.service.impl.JobTaskRunLogServiceImpl;

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

 package com.byit.thread;
 
 import com.byit.job.dto.JobRunResultDto;
-import com.byit.model.JobTaskRunLog;
 import com.byit.service.impl.JobTaskRunLogServiceImpl;
 import com.byit.util.SpringUtil;
 import lombok.extern.slf4j.Slf4j;

byit-myth-core/myth-admin-core/src/main/java/com/byit/util/SourceObj2TargetObjUtil.java

 package com.byit.util;
 
 import com.byit.job.dto.PluginBeanJobInfo;
-import com.byit.model.JobTask;
 
 /**
  * @program: byit-myth-job->SourceObj2TargetObjUtil
@@ -33,6 +32,8 @@ public class SourceObj2TargetObjUtil {
         jobTask.setTriggerNextTime(System.currentTimeMillis()+20000);
         jobTask.setDependencyNodes("0");
         jobTask.setJobType("BEAN");
+        jobTask.setVersionId(1);
+        jobTask.setVersionName("V1");
         return jobTask;
     }
 }

byit-myth-core/myth-admin-core/src/main/resources/Generator-config.xml

@@ -55,8 +55,20 @@
                              type="XMLMAPPER">
             <property name="enableSubPackages" value="false"/>
         </javaClientGenerator>
-        <table tableName="job_flow_version" domainObjectName="JobFlowVersion" />
-        <table tableName="job_flow_node_version" domainObjectName="jobFlowNodeVersion" />
+        <table tableName="flow" domainObjectName="Flow" />
+        <table tableName="email_alarm" domainObjectName="EmailAlarm" />
+        <table tableName="flow_version" domainObjectName="FlowVersion" />
+        <table tableName="flow_version_dependent" domainObjectName="FlowVersionDependent" />
+        <table tableName="job_task" domainObjectName="JobTask" />
+        <table tableName="job_task_run_log" domainObjectName="JobTaskRunLog" />
+        <table tableName="job_task_schedule" domainObjectName="JobTaskSchedule" />
+        <table tableName="node" domainObjectName="Node" />
+        <table tableName="node_version" domainObjectName="NodeVersion" />
+        <table tableName="run_recording" domainObjectName="RunRecording" />
+        <table tableName="source_history" domainObjectName="SourceHistory" />
+        <table tableName="flow_dependent" domainObjectName="FlowDependent" />
+        <table tableName="node_dependency" domainObjectName="NodeDependency" />
+        <table tableName="node_version_dependency" domainObjectName="NodeVersionDependency" />
     </context>
 
 </generatorConfiguration>

byit-myth-core/myth-admin-core/src/main/resources/mapper/EmailAlarmMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.byit.mapper.EmailAlarmMapper">
+  <resultMap id="BaseResultMap" type="com.byit.model.EmailAlarm">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="flow_id" jdbcType="INTEGER" property="flowId" />
+    <result column="flow_name" jdbcType="VARCHAR" property="flowName" />
+    <result column="run_id" jdbcType="VARCHAR" property="runId" />
+    <result column="version_name" jdbcType="VARCHAR" property="versionName" />
+    <result column="alarm_email" jdbcType="VARCHAR" property="alarmEmail" />
+    <result column="alarm_action" jdbcType="CHAR" property="alarmAction" />
+    <result column="alarm_result" jdbcType="CHAR" property="alarmResult" />
+    <result column="send_time" jdbcType="TIMESTAMP" property="sendTime" />
+  </resultMap>
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.byit.model.EmailAlarm">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    <result column="alarm_content" jdbcType="LONGVARCHAR" property="alarmContent" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    id, flow_id, flow_name, run_id, version_name, alarm_email, alarm_action, alarm_result, 
+    send_time
+  </sql>
+  <sql id="Blob_Column_List">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    alarm_content
+  </sql>
+  <select id="getById" parameterType="java.lang.Integer" resultMap="ResultMapWithBLOBs">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    select 
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from email_alarm
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteById" parameterType="java.lang.Integer">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    delete from email_alarm
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.byit.model.EmailAlarm">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    insert into email_alarm (id, flow_id, flow_name, 
+      run_id, version_name, alarm_email, 
+      alarm_action, alarm_result, send_time, 
+      alarm_content)
+    values (#{id,jdbcType=INTEGER}, #{flowId,jdbcType=INTEGER}, #{flowName,jdbcType=VARCHAR}, 
+      #{runId,jdbcType=VARCHAR}, #{versionName,jdbcType=VARCHAR}, #{alarmEmail,jdbcType=VARCHAR}, 
+      #{alarmAction,jdbcType=CHAR}, #{alarmResult,jdbcType=CHAR}, #{sendTime,jdbcType=TIMESTAMP}, 
+      #{alarmContent,jdbcType=LONGVARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.byit.model.EmailAlarm">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    insert into email_alarm
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="flowId != null">
+        flow_id,
+      </if>
+      <if test="flowName != null">
+        flow_name,
+      </if>
+      <if test="runId != null">
+        run_id,
+      </if>
+      <if test="versionName != null">
+        version_name,
+      </if>
+      <if test="alarmEmail != null">
+        alarm_email,
+      </if>
+      <if test="alarmAction != null">
+        alarm_action,
+      </if>
+      <if test="alarmResult != null">
+        alarm_result,
+      </if>
+      <if test="sendTime != null">
+        send_time,
+      </if>
+      <if test="alarmContent != null">
+        alarm_content,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="flowId != null">
+        #{flowId,jdbcType=INTEGER},
+      </if>
+      <if test="flowName != null">
+        #{flowName,jdbcType=VARCHAR},
+      </if>
+      <if test="runId != null">
+        #{runId,jdbcType=VARCHAR},
+      </if>
+      <if test="versionName != null">
+        #{versionName,jdbcType=VARCHAR},
+      </if>
+      <if test="alarmEmail != null">
+        #{alarmEmail,jdbcType=VARCHAR},
+      </if>
+      <if test="alarmAction != null">
+        #{alarmAction,jdbcType=CHAR},
+      </if>
+      <if test="alarmResult != null">
+        #{alarmResult,jdbcType=CHAR},
+      </if>
+      <if test="sendTime != null">
+        #{sendTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="alarmContent != null">
+        #{alarmContent,jdbcType=LONGVARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByIdSelective" parameterType="com.byit.model.EmailAlarm">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    update email_alarm
+    <set>
+      <if test="flowId != null">
+        flow_id = #{flowId,jdbcType=INTEGER},
+      </if>
+      <if test="flowName != null">
+        flow_name = #{flowName,jdbcType=VARCHAR},
+      </if>
+      <if test="runId != null">
+        run_id = #{runId,jdbcType=VARCHAR},
+      </if>
+      <if test="versionName != null">
+        version_name = #{versionName,jdbcType=VARCHAR},
+      </if>
+      <if test="alarmEmail != null">
+        alarm_email = #{alarmEmail,jdbcType=VARCHAR},
+      </if>
+      <if test="alarmAction != null">
+        alarm_action = #{alarmAction,jdbcType=CHAR},
+      </if>
+      <if test="alarmResult != null">
+        alarm_result = #{alarmResult,jdbcType=CHAR},
+      </if>
+      <if test="sendTime != null">
+        send_time = #{sendTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="alarmContent != null">
+        alarm_content = #{alarmContent,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.byit.model.EmailAlarm">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    update email_alarm
+    set flow_id = #{flowId,jdbcType=INTEGER},
+      flow_name = #{flowName,jdbcType=VARCHAR},
+      run_id = #{runId,jdbcType=VARCHAR},
+      version_name = #{versionName,jdbcType=VARCHAR},
+      alarm_email = #{alarmEmail,jdbcType=VARCHAR},
+      alarm_action = #{alarmAction,jdbcType=CHAR},
+      alarm_result = #{alarmResult,jdbcType=CHAR},
+      send_time = #{sendTime,jdbcType=TIMESTAMP},
+      alarm_content = #{alarmContent,jdbcType=LONGVARCHAR}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateById" parameterType="com.byit.model.EmailAlarm">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    update email_alarm
+    set flow_id = #{flowId,jdbcType=INTEGER},
+      flow_name = #{flowName,jdbcType=VARCHAR},
+      run_id = #{runId,jdbcType=VARCHAR},
+      version_name = #{versionName,jdbcType=VARCHAR},
+      alarm_email = #{alarmEmail,jdbcType=VARCHAR},
+      alarm_action = #{alarmAction,jdbcType=CHAR},
+      alarm_result = #{alarmResult,jdbcType=CHAR},
+      send_time = #{sendTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>
\ No newline at end of file

byit-myth-core/myth-admin-core/src/main/resources/mapper/JobFlowDependentMapper.xml → byit-myth-core/myth-admin-core/src/main/resources/mapper/FlowDependentMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.byit.mapper.JobFlowDependentMapper">
-  <resultMap id="BaseResultMap" type="com.byit.model.JobFlowDependentKey">
-    <!-- generated @mbg.generated date: 2019-12-23 -->
+<mapper namespace="com.byit.mapper.FlowDependentMapper">
+  <resultMap id="BaseResultMap" type="com.byit.model.FlowDependentKey">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
     <id column="flow_id" jdbcType="INTEGER" property="flowId" />
     <id column="depend_flow_id" jdbcType="INTEGER" property="dependFlowId" />
   </resultMap>
-  <delete id="deleteById" parameterType="com.byit.model.JobFlowDependentKey">
-    <!-- generated @mbg.generated date: 2019-12-23 -->
-    delete from job_flow_dependent
+  <delete id="deleteById" parameterType="com.byit.model.FlowDependentKey">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    delete from flow_dependent
     where flow_id = #{flowId,jdbcType=INTEGER}
       and depend_flow_id = #{dependFlowId,jdbcType=INTEGER}
   </delete>
-  <insert id="insert" parameterType="com.byit.model.JobFlowDependentKey">
-    <!-- generated @mbg.generated date: 2019-12-23 -->
-    insert into job_flow_dependent (flow_id, depend_flow_id)
+  <insert id="insert" parameterType="com.byit.model.FlowDependentKey">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    insert into flow_dependent (flow_id, depend_flow_id)
     values (#{flowId,jdbcType=INTEGER}, #{dependFlowId,jdbcType=INTEGER})
   </insert>
-  <insert id="insertSelective" parameterType="com.byit.model.JobFlowDependentKey">
-    <!-- generated @mbg.generated date: 2019-12-23 -->
-    insert into job_flow_dependent
+  <insert id="insertSelective" parameterType="com.byit.model.FlowDependentKey">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    insert into flow_dependent
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="flowId != null">
         flow_id,

byit-myth-core/myth-admin-core/src/main/resources/mapper/JobFlowMapper.xml → byit-myth-core/myth-admin-core/src/main/resources/mapper/FlowMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.byit.mapper.JobFlowMapper">
-  <resultMap id="BaseResultMap" type="com.byit.model.JobFlow">
-    <!-- generated @mbg.generated date: 2019-12-24 -->
+<mapper namespace="com.byit.mapper.FlowMapper">
+  <resultMap id="BaseResultMap" type="com.byit.model.Flow">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
     <id column="flow_id" jdbcType="INTEGER" property="flowId" />
     <result column="alarm_email" jdbcType="VARCHAR" property="alarmEmail" />
     <result column="exec_type" jdbcType="CHAR" property="execType" />
@@ -14,58 +14,59 @@
     <result column="is_have_depend" jdbcType="CHAR" property="isHaveDepend" />
     <result column="is_inner" jdbcType="CHAR" property="isInner" />
     <result column="is_top" jdbcType="CHAR" property="isTop" />
-    <result column="mail_action" jdbcType="CHAR" property="mailAction" />
-    <result column="node_date_is_follow_flow" jdbcType="CHAR" property="nodeDateIsFollowFlow" />
+    <result column="alarml_action" jdbcType="CHAR" property="alarmlAction" />
     <result column="priority" jdbcType="CHAR" property="priority" />
-    <result column="remaining_count" jdbcType="INTEGER" property="remainingCount" />
-    <result column="repeat_count" jdbcType="INTEGER" property="repeatCount" />
     <result column="trigger_next_time" jdbcType="BIGINT" property="triggerNextTime" />
     <result column="workspace_id" jdbcType="INTEGER" property="workspaceId" />
     <result column="author" jdbcType="VARCHAR" property="author" />
     <result column="add_time" jdbcType="TIMESTAMP" property="addTime" />
     <result column="start_up" jdbcType="CHAR" property="startUp" />
+    <result column="principal" jdbcType="VARCHAR" property="principal" />
+    <result column="version_name" jdbcType="VARCHAR" property="versionName" />
+    <result column="repeat_count" jdbcType="INTEGER" property="repeatCount" />
+    <result column="remaining_count" jdbcType="INTEGER" property="remainingCount" />
   </resultMap>
   <sql id="Base_Column_List">
-    <!-- generated @mbg.generated date: 2019-12-24 -->
+    <!-- generated @mbg.generated date: 2019-12-25 -->
     flow_id, alarm_email, exec_type, flow_cron, flow_desc, flow_name, flow_node_count, 
-    flow_timeout, is_have_depend, is_inner, is_top, mail_action, node_date_is_follow_flow, 
-    priority, remaining_count, repeat_count, trigger_next_time, workspace_id, author, 
-    add_time, start_up
+    flow_timeout, is_have_depend, is_inner, is_top, alarml_action, priority, trigger_next_time, 
+    workspace_id, author, add_time, start_up, principal, version_name, repeat_count, 
+    remaining_count
   </sql>
   <select id="getById" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-    <!-- generated @mbg.generated date: 2019-12-24 -->
+    <!-- generated @mbg.generated date: 2019-12-25 -->
     select 
     <include refid="Base_Column_List" />
-    from job_flow_current
+    from flow
     where flow_id = #{flowId,jdbcType=INTEGER}
   </select>
   <delete id="deleteById" parameterType="java.lang.Integer">
-    <!-- generated @mbg.generated date: 2019-12-24 -->
-    delete from job_flow_current
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    delete from flow
     where flow_id = #{flowId,jdbcType=INTEGER}
   </delete>
-  <insert id="insert" parameterType="com.byit.model.JobFlow">
-    <!-- generated @mbg.generated date: 2019-12-24 -->
-    insert into job_flow_current (flow_id, alarm_email, exec_type, 
+  <insert id="insert" parameterType="com.byit.model.Flow">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    insert into flow (flow_id, alarm_email, exec_type, 
       flow_cron, flow_desc, flow_name, 
       flow_node_count, flow_timeout, is_have_depend, 
-      is_inner, is_top, mail_action, 
-      node_date_is_follow_flow, priority, remaining_count, 
-      repeat_count, trigger_next_time, workspace_id, 
-      author, add_time, start_up
-      )
+      is_inner, is_top, alarml_action, 
+      priority, trigger_next_time, workspace_id, 
+      author, add_time, start_up, 
+      principal, version_name, repeat_count, 
+      remaining_count)
     values (#{flowId,jdbcType=INTEGER}, #{alarmEmail,jdbcType=VARCHAR}, #{execType,jdbcType=CHAR}, 
       #{flowCron,jdbcType=VARCHAR}, #{flowDesc,jdbcType=VARCHAR}, #{flowName,jdbcType=VARCHAR}, 
       #{flowNodeCount,jdbcType=INTEGER}, #{flowTimeout,jdbcType=BIGINT}, #{isHaveDepend,jdbcType=CHAR}, 
-      #{isInner,jdbcType=CHAR}, #{isTop,jdbcType=CHAR}, #{mailAction,jdbcType=CHAR}, 
-      #{nodeDateIsFollowFlow,jdbcType=CHAR}, #{priority,jdbcType=CHAR}, #{remainingCount,jdbcType=INTEGER}, 
-      #{repeatCount,jdbcType=INTEGER}, #{triggerNextTime,jdbcType=BIGINT}, #{workspaceId,jdbcType=INTEGER}, 
-      #{author,jdbcType=VARCHAR}, #{addTime,jdbcType=TIMESTAMP}, #{startUp,jdbcType=CHAR}
-      )
+      #{isInner,jdbcType=CHAR}, #{isTop,jdbcType=CHAR}, #{alarmlAction,jdbcType=CHAR}, 
+      #{priority,jdbcType=CHAR}, #{triggerNextTime,jdbcType=BIGINT}, #{workspaceId,jdbcType=INTEGER}, 
+      #{author,jdbcType=VARCHAR}, #{addTime,jdbcType=TIMESTAMP}, #{startUp,jdbcType=CHAR}, 
+      #{principal,jdbcType=VARCHAR}, #{versionName,jdbcType=VARCHAR}, #{repeatCount,jdbcType=INTEGER}, 
+      #{remainingCount,jdbcType=INTEGER})
   </insert>
-  <insert id="insertSelective" parameterType="com.byit.model.JobFlow">
-    <!-- generated @mbg.generated date: 2019-12-24 -->
-    insert into job_flow_current
+  <insert id="insertSelective" parameterType="com.byit.model.Flow">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    insert into flow
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="flowId != null">
         flow_id,
@@ -100,21 +101,12 @@
       <if test="isTop != null">
         is_top,
       </if>
-      <if test="mailAction != null">
-        mail_action,
-      </if>
-      <if test="nodeDateIsFollowFlow != null">
-        node_date_is_follow_flow,
+      <if test="alarmlAction != null">
+        alarml_action,
       </if>
       <if test="priority != null">
         priority,
       </if>
-      <if test="remainingCount != null">
-        remaining_count,
-      </if>
-      <if test="repeatCount != null">
-        repeat_count,
-      </if>
       <if test="triggerNextTime != null">
         trigger_next_time,
       </if>
@@ -130,6 +122,18 @@
       <if test="startUp != null">
         start_up,
       </if>
+      <if test="principal != null">
+        principal,
+      </if>
+      <if test="versionName != null">
+        version_name,
+      </if>
+      <if test="repeatCount != null">
+        repeat_count,
+      </if>
+      <if test="remainingCount != null">
+        remaining_count,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="flowId != null">
@@ -165,21 +169,12 @@
       <if test="isTop != null">
         #{isTop,jdbcType=CHAR},
       </if>
-      <if test="mailAction != null">
-        #{mailAction,jdbcType=CHAR},
-      </if>
-      <if test="nodeDateIsFollowFlow != null">
-        #{nodeDateIsFollowFlow,jdbcType=CHAR},
+      <if test="alarmlAction != null">
+        #{alarmlAction,jdbcType=CHAR},
       </if>
       <if test="priority != null">
         #{priority,jdbcType=CHAR},
       </if>
-      <if test="remainingCount != null">
-        #{remainingCount,jdbcType=INTEGER},
-      </if>
-      <if test="repeatCount != null">
-        #{repeatCount,jdbcType=INTEGER},
-      </if>
       <if test="triggerNextTime != null">
         #{triggerNextTime,jdbcType=BIGINT},
       </if>
@@ -195,11 +190,23 @@
       <if test="startUp != null">
         #{startUp,jdbcType=CHAR},
       </if>
+      <if test="principal != null">
+        #{principal,jdbcType=VARCHAR},
+      </if>
+      <if test="versionName != null">
+        #{versionName,jdbcType=VARCHAR},
+      </if>
+      <if test="repeatCount != null">
+        #{repeatCount,jdbcType=INTEGER},
+      </if>
+      <if test="remainingCount != null">
+        #{remainingCount,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
-  <update id="updateByIdSelective" parameterType="com.byit.model.JobFlow">
-    <!-- generated @mbg.generated date: 2019-12-24 -->
-    update job_flow_current
+  <update id="updateByIdSelective" parameterType="com.byit.model.Flow">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    update flow
     <set>
       <if test="alarmEmail != null">
         alarm_email = #{alarmEmail,jdbcType=VARCHAR},
@@ -231,21 +238,12 @@
       <if test="isTop != null">
         is_top = #{isTop,jdbcType=CHAR},
       </if>
-      <if test="mailAction != null">
-        mail_action = #{mailAction,jdbcType=CHAR},
-      </if>
-      <if test="nodeDateIsFollowFlow != null">
-        node_date_is_follow_flow = #{nodeDateIsFollowFlow,jdbcType=CHAR},
+      <if test="alarmlAction != null">
+        alarml_action = #{alarmlAction,jdbcType=CHAR},
       </if>
       <if test="priority != null">
         priority = #{priority,jdbcType=CHAR},
       </if>
-      <if test="remainingCount != null">
-        remaining_count = #{remainingCount,jdbcType=INTEGER},
-      </if>
-      <if test="repeatCount != null">
-        repeat_count = #{repeatCount,jdbcType=INTEGER},
-      </if>
       <if test="triggerNextTime != null">
         trigger_next_time = #{triggerNextTime,jdbcType=BIGINT},
       </if>
@@ -261,12 +259,24 @@
       <if test="startUp != null">
         start_up = #{startUp,jdbcType=CHAR},
       </if>
+      <if test="principal != null">
+        principal = #{principal,jdbcType=VARCHAR},
+      </if>
+      <if test="versionName != null">
+        version_name = #{versionName,jdbcType=VARCHAR},
+      </if>
+      <if test="repeatCount != null">
+        repeat_count = #{repeatCount,jdbcType=INTEGER},
+      </if>
+      <if test="remainingCount != null">
+        remaining_count = #{remainingCount,jdbcType=INTEGER},
+      </if>
     </set>
     where flow_id = #{flowId,jdbcType=INTEGER}
   </update>
-  <update id="updateById" parameterType="com.byit.model.JobFlow">
-    <!-- generated @mbg.generated date: 2019-12-24 -->
-    update job_flow_current
+  <update id="updateById" parameterType="com.byit.model.Flow">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    update flow
     set alarm_email = #{alarmEmail,jdbcType=VARCHAR},
       exec_type = #{execType,jdbcType=CHAR},
       flow_cron = #{flowCron,jdbcType=VARCHAR},
@@ -277,16 +287,17 @@
       is_have_depend = #{isHaveDepend,jdbcType=CHAR},
       is_inner = #{isInner,jdbcType=CHAR},
       is_top = #{isTop,jdbcType=CHAR},
-      mail_action = #{mailAction,jdbcType=CHAR},
-      node_date_is_follow_flow = #{nodeDateIsFollowFlow,jdbcType=CHAR},
+      alarml_action = #{alarmlAction,jdbcType=CHAR},
       priority = #{priority,jdbcType=CHAR},
-      remaining_count = #{remainingCount,jdbcType=INTEGER},
-      repeat_count = #{repeatCount,jdbcType=INTEGER},
       trigger_next_time = #{triggerNextTime,jdbcType=BIGINT},
       workspace_id = #{workspaceId,jdbcType=INTEGER},
       author = #{author,jdbcType=VARCHAR},
       add_time = #{addTime,jdbcType=TIMESTAMP},
-      start_up = #{startUp,jdbcType=CHAR}
+      start_up = #{startUp,jdbcType=CHAR},
+      principal = #{principal,jdbcType=VARCHAR},
+      version_name = #{versionName,jdbcType=VARCHAR},
+      repeat_count = #{repeatCount,jdbcType=INTEGER},
+      remaining_count = #{remainingCount,jdbcType=INTEGER}
     where flow_id = #{flowId,jdbcType=INTEGER}
   </update>
 </mapper>
\ No newline at end of file

byit-myth-core/myth-admin-core/src/main/resources/mapper/FlowVersionDependentMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.byit.mapper.FlowVersionDependentMapper">
+  <resultMap id="BaseResultMap" type="com.byit.model.FlowVersionDependentKey">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    <id column="flow_version_id" jdbcType="INTEGER" property="flowVersionId" />
+    <id column="dependent_id" jdbcType="INTEGER" property="dependentId" />
+  </resultMap>
+  <delete id="deleteById" parameterType="com.byit.model.FlowVersionDependentKey">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    delete from flow_version_dependent
+    where flow_version_id = #{flowVersionId,jdbcType=INTEGER}
+      and dependent_id = #{dependentId,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.byit.model.FlowVersionDependentKey">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    insert into flow_version_dependent (flow_version_id, dependent_id)
+    values (#{flowVersionId,jdbcType=INTEGER}, #{dependentId,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" parameterType="com.byit.model.FlowVersionDependentKey">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    insert into flow_version_dependent
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="flowVersionId != null">
+        flow_version_id,
+      </if>
+      <if test="dependentId != null">
+        dependent_id,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="flowVersionId != null">
+        #{flowVersionId,jdbcType=INTEGER},
+      </if>
+      <if test="dependentId != null">
+        #{dependentId,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+</mapper>
\ No newline at end of file

byit-myth-core/myth-admin-core/src/main/resources/mapper/JobFlowVersionMapper.xml → byit-myth-core/myth-admin-core/src/main/resources/mapper/FlowVersionMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.byit.mapper.JobFlowVersionMapper">
-  <resultMap id="BaseResultMap" type="com.byit.model.JobFlowVersion">
-    <!-- generated @mbg.generated date: 2019-12-24 -->
+<mapper namespace="com.byit.mapper.FlowVersionMapper">
+  <resultMap id="BaseResultMap" type="com.byit.model.FlowVersion">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
     <id column="flow_version_id" jdbcType="INTEGER" property="flowVersionId" />
     <result column="add_time" jdbcType="TIMESTAMP" property="addTime" />
     <result column="alarm_email" jdbcType="VARCHAR" property="alarmEmail" />
@@ -12,55 +12,61 @@
     <result column="flow_id" jdbcType="INTEGER" property="flowId" />
     <result column="flow_name" jdbcType="VARCHAR" property="flowName" />
     <result column="flow_node_count" jdbcType="INTEGER" property="flowNodeCount" />
-    <result column="flow_timeout" jdbcType="BIGINT" property="flowTimeout" />
-    <result column="mail_action" jdbcType="CHAR" property="mailAction" />
-    <result column="node_date_is_follow_flow" jdbcType="CHAR" property="nodeDateIsFollowFlow" />
+    <result column="alarml_action" jdbcType="CHAR" property="alarmlAction" />
+    <result column="schedule_follow" jdbcType="CHAR" property="scheduleFollow" />
     <result column="priority" jdbcType="CHAR" property="priority" />
     <result column="remove_mark" jdbcType="CHAR" property="removeMark" />
     <result column="repeat_count" jdbcType="INTEGER" property="repeatCount" />
-    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="version_mark" jdbcType="CHAR" property="versionMark" />
     <result column="workspace_id" jdbcType="INTEGER" property="workspaceId" />
     <result column="author" jdbcType="VARCHAR" property="author" />
+    <result column="principal" jdbcType="VARCHAR" property="principal" />
+    <result column="version_name" jdbcType="VARCHAR" property="versionName" />
+    <result column="is_have_depend" jdbcType="CHAR" property="isHaveDepend" />
+    <result column="is_inner" jdbcType="CHAR" property="isInner" />
+    <result column="is_top" jdbcType="CHAR" property="isTop" />
   </resultMap>
   <sql id="Base_Column_List">
-    <!-- generated @mbg.generated date: 2019-12-24 -->
+    <!-- generated @mbg.generated date: 2019-12-25 -->
     flow_version_id, add_time, alarm_email, exec_type, flow_cron, flow_desc, flow_id, 
-    flow_name, flow_node_count, flow_timeout, mail_action, node_date_is_follow_flow, 
-    priority, remove_mark, repeat_count, update_time, version_mark, workspace_id, author
+    flow_name, flow_node_count, alarml_action, schedule_follow, priority, remove_mark, 
+    repeat_count, version_mark, workspace_id, author, principal, version_name, is_have_depend, 
+    is_inner, is_top
   </sql>
   <select id="getById" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-    <!-- generated @mbg.generated date: 2019-12-24 -->
+    <!-- generated @mbg.generated date: 2019-12-25 -->
     select 
     <include refid="Base_Column_List" />
-    from job_flow_version
+    from flow_version
     where flow_version_id = #{flowVersionId,jdbcType=INTEGER}
   </select>
   <delete id="deleteById" parameterType="java.lang.Integer">
-    <!-- generated @mbg.generated date: 2019-12-24 -->
-    delete from job_flow_version
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    delete from flow_version
     where flow_version_id = #{flowVersionId,jdbcType=INTEGER}
   </delete>
-  <insert id="insert" parameterType="com.byit.model.JobFlowVersion">
-    <!-- generated @mbg.generated date: 2019-12-24 -->
-    insert into job_flow_version (flow_version_id, add_time, alarm_email, 
+  <insert id="insert" parameterType="com.byit.model.FlowVersion">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    insert into flow_version (flow_version_id, add_time, alarm_email, 
       exec_type, flow_cron, flow_desc, 
       flow_id, flow_name, flow_node_count, 
-      flow_timeout, mail_action, node_date_is_follow_flow, 
-      priority, remove_mark, repeat_count, 
-      update_time, version_mark, workspace_id, 
-      author)
+      alarml_action, schedule_follow, priority, 
+      remove_mark, repeat_count, version_mark, 
+      workspace_id, author, principal, 
+      version_name, is_have_depend, is_inner, 
+      is_top)
     values (#{flowVersionId,jdbcType=INTEGER}, #{addTime,jdbcType=TIMESTAMP}, #{alarmEmail,jdbcType=VARCHAR}, 
       #{execType,jdbcType=CHAR}, #{flowCron,jdbcType=VARCHAR}, #{flowDesc,jdbcType=VARCHAR}, 
       #{flowId,jdbcType=INTEGER}, #{flowName,jdbcType=VARCHAR}, #{flowNodeCount,jdbcType=INTEGER}, 
-      #{flowTimeout,jdbcType=BIGINT}, #{mailAction,jdbcType=CHAR}, #{nodeDateIsFollowFlow,jdbcType=CHAR}, 
-      #{priority,jdbcType=CHAR}, #{removeMark,jdbcType=CHAR}, #{repeatCount,jdbcType=INTEGER}, 
-      #{updateTime,jdbcType=TIMESTAMP}, #{versionMark,jdbcType=CHAR}, #{workspaceId,jdbcType=INTEGER}, 
-      #{author,jdbcType=VARCHAR})
+      #{alarmlAction,jdbcType=CHAR}, #{scheduleFollow,jdbcType=CHAR}, #{priority,jdbcType=CHAR}, 
+      #{removeMark,jdbcType=CHAR}, #{repeatCount,jdbcType=INTEGER}, #{versionMark,jdbcType=CHAR}, 
+      #{workspaceId,jdbcType=INTEGER}, #{author,jdbcType=VARCHAR}, #{principal,jdbcType=VARCHAR}, 
+      #{versionName,jdbcType=VARCHAR}, #{isHaveDepend,jdbcType=CHAR}, #{isInner,jdbcType=CHAR}, 
+      #{isTop,jdbcType=CHAR})
   </insert>
-  <insert id="insertSelective" parameterType="com.byit.model.JobFlowVersion">
-    <!-- generated @mbg.generated date: 2019-12-24 -->
-    insert into job_flow_version
+  <insert id="insertSelective" parameterType="com.byit.model.FlowVersion">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    insert into flow_version
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="flowVersionId != null">
         flow_version_id,
@@ -89,14 +95,11 @@
       <if test="flowNodeCount != null">
         flow_node_count,
       </if>
-      <if test="flowTimeout != null">
-        flow_timeout,
+      <if test="alarmlAction != null">
+        alarml_action,
       </if>
-      <if test="mailAction != null">
-        mail_action,
-      </if>
-      <if test="nodeDateIsFollowFlow != null">
-        node_date_is_follow_flow,
+      <if test="scheduleFollow != null">
+        schedule_follow,
       </if>
       <if test="priority != null">
         priority,
@@ -107,9 +110,6 @@
       <if test="repeatCount != null">
         repeat_count,
       </if>
-      <if test="updateTime != null">
-        update_time,
-      </if>
       <if test="versionMark != null">
         version_mark,
       </if>
@@ -119,6 +119,21 @@
       <if test="author != null">
         author,
       </if>
+      <if test="principal != null">
+        principal,
+      </if>
+      <if test="versionName != null">
+        version_name,
+      </if>
+      <if test="isHaveDepend != null">
+        is_have_depend,
+      </if>
+      <if test="isInner != null">
+        is_inner,
+      </if>
+      <if test="isTop != null">
+        is_top,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="flowVersionId != null">
@@ -148,14 +163,11 @@
       <if test="flowNodeCount != null">
         #{flowNodeCount,jdbcType=INTEGER},
       </if>
-      <if test="flowTimeout != null">
-        #{flowTimeout,jdbcType=BIGINT},
-      </if>
-      <if test="mailAction != null">
-        #{mailAction,jdbcType=CHAR},
+      <if test="alarmlAction != null">
+        #{alarmlAction,jdbcType=CHAR},
       </if>
-      <if test="nodeDateIsFollowFlow != null">
-        #{nodeDateIsFollowFlow,jdbcType=CHAR},
+      <if test="scheduleFollow != null">
+        #{scheduleFollow,jdbcType=CHAR},
       </if>
       <if test="priority != null">
         #{priority,jdbcType=CHAR},
@@ -166,9 +178,6 @@
       <if test="repeatCount != null">
         #{repeatCount,jdbcType=INTEGER},
       </if>
-      <if test="updateTime != null">
-        #{updateTime,jdbcType=TIMESTAMP},
-      </if>
       <if test="versionMark != null">
         #{versionMark,jdbcType=CHAR},
       </if>
@@ -178,11 +187,26 @@
       <if test="author != null">
         #{author,jdbcType=VARCHAR},
       </if>
+      <if test="principal != null">
+        #{principal,jdbcType=VARCHAR},
+      </if>
+      <if test="versionName != null">
+        #{versionName,jdbcType=VARCHAR},
+      </if>
+      <if test="isHaveDepend != null">
+        #{isHaveDepend,jdbcType=CHAR},
+      </if>
+      <if test="isInner != null">
+        #{isInner,jdbcType=CHAR},
+      </if>
+      <if test="isTop != null">
+        #{isTop,jdbcType=CHAR},
+      </if>
     </trim>
   </insert>
-  <update id="updateByIdSelective" parameterType="com.byit.model.JobFlowVersion">
-    <!-- generated @mbg.generated date: 2019-12-24 -->
-    update job_flow_version
+  <update id="updateByIdSelective" parameterType="com.byit.model.FlowVersion">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    update flow_version
     <set>
       <if test="addTime != null">
         add_time = #{addTime,jdbcType=TIMESTAMP},
@@ -208,14 +232,11 @@
       <if test="flowNodeCount != null">
         flow_node_count = #{flowNodeCount,jdbcType=INTEGER},
       </if>
-      <if test="flowTimeout != null">
-        flow_timeout = #{flowTimeout,jdbcType=BIGINT},
+      <if test="alarmlAction != null">
+        alarml_action = #{alarmlAction,jdbcType=CHAR},
       </if>
-      <if test="mailAction != null">
-        mail_action = #{mailAction,jdbcType=CHAR},
-      </if>
-      <if test="nodeDateIsFollowFlow != null">
-        node_date_is_follow_flow = #{nodeDateIsFollowFlow,jdbcType=CHAR},
+      <if test="scheduleFollow != null">
+        schedule_follow = #{scheduleFollow,jdbcType=CHAR},
       </if>
       <if test="priority != null">
         priority = #{priority,jdbcType=CHAR},
@@ -226,9 +247,6 @@
       <if test="repeatCount != null">
         repeat_count = #{repeatCount,jdbcType=INTEGER},
       </if>
-      <if test="updateTime != null">
-        update_time = #{updateTime,jdbcType=TIMESTAMP},
-      </if>
       <if test="versionMark != null">
         version_mark = #{versionMark,jdbcType=CHAR},
       </if>
@@ -238,12 +256,27 @@
       <if test="author != null">
         author = #{author,jdbcType=VARCHAR},
       </if>
+      <if test="principal != null">
+        principal = #{principal,jdbcType=VARCHAR},
+      </if>
+      <if test="versionName != null">
+        version_name = #{versionName,jdbcType=VARCHAR},
+      </if>
+      <if test="isHaveDepend != null">
+        is_have_depend = #{isHaveDepend,jdbcType=CHAR},
+      </if>
+      <if test="isInner != null">
+        is_inner = #{isInner,jdbcType=CHAR},
+      </if>
+      <if test="isTop != null">
+        is_top = #{isTop,jdbcType=CHAR},
+      </if>
     </set>
     where flow_version_id = #{flowVersionId,jdbcType=INTEGER}
   </update>
-  <update id="updateById" parameterType="com.byit.model.JobFlowVersion">
-    <!-- generated @mbg.generated date: 2019-12-24 -->
-    update job_flow_version
+  <update id="updateById" parameterType="com.byit.model.FlowVersion">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    update flow_version
     set add_time = #{addTime,jdbcType=TIMESTAMP},
       alarm_email = #{alarmEmail,jdbcType=VARCHAR},
       exec_type = #{execType,jdbcType=CHAR},
@@ -252,16 +285,19 @@
       flow_id = #{flowId,jdbcType=INTEGER},
       flow_name = #{flowName,jdbcType=VARCHAR},
       flow_node_count = #{flowNodeCount,jdbcType=INTEGER},
-      flow_timeout = #{flowTimeout,jdbcType=BIGINT},
-      mail_action = #{mailAction,jdbcType=CHAR},
-      node_date_is_follow_flow = #{nodeDateIsFollowFlow,jdbcType=CHAR},
+      alarml_action = #{alarmlAction,jdbcType=CHAR},
+      schedule_follow = #{scheduleFollow,jdbcType=CHAR},
       priority = #{priority,jdbcType=CHAR},
       remove_mark = #{removeMark,jdbcType=CHAR},
       repeat_count = #{repeatCount,jdbcType=INTEGER},
-      update_time = #{updateTime,jdbcType=TIMESTAMP},
       version_mark = #{versionMark,jdbcType=CHAR},
       workspace_id = #{workspaceId,jdbcType=INTEGER},
-      author = #{author,jdbcType=VARCHAR}
+      author = #{author,jdbcType=VARCHAR},
+      principal = #{principal,jdbcType=VARCHAR},
+      version_name = #{versionName,jdbcType=VARCHAR},
+      is_have_depend = #{isHaveDepend,jdbcType=CHAR},
+      is_inner = #{isInner,jdbcType=CHAR},
+      is_top = #{isTop,jdbcType=CHAR}
     where flow_version_id = #{flowVersionId,jdbcType=INTEGER}
   </update>
 </mapper>
\ No newline at end of file

byit-myth-core/myth-admin-core/src/main/resources/mapper/JobTaskMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.byit.mapper.JobTaskMapper">
-
   <resultMap id="BaseResultMap" type="com.byit.model.JobTask">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="node_id" jdbcType="INTEGER" property="nodeId" />
-    <result column="alarm_email" jdbcType="VARCHAR" property="alarmEmail" />
     <result column="block_strategy" jdbcType="VARCHAR" property="blockStrategy" />
-    <result column="callback_token" jdbcType="VARCHAR" property="callbackToken" />
-    <result column="dependency_nodes" jdbcType="VARCHAR" property="dependencyNodes" />
+    <result column="plugin_token" jdbcType="VARCHAR" property="pluginToken" />
     <result column="failed_retry_count" jdbcType="INTEGER" property="failedRetryCount" />
     <result column="flow_id" jdbcType="INTEGER" property="flowId" />
-    <result column="follow_task_flow" jdbcType="CHAR" property="followTaskFlow" />
     <result column="gateway_token" jdbcType="VARCHAR" property="gatewayToken" />
     <result column="job_type" jdbcType="VARCHAR" property="jobType" />
-    <result column="local_node_handler_name" jdbcType="VARCHAR" property="localNodeHandlerName" />
-    <result column="mail_action" jdbcType="CHAR" property="mailAction" />
-    <result column="node_cron" jdbcType="VARCHAR" property="nodeCron" />
+    <result column="handler_name" jdbcType="VARCHAR" property="handlerName" />
     <result column="node_desc" jdbcType="VARCHAR" property="nodeDesc" />
     <result column="node_name" jdbcType="VARCHAR" property="nodeName" />
-    <result column="node_of_flow_id" jdbcType="INTEGER" property="nodeOfFlowId" />
+    <result column="map_flow_id" jdbcType="INTEGER" property="mapFlowId" />
     <result column="node_timeout" jdbcType="BIGINT" property="nodeTimeout" />
-    <result column="node_type" jdbcType="VARCHAR" property="nodeType" />
+    <result column="is_virtual" jdbcType="CHAR" property="isVirtual" />
     <result column="plugin_urls" jdbcType="VARCHAR" property="pluginUrls" />
     <result column="priority" jdbcType="CHAR" property="priority" />
-    <result column="remaining_count" jdbcType="INTEGER" property="remainingCount" />
-    <result column="repeat_count" jdbcType="INTEGER" property="repeatCount" />
-    <result column="retry_interval" jdbcType="BIGINT" property="retryInterval" />
+    <result column="failed_retry_interval" jdbcType="BIGINT" property="failedRetryInterval" />
     <result column="routing_strategy" jdbcType="VARCHAR" property="routingStrategy" />
     <result column="run_id" jdbcType="VARCHAR" property="runId" />
     <result column="run_param" jdbcType="VARCHAR" property="runParam" />
     <result column="run_source_desc" jdbcType="VARCHAR" property="runSourceDesc" />
     <result column="script_urls" jdbcType="VARCHAR" property="scriptUrls" />
     <result column="source_principal" jdbcType="VARCHAR" property="sourcePrincipal" />
-    <result column="source_update_time" jdbcType="DATE" property="sourceUpdateTime" />
-    <result column="trigger_next_time" jdbcType="BIGINT" property="triggerNextTime" />
+    <result column="trigger_time" jdbcType="BIGINT" property="triggerTime" />
     <result column="trigger_status" jdbcType="CHAR" property="triggerStatus" />
-    <result column="run_source" jdbcType="LONGVARCHAR" property="runSource" />
-    <result column="add_time" jdbcType="DATE" property="addTime" />
-    <result column="author" jdbcType="VARCHAR" property="author" />
-    <result column="version_id" jdbcType="INTEGER" property="versionId" />
     <result column="version_name" jdbcType="VARCHAR" property="versionName" />
+    <result column="run_command" jdbcType="VARCHAR" property="runCommand" />
+  </resultMap>
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.byit.model.JobTask">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    <result column="run_source" jdbcType="LONGVARCHAR" property="runSource" />
   </resultMap>
-
   <sql id="Base_Column_List">
-    id, node_id, alarm_email, block_strategy, callback_token, dependency_nodes, failed_retry_count, 
-    flow_id, follow_task_flow, gateway_token, job_type, local_node_handler_name, mail_action, 
-    node_cron, node_desc, node_name, node_of_flow_id, node_timeout, node_type, plugin_urls, 
-    priority, remaining_count, repeat_count, retry_interval, routing_strategy, run_id, 
-    run_param, run_source_desc, script_urls, source_principal, source_update_time, trigger_next_time, 
-    trigger_status,run_source,add_time,author,version_id,version_name
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    id, node_id, block_strategy, plugin_token, failed_retry_count, flow_id, gateway_token, 
+    job_type, handler_name, node_desc, node_name, map_flow_id, node_timeout, is_virtual, 
+    plugin_urls, priority, failed_retry_interval, routing_strategy, run_id, run_param, 
+    run_source_desc, script_urls, source_principal, trigger_time, trigger_status, version_name, 
+    run_command
+  </sql>
+  <sql id="Blob_Column_List">
+    run_source
   </sql>
 
   <!--查询七秒内将要执行的数据-->
   <select id="findJobTaskByTriggerNextTimeLessThanEqual" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
     from job_task
-    where trigger_next_time <![CDATA[ <= ]]> #{triggerNextTime,jdbcType=BIGINT}
+    where trigger_time <![CDATA[ <= ]]> #{triggerNextTime,jdbcType=BIGINT}
   </select>
-  <!--根据id执行数据-->
-  <select id="getById" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+  <!--根据id查询-->
+  <select id="findJobTaskById" parameterType="java.lang.Integer" resultMap="ResultMapWithBLOBs">
     select 
     <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
     from job_task
     where id = #{id,jdbcType=INTEGER}
   </select>
-  <!--根据id删除数据-->
-  <delete id="deleteById" parameterType="java.lang.Integer">
-    delete from job_task
-    where id = #{id,jdbcType=INTEGER}
-  </delete>
-  <!--多个删除-->
-  <delete id="deleteByIds" parameterType="com.byit.model.JobTask">
-    delete from job_task
-    where id in
-    <foreach collection="mythJobTasks" item="mythJobTask" open="(" separator="," close=")">
-      #{mythJobTask.id}
-    </foreach>
-  </delete>
-  <!--添加一个任务-->
-  <insert id="insert" parameterType="com.byit.model.JobTask">
 
-    insert into job_task (id, node_id, alarm_email, 
-      block_strategy, callback_token, dependency_nodes, 
-      failed_retry_count, flow_id, follow_task_flow, 
-      gateway_token, job_type, local_node_handler_name, 
-      mail_action, node_cron, node_desc, 
-      node_name, node_of_flow_id, node_timeout, 
-      node_type, plugin_urls, priority, 
-      remaining_count, repeat_count, retry_interval, 
-      routing_strategy, run_id, run_param, 
-      run_source_desc, script_urls, source_principal, 
-      source_update_time, trigger_next_time, trigger_status, 
-      run_source,add_time,author,version_id,version_name)
-    values (#{id,jdbcType=INTEGER}, #{nodeId,jdbcType=INTEGER}, #{alarmEmail,jdbcType=VARCHAR}, 
-      #{blockStrategy,jdbcType=VARCHAR}, #{callbackToken,jdbcType=VARCHAR}, #{dependencyNodes,jdbcType=VARCHAR}, 
-      #{failedRetryCount,jdbcType=INTEGER}, #{flowId,jdbcType=INTEGER}, #{followTaskFlow,jdbcType=CHAR}, 
-      #{gatewayToken,jdbcType=VARCHAR}, #{jobType,jdbcType=VARCHAR}, #{localNodeHandlerName,jdbcType=VARCHAR}, 
-      #{mailAction,jdbcType=CHAR}, #{nodeCron,jdbcType=VARCHAR}, #{nodeDesc,jdbcType=VARCHAR}, 
-      #{nodeName,jdbcType=VARCHAR}, #{nodeOfFlowId,jdbcType=INTEGER}, #{nodeTimeout,jdbcType=BIGINT}, 
-      #{nodeType,jdbcType=VARCHAR}, #{pluginUrls,jdbcType=VARCHAR}, #{priority,jdbcType=CHAR}, 
-      #{remainingCount,jdbcType=INTEGER}, #{repeatCount,jdbcType=INTEGER}, #{retryInterval,jdbcType=BIGINT}, 
-      #{routingStrategy,jdbcType=VARCHAR}, #{runId,jdbcType=VARCHAR}, #{runParam,jdbcType=VARCHAR}, 
-      #{runSourceDesc,jdbcType=VARCHAR}, #{scriptUrls,jdbcType=VARCHAR}, #{sourcePrincipal,jdbcType=VARCHAR}, 
-      #{sourceUpdateTime,jdbcType=DATE}, #{triggerNextTime,jdbcType=BIGINT}, #{triggerStatus,jdbcType=CHAR}, 
-      #{runSource,jdbcType=LONGVARCHAR},#{addTime,jdbcType=DATE},#{author,jdbcType=VARCHAR},#{versionId,jdbcType=INTEGER},
-      #{versionName,jdbcType=VARCHAR})
-  </insert>
-  <!--动态数据添加-->
-  <insert id="insertSelective" parameterType="com.byit.model.JobTask">
+  <!--动态插入-->
+  <insert id="saveJobTask" parameterType="com.byit.model.JobTask">
     insert into job_task
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -118,17 +76,11 @@
       <if test="nodeId != null">
         node_id,
       </if>
-      <if test="alarmEmail != null">
-        alarm_email,
-      </if>
       <if test="blockStrategy != null">
         block_strategy,
       </if>
-      <if test="callbackToken != null">
-        callback_token,
-      </if>
-      <if test="dependencyNodes != null">
-        dependency_nodes,
+      <if test="pluginToken != null">
+        plugin_token,
       </if>
       <if test="failedRetryCount != null">
         failed_retry_count,
@@ -136,23 +88,14 @@
       <if test="flowId != null">
         flow_id,
       </if>
-      <if test="followTaskFlow != null">
-        follow_task_flow,
-      </if>
       <if test="gatewayToken != null">
         gateway_token,
       </if>
       <if test="jobType != null">
         job_type,
       </if>
-      <if test="localNodeHandlerName != null">
-        local_node_handler_name,
-      </if>
-      <if test="mailAction != null">
-        mail_action,
-      </if>
-      <if test="nodeCron != null">
-        node_cron,
+      <if test="handlerName != null">
+        handler_name,
       </if>
       <if test="nodeDesc != null">
         node_desc,
@@ -160,14 +103,14 @@
       <if test="nodeName != null">
         node_name,
       </if>
-      <if test="nodeOfFlowId != null">
-        node_of_flow_id,
+      <if test="mapFlowId != null">
+        map_flow_id,
       </if>
       <if test="nodeTimeout != null">
         node_timeout,
       </if>
-      <if test="nodeType != null">
-        node_type,
+      <if test="isVirtual != null">
+        is_virtual,
       </if>
       <if test="pluginUrls != null">
         plugin_urls,
@@ -175,14 +118,8 @@
       <if test="priority != null">
         priority,
       </if>
-      <if test="remainingCount != null">
-        remaining_count,
-      </if>
-      <if test="repeatCount != null">
-        repeat_count,
-      </if>
-      <if test="retryInterval != null">
-        retry_interval,
+      <if test="failedRetryInterval != null">
+        failed_retry_interval,
       </if>
       <if test="routingStrategy != null">
         routing_strategy,
@@ -202,31 +139,21 @@
       <if test="sourcePrincipal != null">
         source_principal,
       </if>
-      <if test="sourceUpdateTime != null">
-        source_update_time,
-      </if>
-      <if test="triggerNextTime != null">
-        trigger_next_time,
+      <if test="triggerTime != null">
+        trigger_time,
       </if>
       <if test="triggerStatus != null">
         trigger_status,
       </if>
-      <if test="runSource != null">
-        run_source,
-      </if>
-      <if test="addTime != null">
-        add_time,
-      </if>
-      <if test="author != null">
-        author,
-      </if>
-
-      <if test="versionId != null">
-        version_id,
-      </if>
       <if test="versionName != null">
         version_name,
       </if>
+      <if test="runCommand != null">
+        run_command,
+      </if>
+      <if test="runSource != null">
+        run_source,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -235,17 +162,11 @@
       <if test="nodeId != null">
         #{nodeId,jdbcType=INTEGER},
       </if>
-      <if test="alarmEmail != null">
-        #{alarmEmail,jdbcType=VARCHAR},
-      </if>
       <if test="blockStrategy != null">
         #{blockStrategy,jdbcType=VARCHAR},
       </if>
-      <if test="callbackToken != null">
-        #{callbackToken,jdbcType=VARCHAR},
-      </if>
-      <if test="dependencyNodes != null">
-        #{dependencyNodes,jdbcType=VARCHAR},
+      <if test="pluginToken != null">
+        #{pluginToken,jdbcType=VARCHAR},
       </if>
       <if test="failedRetryCount != null">
         #{failedRetryCount,jdbcType=INTEGER},
@@ -253,23 +174,14 @@
       <if test="flowId != null">
         #{flowId,jdbcType=INTEGER},
       </if>
-      <if test="followTaskFlow != null">
-        #{followTaskFlow,jdbcType=CHAR},
-      </if>
       <if test="gatewayToken != null">
         #{gatewayToken,jdbcType=VARCHAR},
       </if>
       <if test="jobType != null">
         #{jobType,jdbcType=VARCHAR},
       </if>
-      <if test="localNodeHandlerName != null">
-        #{localNodeHandlerName,jdbcType=VARCHAR},
-      </if>
-      <if test="mailAction != null">
-        #{mailAction,jdbcType=CHAR},
-      </if>
-      <if test="nodeCron != null">
-        #{nodeCron,jdbcType=VARCHAR},
+      <if test="handlerName != null">
+        #{handlerName,jdbcType=VARCHAR},
       </if>
       <if test="nodeDesc != null">
         #{nodeDesc,jdbcType=VARCHAR},
@@ -277,14 +189,14 @@
       <if test="nodeName != null">
         #{nodeName,jdbcType=VARCHAR},
       </if>
-      <if test="nodeOfFlowId != null">
-        #{nodeOfFlowId,jdbcType=INTEGER},
+      <if test="mapFlowId != null">
+        #{mapFlowId,jdbcType=INTEGER},
       </if>
       <if test="nodeTimeout != null">
         #{nodeTimeout,jdbcType=BIGINT},
       </if>
-      <if test="nodeType != null">
-        #{nodeType,jdbcType=VARCHAR},
+      <if test="isVirtual != null">
+        #{isVirtual,jdbcType=CHAR},
       </if>
       <if test="pluginUrls != null">
         #{pluginUrls,jdbcType=VARCHAR},
@@ -292,14 +204,8 @@
       <if test="priority != null">
         #{priority,jdbcType=CHAR},
       </if>
-      <if test="remainingCount != null">
-        #{remainingCount,jdbcType=INTEGER},
-      </if>
-      <if test="repeatCount != null">
-        #{repeatCount,jdbcType=INTEGER},
-      </if>
-      <if test="retryInterval != null">
-        #{retryInterval,jdbcType=BIGINT},
+      <if test="failedRetryInterval != null">
+        #{failedRetryInterval,jdbcType=BIGINT},
       </if>
       <if test="routingStrategy != null">
         #{routingStrategy,jdbcType=VARCHAR},
@@ -319,50 +225,35 @@
       <if test="sourcePrincipal != null">
         #{sourcePrincipal,jdbcType=VARCHAR},
       </if>
-      <if test="sourceUpdateTime != null">
-        #{sourceUpdateTime,jdbcType=DATE},
-      </if>
-      <if test="triggerNextTime != null">
-        #{triggerNextTime,jdbcType=BIGINT},
+      <if test="triggerTime != null">
+        #{triggerTime,jdbcType=BIGINT},
       </if>
       <if test="triggerStatus != null">
         #{triggerStatus,jdbcType=CHAR},
       </if>
-      <if test="runSource != null">
-        #{runSource,jdbcType=LONGVARCHAR},
-      </if>
-      <if test="addTime != null">
-        #{addTime,jdbcType=DATE},
-      </if>
-      <if test="author != null">
-        #{author,jdbcType=VARCHAR},
-      </if>
-      <if test="versionId != null">
-        #{versionId,jdbcType=INTEGER},
-      </if>
       <if test="versionName != null">
         #{versionName,jdbcType=VARCHAR},
       </if>
+      <if test="runCommand != null">
+        #{runCommand,jdbcType=VARCHAR},
+      </if>
+      <if test="runSource != null">
+        #{runSource,jdbcType=LONGVARCHAR},
+      </if>
     </trim>
   </insert>
-  <!--动态修改-->
-  <update id="updateByIdSelective" parameterType="com.byit.model.JobTask">
+  <update id="updateJobTask" parameterType="com.byit.model.JobTask">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
     update job_task
     <set>
       <if test="nodeId != null">
         node_id = #{nodeId,jdbcType=INTEGER},
       </if>
-      <if test="alarmEmail != null">
-        alarm_email = #{alarmEmail,jdbcType=VARCHAR},
-      </if>
       <if test="blockStrategy != null">
         block_strategy = #{blockStrategy,jdbcType=VARCHAR},
       </if>
-      <if test="callbackToken != null">
-        callback_token = #{callbackToken,jdbcType=VARCHAR},
-      </if>
-      <if test="dependencyNodes != null">
-        dependency_nodes = #{dependencyNodes,jdbcType=VARCHAR},
+      <if test="pluginToken != null">
+        plugin_token = #{pluginToken,jdbcType=VARCHAR},
       </if>
       <if test="failedRetryCount != null">
         failed_retry_count = #{failedRetryCount,jdbcType=INTEGER},
@@ -370,23 +261,14 @@
       <if test="flowId != null">
         flow_id = #{flowId,jdbcType=INTEGER},
       </if>
-      <if test="followTaskFlow != null">
-        follow_task_flow = #{followTaskFlow,jdbcType=CHAR},
-      </if>
       <if test="gatewayToken != null">
         gateway_token = #{gatewayToken,jdbcType=VARCHAR},
       </if>
       <if test="jobType != null">
         job_type = #{jobType,jdbcType=VARCHAR},
       </if>
-      <if test="localNodeHandlerName != null">
-        local_node_handler_name = #{localNodeHandlerName,jdbcType=VARCHAR},
-      </if>
-      <if test="mailAction != null">
-        mail_action = #{mailAction,jdbcType=CHAR},
-      </if>
-      <if test="nodeCron != null">
-        node_cron = #{nodeCron,jdbcType=VARCHAR},
+      <if test="handlerName != null">
+        handler_name = #{handlerName,jdbcType=VARCHAR},
       </if>
       <if test="nodeDesc != null">
         node_desc = #{nodeDesc,jdbcType=VARCHAR},
@@ -394,14 +276,14 @@
       <if test="nodeName != null">
         node_name = #{nodeName,jdbcType=VARCHAR},
       </if>
-      <if test="nodeOfFlowId != null">
-        node_of_flow_id = #{nodeOfFlowId,jdbcType=INTEGER},
+      <if test="mapFlowId != null">
+        map_flow_id = #{mapFlowId,jdbcType=INTEGER},
       </if>
       <if test="nodeTimeout != null">
         node_timeout = #{nodeTimeout,jdbcType=BIGINT},
       </if>
-      <if test="nodeType != null">
-        node_type = #{nodeType,jdbcType=VARCHAR},
+      <if test="isVirtual != null">
+        is_virtual = #{isVirtual,jdbcType=CHAR},
       </if>
       <if test="pluginUrls != null">
         plugin_urls = #{pluginUrls,jdbcType=VARCHAR},
@@ -409,14 +291,8 @@
       <if test="priority != null">
         priority = #{priority,jdbcType=CHAR},
       </if>
-      <if test="remainingCount != null">
-        remaining_count = #{remainingCount,jdbcType=INTEGER},
-      </if>
-      <if test="repeatCount != null">
-        repeat_count = #{repeatCount,jdbcType=INTEGER},
-      </if>
-      <if test="retryInterval != null">
-        retry_interval = #{retryInterval,jdbcType=BIGINT},
+      <if test="failedRetryInterval != null">
+        failed_retry_interval = #{failedRetryInterval,jdbcType=BIGINT},
       </if>
       <if test="routingStrategy != null">
         routing_strategy = #{routingStrategy,jdbcType=VARCHAR},
@@ -436,31 +312,36 @@
       <if test="sourcePrincipal != null">
         source_principal = #{sourcePrincipal,jdbcType=VARCHAR},
       </if>
-      <if test="sourceUpdateTime != null">
-        source_update_time = #{sourceUpdateTime,jdbcType=DATE},
-      </if>
-      <if test="triggerNextTime != null">
-        trigger_next_time = #{triggerNextTime,jdbcType=BIGINT},
+      <if test="triggerTime != null">
+        trigger_time = #{triggerTime,jdbcType=BIGINT},
       </if>
       <if test="triggerStatus != null">
         trigger_status = #{triggerStatus,jdbcType=CHAR},
       </if>
-      <if test="runSource != null">
-        run_source = #{runSource,jdbcType=LONGVARCHAR},
-      </if>
-      <if test="addTime != null">
-        add_time = #{addTime,jdbcType=DATE},
-      </if>
-      <if test="author != null">
-        author = #{author,jdbcType=VARCHAR},
-      </if>
-      <if test="versionId != null">
-        version_id = #{versionId,jdbcType=INTEGER},
-      </if>
       <if test="versionName != null">
         version_name = #{versionName,jdbcType=VARCHAR},
       </if>
+      <if test="runCommand != null">
+        run_command = #{runCommand,jdbcType=VARCHAR},
+      </if>
+      <if test="runSource != null">
+        run_source = #{runSource,jdbcType=LONGVARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
+
+  <!--多个删除-->
+  <delete id="deleteInId" parameterType="com.byit.model.JobTask">
+    delete from job_task
+    where id in
+    <foreach collection="mythJobTasks" item="mythJobTask" open="(" separator="," close=")">
+      #{mythJobTask.id}
+    </foreach>
+  </delete>
+  <!--根据id删除-->
+  <delete id="deleteById" parameterType="java.lang.Integer">
+    delete from job_task
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
 </mapper>
\ No newline at end of file

byit-myth-core/myth-admin-core/src/main/resources/mapper/JobTaskRunLogMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.byit.mapper.JobTaskRunLogMapper">
-
   <resultMap id="BaseResultMap" type="com.byit.model.JobTaskRunLog">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
     <id column="log_id" jdbcType="INTEGER" property="logId" />
-    <result column="alarm_email" jdbcType="VARCHAR" property="alarmEmail" />
-    <result column="alarm_status" jdbcType="CHAR" property="alarmStatus" />
     <result column="failed_remaining_count" jdbcType="INTEGER" property="failedRemainingCount" />
-    <result column="flow_version_id" jdbcType="INTEGER" property="flowVersionId" />
-    <result column="job_flow_id" jdbcType="INTEGER" property="jobFlowId" />
-    <result column="job_flow_name" jdbcType="VARCHAR" property="jobFlowName" />
+    <result column="version_name" jdbcType="VARCHAR" property="versionName" />
+    <result column="flow_id" jdbcType="INTEGER" property="flowId" />
+    <result column="flow_name" jdbcType="VARCHAR" property="flowName" />
     <result column="job_group_id" jdbcType="INTEGER" property="jobGroupId" />
-    <result column="job_type" jdbcType="VARCHAR" property="jobType" />
-    <result column="local_node_handler_name" jdbcType="VARCHAR" property="localNodeHandlerName" />
-    <result column="mail_action" jdbcType="CHAR" property="mailAction" />
+    <result column="handler_name" jdbcType="VARCHAR" property="handlerName" />
     <result column="node_name" jdbcType="VARCHAR" property="nodeName" />
-    <result column="node_type" jdbcType="VARCHAR" property="nodeType" />
+    <result column="is_virtual" jdbcType="CHAR" property="isVirtual" />
     <result column="run_code" jdbcType="VARCHAR" property="runCode" />
     <result column="run_params" jdbcType="VARCHAR" property="runParams" />
-    <result column="run_time" jdbcType="DATE" property="runTime" />
+    <result column="start_time" jdbcType="TIMESTAMP" property="startTime" />
     <result column="run_type" jdbcType="CHAR" property="runType" />
     <result column="trigger_code" jdbcType="VARCHAR" property="triggerCode" />
     <result column="trigger_time" jdbcType="DATE" property="triggerTime" />
+    <result column="job_group_ip" jdbcType="VARCHAR" property="jobGroupIp" />
+    <result column="map_flow_id" jdbcType="INTEGER" property="mapFlowId" />
+    <result column="run_command" jdbcType="VARCHAR" property="runCommand" />
+    <result column="end_time" jdbcType="TIMESTAMP" property="endTime" />
+    <result column="node_id" jdbcType="INTEGER" property="nodeId" />
+  </resultMap>
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.byit.model.JobTaskRunLogWithBLOBs">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
     <result column="run_msg" jdbcType="LONGVARCHAR" property="runMsg" />
     <result column="trigger_msg" jdbcType="LONGVARCHAR" property="triggerMsg" />
-    <result column="job_version_name" jdbcType="VARCHAR" property="jobVersionName" />
   </resultMap>
-
   <sql id="Base_Column_List">
-    log_id, alarm_email, alarm_status, failed_remaining_count, flow_version_id, job_flow_id, 
-    job_flow_name, job_group_id, job_type, local_node_handler_name, mail_action, node_name, 
-    node_type, run_code, run_params, run_time, run_type, trigger_code, trigger_time,run_msg,
-    trigger_msg,job_version_name
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    log_id, failed_remaining_count, version_name, flow_id, flow_name, job_group_id, handler_name, 
+    node_name, is_virtual, run_code, run_params, start_time, run_type, trigger_code, 
+    trigger_time, job_group_ip, map_flow_id, run_command, end_time, node_id
+  </sql>
+  <sql id="Blob_Column_List">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    run_msg, trigger_msg
   </sql>
-
-  <select id="getById" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+  <select id="getById" parameterType="java.lang.Integer" resultMap="ResultMapWithBLOBs">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
     select 
     <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
     from job_task_run_log
     where log_id = #{logId,jdbcType=INTEGER}
   </select>
-
   <delete id="deleteById" parameterType="java.lang.Integer">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
     delete from job_task_run_log
     where log_id = #{logId,jdbcType=INTEGER}
   </delete>
-
-  <insert id="insert" parameterType="com.byit.model.JobTaskRunLog">
-    insert into job_task_run_log (log_id, alarm_email, alarm_status, 
-      failed_remaining_count, flow_version_id, job_flow_id, 
-      job_flow_name, job_group_id, job_type, 
-      local_node_handler_name, mail_action, node_name, 
-      node_type, run_code, run_params, 
-      run_time, run_type, trigger_code, 
-      trigger_time, run_msg, trigger_msg,job_version_name
-      )
-    values (#{logId,jdbcType=INTEGER}, #{alarmEmail,jdbcType=VARCHAR}, #{alarmStatus,jdbcType=CHAR}, 
-      #{failedRemainingCount,jdbcType=INTEGER}, #{flowVersionId,jdbcType=INTEGER}, #{jobFlowId,jdbcType=INTEGER}, 
-      #{jobFlowName,jdbcType=VARCHAR}, #{jobGroupId,jdbcType=INTEGER}, #{jobType,jdbcType=VARCHAR}, 
-      #{localNodeHandlerName,jdbcType=VARCHAR}, #{mailAction,jdbcType=CHAR}, #{nodeName,jdbcType=VARCHAR}, 
-      #{nodeType,jdbcType=VARCHAR}, #{runCode,jdbcType=VARCHAR}, #{runParams,jdbcType=VARCHAR}, 
-      #{runTime,jdbcType=DATE}, #{runType,jdbcType=CHAR}, #{triggerCode,jdbcType=VARCHAR}, 
-      #{triggerTime,jdbcType=DATE}, #{runMsg,jdbcType=LONGVARCHAR}, #{triggerMsg,jdbcType=LONGVARCHAR}
-      ,#{jobVersionName,jdbcType=VARCHAR}
-      )
+  <insert id="insert" parameterType="com.byit.model.JobTaskRunLogWithBLOBs">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    insert into job_task_run_log (log_id, failed_remaining_count, version_name, 
+      flow_id, flow_name, job_group_id, 
+      handler_name, node_name, is_virtual, 
+      run_code, run_params, start_time, 
+      run_type, trigger_code, trigger_time, 
+      job_group_ip, map_flow_id, run_command, 
+      end_time, node_id, run_msg, 
+      trigger_msg)
+    values (#{logId,jdbcType=INTEGER}, #{failedRemainingCount,jdbcType=INTEGER}, #{versionName,jdbcType=VARCHAR}, 
+      #{flowId,jdbcType=INTEGER}, #{flowName,jdbcType=VARCHAR}, #{jobGroupId,jdbcType=INTEGER}, 
+      #{handlerName,jdbcType=VARCHAR}, #{nodeName,jdbcType=VARCHAR}, #{isVirtual,jdbcType=CHAR}, 
+      #{runCode,jdbcType=VARCHAR}, #{runParams,jdbcType=VARCHAR}, #{startTime,jdbcType=TIMESTAMP}, 
+      #{runType,jdbcType=CHAR}, #{triggerCode,jdbcType=VARCHAR}, #{triggerTime,jdbcType=DATE}, 
+      #{jobGroupIp,jdbcType=VARCHAR}, #{mapFlowId,jdbcType=INTEGER}, #{runCommand,jdbcType=VARCHAR}, 
+      #{endTime,jdbcType=TIMESTAMP}, #{nodeId,jdbcType=INTEGER}, #{runMsg,jdbcType=LONGVARCHAR}, 
+      #{triggerMsg,jdbcType=LONGVARCHAR})
   </insert>
-
-  <insert id="insertSelective" parameterType="com.byit.model.JobTaskRunLog" useGeneratedKeys="true" keyProperty="logId" keyColumn="log_id">
+  <insert id="insertSelective" parameterType="com.byit.model.JobTaskRunLogWithBLOBs">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
     insert into job_task_run_log
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="logId != null">
         log_id,
       </if>
-      <if test="alarmEmail != null">
-        alarm_email,
-      </if>
-      <if test="alarmStatus != null">
-        alarm_status,
-      </if>
       <if test="failedRemainingCount != null">
         failed_remaining_count,
       </if>
-      <if test="flowVersionId != null">
-        flow_version_id,
+      <if test="versionName != null">
+        version_name,
       </if>
-      <if test="jobFlowId != null">
-        job_flow_id,
+      <if test="flowId != null">
+        flow_id,
       </if>
-      <if test="jobFlowName != null">
-        job_flow_name,
+      <if test="flowName != null">
+        flow_name,
       </if>
       <if test="jobGroupId != null">
         job_group_id,
       </if>
-      <if test="jobType != null">
-        job_type,
-      </if>
-      <if test="localNodeHandlerName != null">
-        local_node_handler_name,
-      </if>
-      <if test="mailAction != null">
-        mail_action,
+      <if test="handlerName != null">
+        handler_name,
       </if>
       <if test="nodeName != null">
         node_name,
       </if>
-      <if test="nodeType != null">
-        node_type,
+      <if test="isVirtual != null">
+        is_virtual,
       </if>
       <if test="runCode != null">
         run_code,
@@ -114,8 +109,8 @@
       <if test="runParams != null">
         run_params,
       </if>
-      <if test="runTime != null">
-        run_time,
+      <if test="startTime != null">
+        start_time,
       </if>
       <if test="runType != null">
         run_type,
@@ -126,55 +121,55 @@
       <if test="triggerTime != null">
         trigger_time,
       </if>
+      <if test="jobGroupIp != null">
+        job_group_ip,
+      </if>
+      <if test="mapFlowId != null">
+        map_flow_id,
+      </if>
+      <if test="runCommand != null">
+        run_command,
+      </if>
+      <if test="endTime != null">
+        end_time,
+      </if>
+      <if test="nodeId != null">
+        node_id,
+      </if>
       <if test="runMsg != null">
         run_msg,
       </if>
       <if test="triggerMsg != null">
         trigger_msg,
       </if>
-      <if test="jobVersionName != null">
-        job_version_name,
-      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="logId != null">
         #{logId,jdbcType=INTEGER},
       </if>
-      <if test="alarmEmail != null">
-        #{alarmEmail,jdbcType=VARCHAR},
-      </if>
-      <if test="alarmStatus != null">
-        #{alarmStatus,jdbcType=CHAR},
-      </if>
       <if test="failedRemainingCount != null">
         #{failedRemainingCount,jdbcType=INTEGER},
       </if>
-      <if test="flowVersionId != null">
-        #{flowVersionId,jdbcType=INTEGER},
+      <if test="versionName != null">
+        #{versionName,jdbcType=VARCHAR},
       </if>
-      <if test="jobFlowId != null">
-        #{jobFlowId,jdbcType=INTEGER},
+      <if test="flowId != null">
+        #{flowId,jdbcType=INTEGER},
       </if>
-      <if test="jobFlowName != null">
-        #{jobFlowName,jdbcType=VARCHAR},
+      <if test="flowName != null">
+        #{flowName,jdbcType=VARCHAR},
       </if>
       <if test="jobGroupId != null">
         #{jobGroupId,jdbcType=INTEGER},
       </if>
-      <if test="jobType != null">
-        #{jobType,jdbcType=VARCHAR},
-      </if>
-      <if test="localNodeHandlerName != null">
-        #{localNodeHandlerName,jdbcType=VARCHAR},
-      </if>
-      <if test="mailAction != null">
-        #{mailAction,jdbcType=CHAR},
+      <if test="handlerName != null">
+        #{handlerName,jdbcType=VARCHAR},
       </if>
       <if test="nodeName != null">
         #{nodeName,jdbcType=VARCHAR},
       </if>
-      <if test="nodeType != null">
-        #{nodeType,jdbcType=VARCHAR},
+      <if test="isVirtual != null">
+        #{isVirtual,jdbcType=CHAR},
       </if>
       <if test="runCode != null">
         #{runCode,jdbcType=VARCHAR},
@@ -182,8 +177,8 @@
       <if test="runParams != null">
         #{runParams,jdbcType=VARCHAR},
       </if>
-      <if test="runTime != null">
-        #{runTime,jdbcType=DATE},
+      <if test="startTime != null">
+        #{startTime,jdbcType=TIMESTAMP},
       </if>
       <if test="runType != null">
         #{runType,jdbcType=CHAR},
@@ -194,57 +189,56 @@
       <if test="triggerTime != null">
         #{triggerTime,jdbcType=DATE},
       </if>
+      <if test="jobGroupIp != null">
+        #{jobGroupIp,jdbcType=VARCHAR},
+      </if>
+      <if test="mapFlowId != null">
+        #{mapFlowId,jdbcType=INTEGER},
+      </if>
+      <if test="runCommand != null">
+        #{runCommand,jdbcType=VARCHAR},
+      </if>
+      <if test="endTime != null">
+        #{endTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="nodeId != null">
+        #{nodeId,jdbcType=INTEGER},
+      </if>
       <if test="runMsg != null">
         #{runMsg,jdbcType=LONGVARCHAR},
       </if>
       <if test="triggerMsg != null">
         #{triggerMsg,jdbcType=LONGVARCHAR},
       </if>
-      <if test="jobVersionName != null">
-        #{jobVersionName,jdbcType=VARCHAR},
-      </if>
     </trim>
   </insert>
-
-  <update id="updateByIdSelective" parameterType="com.byit.model.JobTaskRunLog">
-    <!-- generated @mbg.generated date: 2019-12-23 -->
+  <update id="updateByIdSelective" parameterType="com.byit.model.JobTaskRunLogWithBLOBs">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
     update job_task_run_log
     <set>
-      <if test="alarmEmail != null">
-        alarm_email = #{alarmEmail,jdbcType=VARCHAR},
-      </if>
-      <if test="alarmStatus != null">
-        alarm_status = #{alarmStatus,jdbcType=CHAR},
-      </if>
       <if test="failedRemainingCount != null">
         failed_remaining_count = #{failedRemainingCount,jdbcType=INTEGER},
       </if>
-      <if test="flowVersionId != null">
-        flow_version_id = #{flowVersionId,jdbcType=INTEGER},
+      <if test="versionName != null">
+        version_name = #{versionName,jdbcType=VARCHAR},
       </if>
-      <if test="jobFlowId != null">
-        job_flow_id = #{jobFlowId,jdbcType=INTEGER},
+      <if test="flowId != null">
+        flow_id = #{flowId,jdbcType=INTEGER},
       </if>
-      <if test="jobFlowName != null">
-        job_flow_name = #{jobFlowName,jdbcType=VARCHAR},
+      <if test="flowName != null">
+        flow_name = #{flowName,jdbcType=VARCHAR},
       </if>
       <if test="jobGroupId != null">
         job_group_id = #{jobGroupId,jdbcType=INTEGER},
       </if>
-      <if test="jobType != null">
-        job_type = #{jobType,jdbcType=VARCHAR},
-      </if>
-      <if test="localNodeHandlerName != null">
-        local_node_handler_name = #{localNodeHandlerName,jdbcType=VARCHAR},
-      </if>
-      <if test="mailAction != null">
-        mail_action = #{mailAction,jdbcType=CHAR},
+      <if test="handlerName != null">
+        handler_name = #{handlerName,jdbcType=VARCHAR},
       </if>
       <if test="nodeName != null">
         node_name = #{nodeName,jdbcType=VARCHAR},
       </if>
-      <if test="nodeType != null">
-        node_type = #{nodeType,jdbcType=VARCHAR},
+      <if test="isVirtual != null">
+        is_virtual = #{isVirtual,jdbcType=CHAR},
       </if>
       <if test="runCode != null">
         run_code = #{runCode,jdbcType=VARCHAR},
@@ -252,8 +246,8 @@
       <if test="runParams != null">
         run_params = #{runParams,jdbcType=VARCHAR},
       </if>
-      <if test="runTime != null">
-        run_time = #{runTime,jdbcType=DATE},
+      <if test="startTime != null">
+        start_time = #{startTime,jdbcType=TIMESTAMP},
       </if>
       <if test="runType != null">
         run_type = #{runType,jdbcType=CHAR},
@@ -264,68 +258,78 @@
       <if test="triggerTime != null">
         trigger_time = #{triggerTime,jdbcType=DATE},
       </if>
+      <if test="jobGroupIp != null">
+        job_group_ip = #{jobGroupIp,jdbcType=VARCHAR},
+      </if>
+      <if test="mapFlowId != null">
+        map_flow_id = #{mapFlowId,jdbcType=INTEGER},
+      </if>
+      <if test="runCommand != null">
+        run_command = #{runCommand,jdbcType=VARCHAR},
+      </if>
+      <if test="endTime != null">
+        end_time = #{endTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="nodeId != null">
+        node_id = #{nodeId,jdbcType=INTEGER},
+      </if>
       <if test="runMsg != null">
         run_msg = #{runMsg,jdbcType=LONGVARCHAR},
       </if>
       <if test="triggerMsg != null">
         trigger_msg = #{triggerMsg,jdbcType=LONGVARCHAR},
       </if>
-      <if test="jobVersionName != null">
-        job_version_name = #{jobVersionName,jdbcType=VARCHAR},
-      </if>
     </set>
     where log_id = #{logId,jdbcType=INTEGER}
   </update>
-
-  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.byit.model.JobTaskRunLog">
-    <!-- generated @mbg.generated date: 2019-12-23 -->
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.byit.model.JobTaskRunLogWithBLOBs">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
     update job_task_run_log
-    set alarm_email = #{alarmEmail,jdbcType=VARCHAR},
-      alarm_status = #{alarmStatus,jdbcType=CHAR},
-      failed_remaining_count = #{failedRemainingCount,jdbcType=INTEGER},
-      flow_version_id = #{flowVersionId,jdbcType=INTEGER},
-      job_flow_id = #{jobFlowId,jdbcType=INTEGER},
-      job_flow_name = #{jobFlowName,jdbcType=VARCHAR},
+    set failed_remaining_count = #{failedRemainingCount,jdbcType=INTEGER},
+      version_name = #{versionName,jdbcType=VARCHAR},
+      flow_id = #{flowId,jdbcType=INTEGER},
+      flow_name = #{flowName,jdbcType=VARCHAR},
       job_group_id = #{jobGroupId,jdbcType=INTEGER},
-      job_type = #{jobType,jdbcType=VARCHAR},
-      local_node_handler_name = #{localNodeHandlerName,jdbcType=VARCHAR},
-      mail_action = #{mailAction,jdbcType=CHAR},
+      handler_name = #{handlerName,jdbcType=VARCHAR},
       node_name = #{nodeName,jdbcType=VARCHAR},
-      node_type = #{nodeType,jdbcType=VARCHAR},
+      is_virtual = #{isVirtual,jdbcType=CHAR},
       run_code = #{runCode,jdbcType=VARCHAR},
       run_params = #{runParams,jdbcType=VARCHAR},
-      run_time = #{runTime,jdbcType=DATE},
+      start_time = #{startTime,jdbcType=TIMESTAMP},
       run_type = #{runType,jdbcType=CHAR},
       trigger_code = #{triggerCode,jdbcType=VARCHAR},
       trigger_time = #{triggerTime,jdbcType=DATE},
+      job_group_ip = #{jobGroupIp,jdbcType=VARCHAR},
+      map_flow_id = #{mapFlowId,jdbcType=INTEGER},
+      run_command = #{runCommand,jdbcType=VARCHAR},
+      end_time = #{endTime,jdbcType=TIMESTAMP},
+      node_id = #{nodeId,jdbcType=INTEGER},
       run_msg = #{runMsg,jdbcType=LONGVARCHAR},
-      trigger_msg = #{triggerMsg,jdbcType=LONGVARCHAR},
-      job_version_name = #{jobVersionName,jdbcType=VARCHAR}
+      trigger_msg = #{triggerMsg,jdbcType=LONGVARCHAR}
     where log_id = #{logId,jdbcType=INTEGER}
   </update>
-
   <update id="updateById" parameterType="com.byit.model.JobTaskRunLog">
-    <!-- generated @mbg.generated date: 2019-12-23 -->
+    <!-- generated @mbg.generated date: 2019-12-25 -->
     update job_task_run_log
-    set alarm_email = #{alarmEmail,jdbcType=VARCHAR},
-      alarm_status = #{alarmStatus,jdbcType=CHAR},
-      failed_remaining_count = #{failedRemainingCount,jdbcType=INTEGER},
-      flow_version_id = #{flowVersionId,jdbcType=INTEGER},
-      job_flow_id = #{jobFlowId,jdbcType=INTEGER},
-      job_flow_name = #{jobFlowName,jdbcType=VARCHAR},
+    set failed_remaining_count = #{failedRemainingCount,jdbcType=INTEGER},
+      version_name = #{versionName,jdbcType=VARCHAR},
+      flow_id = #{flowId,jdbcType=INTEGER},
+      flow_name = #{flowName,jdbcType=VARCHAR},
       job_group_id = #{jobGroupId,jdbcType=INTEGER},
-      job_type = #{jobType,jdbcType=VARCHAR},
-      local_node_handler_name = #{localNodeHandlerName,jdbcType=VARCHAR},
-      mail_action = #{mailAction,jdbcType=CHAR},
+      handler_name = #{handlerName,jdbcType=VARCHAR},
       node_name = #{nodeName,jdbcType=VARCHAR},
-      node_type = #{nodeType,jdbcType=VARCHAR},
+      is_virtual = #{isVirtual,jdbcType=CHAR},
       run_code = #{runCode,jdbcType=VARCHAR},
       run_params = #{runParams,jdbcType=VARCHAR},
-      run_time = #{runTime,jdbcType=DATE},
+      start_time = #{startTime,jdbcType=TIMESTAMP},
       run_type = #{runType,jdbcType=CHAR},
       trigger_code = #{triggerCode,jdbcType=VARCHAR},
       trigger_time = #{triggerTime,jdbcType=DATE},
-      job_version_name = #{jobVersionName,jdbcType=VARCHAR}
+      job_group_ip = #{jobGroupIp,jdbcType=VARCHAR},
+      map_flow_id = #{mapFlowId,jdbcType=INTEGER},
+      run_command = #{runCommand,jdbcType=VARCHAR},
+      end_time = #{endTime,jdbcType=TIMESTAMP},
+      node_id = #{nodeId,jdbcType=INTEGER}
     where log_id = #{logId,jdbcType=INTEGER}
   </update>
 </mapper>
\ No newline at end of file

byit-myth-core/myth-admin-core/src/main/resources/mapper/JobTaskScheduleMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.byit.mapper.JobTaskScheduleMapper">
-
   <resultMap id="BaseResultMap" type="com.byit.model.JobTaskSchedule">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="node_id" jdbcType="INTEGER" property="nodeId" />
-    <result column="alarm_email" jdbcType="VARCHAR" property="alarmEmail" />
     <result column="block_strategy" jdbcType="VARCHAR" property="blockStrategy" />
-    <result column="callback_token" jdbcType="VARCHAR" property="callbackToken" />
-    <result column="dependency_nodes" jdbcType="VARCHAR" property="dependencyNodes" />
+    <result column="plugin_token" jdbcType="VARCHAR" property="pluginToken" />
     <result column="failed_retry_count" jdbcType="INTEGER" property="failedRetryCount" />
     <result column="flow_id" jdbcType="INTEGER" property="flowId" />
-    <result column="follow_task_flow" jdbcType="CHAR" property="followTaskFlow" />
     <result column="gateway_token" jdbcType="VARCHAR" property="gatewayToken" />
     <result column="job_type" jdbcType="VARCHAR" property="jobType" />
-    <result column="local_node_handler_name" jdbcType="VARCHAR" property="localNodeHandlerName" />
-    <result column="log_id" jdbcType="INTEGER" property="logId" />
-    <result column="mail_action" jdbcType="CHAR" property="mailAction" />
-    <result column="node_cron" jdbcType="VARCHAR" property="nodeCron" />
+    <result column="handler_name" jdbcType="VARCHAR" property="handlerName" />
     <result column="node_desc" jdbcType="VARCHAR" property="nodeDesc" />
     <result column="node_name" jdbcType="VARCHAR" property="nodeName" />
-    <result column="node_of_flow_id" jdbcType="INTEGER" property="nodeOfFlowId" />
+    <result column="map_flow_id" jdbcType="INTEGER" property="mapFlowId" />
     <result column="node_timeout" jdbcType="BIGINT" property="nodeTimeout" />
-    <result column="node_type" jdbcType="VARCHAR" property="nodeType" />
+    <result column="is_virtual" jdbcType="CHAR" property="isVirtual" />
     <result column="plugin_urls" jdbcType="VARCHAR" property="pluginUrls" />
     <result column="priority" jdbcType="CHAR" property="priority" />
-    <result column="remaining_count" jdbcType="INTEGER" property="remainingCount" />
-    <result column="repeat_count" jdbcType="INTEGER" property="repeatCount" />
-    <result column="retry_interval" jdbcType="BIGINT" property="retryInterval" />
+    <result column="failed_retry_interval" jdbcType="BIGINT" property="failedRetryInterval" />
     <result column="routing_strategy" jdbcType="VARCHAR" property="routingStrategy" />
     <result column="run_id" jdbcType="VARCHAR" property="runId" />
     <result column="run_param" jdbcType="VARCHAR" property="runParam" />
     <result column="run_source_desc" jdbcType="VARCHAR" property="runSourceDesc" />
     <result column="script_urls" jdbcType="VARCHAR" property="scriptUrls" />
     <result column="source_principal" jdbcType="VARCHAR" property="sourcePrincipal" />
-    <result column="source_update_time" jdbcType="DATE" property="sourceUpdateTime" />
-    <result column="trigger_next_time" jdbcType="BIGINT" property="triggerNextTime" />
+    <result column="trigger_time" jdbcType="BIGINT" property="triggerTime" />
     <result column="trigger_status" jdbcType="CHAR" property="triggerStatus" />
-    <result column="run_source" jdbcType="LONGVARCHAR" property="runSource" />
-    <result column="add_time" jdbcType="DATE" property="addTime" />
-    <result column="author" jdbcType="VARCHAR" property="author" />
-    <result column="version_id" jdbcType="INTEGER" property="versionId" />
     <result column="version_name" jdbcType="VARCHAR" property="versionName" />
+    <result column="log_id" jdbcType="INTEGER" property="logId" />
+    <result column="run_command" jdbcType="VARCHAR" property="runCommand" />
+  </resultMap>
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.byit.model.JobTaskSchedule">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    <result column="run_source" jdbcType="LONGVARCHAR" property="runSource" />
   </resultMap>
-
   <sql id="Base_Column_List">
-    id, node_id, alarm_email, block_strategy, callback_token, dependency_nodes, failed_retry_count, 
-    flow_id, follow_task_flow, gateway_token, job_type, local_node_handler_name, log_id, 
-    mail_action, node_cron, node_desc, node_name, node_of_flow_id, node_timeout, node_type, 
-    plugin_urls, priority, remaining_count, repeat_count, retry_interval, routing_strategy, 
-    run_id, run_param, run_source_desc, script_urls, source_principal, source_update_time, 
-    trigger_next_time, trigger_status,run_source,add_time,author,version_id,version_name
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    id, node_id, block_strategy, plugin_token, failed_retry_count, flow_id, gateway_token, 
+    job_type, handler_name, node_desc, node_name, map_flow_id, node_timeout, is_virtual, 
+    plugin_urls, priority, failed_retry_interval, routing_strategy, run_id, run_param, 
+    run_source_desc, script_urls, source_principal, trigger_time, trigger_status, version_name, 
+    log_id, run_command
   </sql>
-  <!--查询五秒内将要执行的数据-->
-  <select id="findJobTaskScheduleByTriggerNextTimeLessThanEqual" resultMap="BaseResultMap">
-    select
-    <include refid="Base_Column_List" />
-    from job_task_schedule
-    where trigger_next_time <![CDATA[ <= ]]> #{triggerNextTime,jdbcType=BIGINT}
-  </select>
-
-  <select id="getById" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+  <sql id="Blob_Column_List">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    run_source
+  </sql>
+  <select id="getById" parameterType="java.lang.Integer" resultMap="ResultMapWithBLOBs">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
     select 
     <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
     from job_task_schedule
     where id = #{id,jdbcType=INTEGER}
   </select>
   <delete id="deleteById" parameterType="java.lang.Integer">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
     delete from job_task_schedule
     where id = #{id,jdbcType=INTEGER}
   </delete>
   <insert id="insert" parameterType="com.byit.model.JobTaskSchedule">
-    insert into job_task_schedule (id, node_id, alarm_email, 
-      block_strategy, callback_token, dependency_nodes, 
-      failed_retry_count, flow_id, follow_task_flow, 
-      gateway_token, job_type, local_node_handler_name, 
-      log_id, mail_action, node_cron, 
-      node_desc, node_name, node_of_flow_id, 
-      node_timeout, node_type, plugin_urls, 
-      priority, remaining_count, repeat_count, 
-      retry_interval, routing_strategy, run_id, 
-      run_param, run_source_desc, script_urls, 
-      source_principal, source_update_time, trigger_next_time, 
-      trigger_status, run_source,add_time,author,version_id,version_name)
-    values (#{id,jdbcType=INTEGER}, #{nodeId,jdbcType=INTEGER}, #{alarmEmail,jdbcType=VARCHAR}, 
-      #{blockStrategy,jdbcType=VARCHAR}, #{callbackToken,jdbcType=VARCHAR}, #{dependencyNodes,jdbcType=VARCHAR}, 
-      #{failedRetryCount,jdbcType=INTEGER}, #{flowId,jdbcType=INTEGER}, #{followTaskFlow,jdbcType=CHAR}, 
-      #{gatewayToken,jdbcType=VARCHAR}, #{jobType,jdbcType=VARCHAR}, #{localNodeHandlerName,jdbcType=VARCHAR}, 
-      #{logId,jdbcType=INTEGER}, #{mailAction,jdbcType=CHAR}, #{nodeCron,jdbcType=VARCHAR}, 
-      #{nodeDesc,jdbcType=VARCHAR}, #{nodeName,jdbcType=VARCHAR}, #{nodeOfFlowId,jdbcType=INTEGER}, 
-      #{nodeTimeout,jdbcType=BIGINT}, #{nodeType,jdbcType=VARCHAR}, #{pluginUrls,jdbcType=VARCHAR}, 
-      #{priority,jdbcType=CHAR}, #{remainingCount,jdbcType=INTEGER}, #{repeatCount,jdbcType=INTEGER}, 
-      #{retryInterval,jdbcType=BIGINT}, #{routingStrategy,jdbcType=VARCHAR}, #{runId,jdbcType=VARCHAR}, 
-      #{runParam,jdbcType=VARCHAR}, #{runSourceDesc,jdbcType=VARCHAR}, #{scriptUrls,jdbcType=VARCHAR}, 
-      #{sourcePrincipal,jdbcType=VARCHAR}, #{sourceUpdateTime,jdbcType=DATE}, #{triggerNextTime,jdbcType=BIGINT}, 
-      #{triggerStatus,jdbcType=CHAR}, #{runSource,jdbcType=LONGVARCHAR},#{addTime,jdbcType=DATE},#{author,jdbcType=VARCHAR},
-      #{versionId,jdbcType=INTEGER}, #{versionName,jdbcType=VARCHAR})
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    insert into job_task_schedule (id, node_id, block_strategy, 
+      plugin_token, failed_retry_count, flow_id, 
+      gateway_token, job_type, handler_name, 
+      node_desc, node_name, map_flow_id, 
+      node_timeout, is_virtual, plugin_urls, 
+      priority, failed_retry_interval, routing_strategy, 
+      run_id, run_param, run_source_desc, 
+      script_urls, source_principal, trigger_time, 
+      trigger_status, version_name, log_id, 
+      run_command, run_source)
+    values (#{id,jdbcType=INTEGER}, #{nodeId,jdbcType=INTEGER}, #{blockStrategy,jdbcType=VARCHAR}, 
+      #{pluginToken,jdbcType=VARCHAR}, #{failedRetryCount,jdbcType=INTEGER}, #{flowId,jdbcType=INTEGER}, 
+      #{gatewayToken,jdbcType=VARCHAR}, #{jobType,jdbcType=VARCHAR}, #{handlerName,jdbcType=VARCHAR}, 
+      #{nodeDesc,jdbcType=VARCHAR}, #{nodeName,jdbcType=VARCHAR}, #{mapFlowId,jdbcType=INTEGER}, 
+      #{nodeTimeout,jdbcType=BIGINT}, #{isVirtual,jdbcType=CHAR}, #{pluginUrls,jdbcType=VARCHAR}, 
+      #{priority,jdbcType=CHAR}, #{failedRetryInterval,jdbcType=BIGINT}, #{routingStrategy,jdbcType=VARCHAR}, 
+      #{runId,jdbcType=VARCHAR}, #{runParam,jdbcType=VARCHAR}, #{runSourceDesc,jdbcType=VARCHAR}, 
+      #{scriptUrls,jdbcType=VARCHAR}, #{sourcePrincipal,jdbcType=VARCHAR}, #{triggerTime,jdbcType=BIGINT}, 
+      #{triggerStatus,jdbcType=CHAR}, #{versionName,jdbcType=VARCHAR}, #{logId,jdbcType=INTEGER}, 
+      #{runCommand,jdbcType=VARCHAR}, #{runSource,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.byit.model.JobTaskSchedule">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
     insert into job_task_schedule
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -106,17 +95,11 @@
       <if test="nodeId != null">
         node_id,
       </if>
-      <if test="alarmEmail != null">
-        alarm_email,
-      </if>
       <if test="blockStrategy != null">
         block_strategy,
       </if>
-      <if test="callbackToken != null">
-        callback_token,
-      </if>
-      <if test="dependencyNodes != null">
-        dependency_nodes,
+      <if test="pluginToken != null">
+        plugin_token,
       </if>
       <if test="failedRetryCount != null">
         failed_retry_count,
@@ -124,26 +107,14 @@
       <if test="flowId != null">
         flow_id,
       </if>
-      <if test="followTaskFlow != null">
-        follow_task_flow,
-      </if>
       <if test="gatewayToken != null">
         gateway_token,
       </if>
       <if test="jobType != null">
         job_type,
       </if>
-      <if test="localNodeHandlerName != null">
-        local_node_handler_name,
-      </if>
-      <if test="logId != null">
-        log_id,
-      </if>
-      <if test="mailAction != null">
-        mail_action,
-      </if>
-      <if test="nodeCron != null">
-        node_cron,
+      <if test="handlerName != null">
+        handler_name,
       </if>
       <if test="nodeDesc != null">
         node_desc,
@@ -151,14 +122,14 @@
       <if test="nodeName != null">
         node_name,
       </if>
-      <if test="nodeOfFlowId != null">
-        node_of_flow_id,
+      <if test="mapFlowId != null">
+        map_flow_id,
       </if>
       <if test="nodeTimeout != null">
         node_timeout,
       </if>
-      <if test="nodeType != null">
-        node_type,
+      <if test="isVirtual != null">
+        is_virtual,
       </if>
       <if test="pluginUrls != null">
         plugin_urls,
@@ -166,14 +137,8 @@
       <if test="priority != null">
         priority,
       </if>
-      <if test="remainingCount != null">
-        remaining_count,
-      </if>
-      <if test="repeatCount != null">
-        repeat_count,
-      </if>
-      <if test="retryInterval != null">
-        retry_interval,
+      <if test="failedRetryInterval != null">
+        failed_retry_interval,
       </if>
       <if test="routingStrategy != null">
         routing_strategy,
@@ -193,31 +158,24 @@
       <if test="sourcePrincipal != null">
         source_principal,
       </if>
-      <if test="sourceUpdateTime != null">
-        source_update_time,
-      </if>
-      <if test="triggerNextTime != null">
-        trigger_next_time,
+      <if test="triggerTime != null">
+        trigger_time,
       </if>
       <if test="triggerStatus != null">
         trigger_status,
       </if>
-      <if test="runSource != null">
-        run_source,
-      </if>
-      <if test="addTime != null">
-        add_time,
+      <if test="versionName != null">
+        version_name,
       </if>
-      <if test="author != null">
-        author,
+      <if test="logId != null">
+        log_id,
       </if>
-      <if test="versionId != null">
-        version_id,
+      <if test="runCommand != null">
+        run_command,
       </if>
-      <if test="versionName != null">
-        version_name,
+      <if test="runSource != null">
+        run_source,
       </if>
-
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -226,17 +184,11 @@
       <if test="nodeId != null">
         #{nodeId,jdbcType=INTEGER},
       </if>
-      <if test="alarmEmail != null">
-        #{alarmEmail,jdbcType=VARCHAR},
-      </if>
       <if test="blockStrategy != null">
         #{blockStrategy,jdbcType=VARCHAR},
       </if>
-      <if test="callbackToken != null">
-        #{callbackToken,jdbcType=VARCHAR},
-      </if>
-      <if test="dependencyNodes != null">
-        #{dependencyNodes,jdbcType=VARCHAR},
+      <if test="pluginToken != null">
+        #{pluginToken,jdbcType=VARCHAR},
       </if>
       <if test="failedRetryCount != null">
         #{failedRetryCount,jdbcType=INTEGER},
@@ -244,26 +196,14 @@
       <if test="flowId != null">
         #{flowId,jdbcType=INTEGER},
       </if>
-      <if test="followTaskFlow != null">
-        #{followTaskFlow,jdbcType=CHAR},
-      </if>
       <if test="gatewayToken != null">
         #{gatewayToken,jdbcType=VARCHAR},
       </if>
       <if test="jobType != null">
         #{jobType,jdbcType=VARCHAR},
       </if>
-      <if test="localNodeHandlerName != null">
-        #{localNodeHandlerName,jdbcType=VARCHAR},
-      </if>
-      <if test="logId != null">
-        #{logId,jdbcType=INTEGER},
-      </if>
-      <if test="mailAction != null">
-        #{mailAction,jdbcType=CHAR},
-      </if>
-      <if test="nodeCron != null">
-        #{nodeCron,jdbcType=VARCHAR},
+      <if test="handlerName != null">
+        #{handlerName,jdbcType=VARCHAR},
       </if>
       <if test="nodeDesc != null">
         #{nodeDesc,jdbcType=VARCHAR},
@@ -271,14 +211,14 @@
       <if test="nodeName != null">
         #{nodeName,jdbcType=VARCHAR},
       </if>
-      <if test="nodeOfFlowId != null">
-        #{nodeOfFlowId,jdbcType=INTEGER},
+      <if test="mapFlowId != null">
+        #{mapFlowId,jdbcType=INTEGER},
       </if>
       <if test="nodeTimeout != null">
         #{nodeTimeout,jdbcType=BIGINT},
       </if>
-      <if test="nodeType != null">
-        #{nodeType,jdbcType=VARCHAR},
+      <if test="isVirtual != null">
+        #{isVirtual,jdbcType=CHAR},
       </if>
       <if test="pluginUrls != null">
         #{pluginUrls,jdbcType=VARCHAR},
@@ -286,14 +226,8 @@
       <if test="priority != null">
         #{priority,jdbcType=CHAR},
       </if>
-      <if test="remainingCount != null">
-        #{remainingCount,jdbcType=INTEGER},
-      </if>
-      <if test="repeatCount != null">
-        #{repeatCount,jdbcType=INTEGER},
-      </if>
-      <if test="retryInterval != null">
-        #{retryInterval,jdbcType=BIGINT},
+      <if test="failedRetryInterval != null">
+        #{failedRetryInterval,jdbcType=BIGINT},
       </if>
       <if test="routingStrategy != null">
         #{routingStrategy,jdbcType=VARCHAR},
@@ -313,84 +247,38 @@
       <if test="sourcePrincipal != null">
         #{sourcePrincipal,jdbcType=VARCHAR},
       </if>
-      <if test="sourceUpdateTime != null">
-        #{sourceUpdateTime,jdbcType=DATE},
-      </if>
-      <if test="triggerNextTime != null">
-        #{triggerNextTime,jdbcType=BIGINT},
+      <if test="triggerTime != null">
+        #{triggerTime,jdbcType=BIGINT},
       </if>
       <if test="triggerStatus != null">
         #{triggerStatus,jdbcType=CHAR},
       </if>
-      <if test="runSource != null">
-        #{runSource,jdbcType=LONGVARCHAR},
-      </if>
-      <if test="addTime != null">
-        #{addTime,jdbcType=DATE},
+      <if test="versionName != null">
+        #{versionName,jdbcType=VARCHAR},
       </if>
-      <if test="author != null">
-        #{author,jdbcType=VARCHAR},
+      <if test="logId != null">
+        #{logId,jdbcType=INTEGER},
       </if>
-      <if test="versionId != null">
-        #{versionId,jdbcType=INTEGER},
+      <if test="runCommand != null">
+        #{runCommand,jdbcType=VARCHAR},
       </if>
-      <if test="versionName != null">
-        #{versionName,jdbcType=VARCHAR},
+      <if test="runSource != null">
+        #{runSource,jdbcType=LONGVARCHAR},
       </if>
     </trim>
   </insert>
-
-  <!--批量插入-->
-  <insert id="insertDataList" parameterType="com.byit.model.JobTaskSchedule">
-     insert into job_task_schedule (id, node_id, alarm_email,
-      block_strategy, callback_token, dependency_nodes,
-      failed_retry_count, flow_id, follow_task_flow,
-      gateway_token, job_type, local_node_handler_name,
-      log_id, mail_action, node_cron,
-      node_desc, node_name, node_of_flow_id,
-      node_timeout, node_type, plugin_urls,
-      priority, remaining_count, repeat_count,
-      retry_interval, routing_strategy, run_id,
-      run_param, run_source_desc, script_urls,
-      source_principal, source_update_time, trigger_next_time,
-      trigger_status,run_source,add_time,author,version_id,version_name)
-    values
-      <foreach collection="jobTaskSchedules" item="jobTaskSchedule" separator =",">
-        (#{jobTaskSchedule.id,jdbcType=INTEGER}, #{jobTaskSchedule.nodeId,jdbcType=INTEGER}, #{jobTaskSchedule.alarmEmail,jdbcType=VARCHAR},
-        #{jobTaskSchedule.blockStrategy,jdbcType=VARCHAR}, #{jobTaskSchedule.callbackToken,jdbcType=VARCHAR}, #{jobTaskSchedule.dependencyNodes,jdbcType=VARCHAR},
-        #{jobTaskSchedule.failedRetryCount,jdbcType=INTEGER}, #{jobTaskSchedule.flowId,jdbcType=INTEGER}, #{jobTaskSchedule.followTaskFlow,jdbcType=CHAR},
-        #{jobTaskSchedule.gatewayToken,jdbcType=VARCHAR}, #{jobTaskSchedule.jobType,jdbcType=VARCHAR}, #{jobTaskSchedule.localNodeHandlerName,jdbcType=VARCHAR},
-        #{jobTaskSchedule.logId,jdbcType=INTEGER}, #{jobTaskSchedule.mailAction,jdbcType=CHAR}, #{jobTaskSchedule.nodeCron,jdbcType=VARCHAR},
-        #{jobTaskSchedule.nodeDesc,jdbcType=VARCHAR}, #{jobTaskSchedule.nodeName,jdbcType=VARCHAR}, #{jobTaskSchedule.nodeOfFlowId,jdbcType=INTEGER},
-        #{jobTaskSchedule.nodeTimeout,jdbcType=BIGINT}, #{jobTaskSchedule.nodeType,jdbcType=VARCHAR}, #{jobTaskSchedule.pluginUrls,jdbcType=VARCHAR},
-        #{jobTaskSchedule.priority,jdbcType=CHAR}, #{jobTaskSchedule.remainingCount,jdbcType=INTEGER}, #{jobTaskSchedule.repeatCount,jdbcType=INTEGER},
-        #{jobTaskSchedule.retryInterval,jdbcType=BIGINT}, #{jobTaskSchedule.routingStrategy,jdbcType=VARCHAR}, #{jobTaskSchedule.runId,jdbcType=VARCHAR},
-        #{jobTaskSchedule.runParam,jdbcType=VARCHAR}, #{jobTaskSchedule.runSourceDesc,jdbcType=VARCHAR}, #{jobTaskSchedule.scriptUrls,jdbcType=VARCHAR},
-        #{jobTaskSchedule.sourcePrincipal,jdbcType=VARCHAR}, #{jobTaskSchedule.sourceUpdateTime,jdbcType=DATE}, #{jobTaskSchedule.triggerNextTime,jdbcType=BIGINT},
-        #{jobTaskSchedule.triggerStatus,jdbcType=CHAR}, #{jobTaskSchedule.runSource,jdbcType=LONGVARCHAR},#{jobTaskSchedule.addTime,jdbcType=DATE},
-        #{jobTaskSchedule.author,jdbcType=VARCHAR},#{jobTaskSchedule.versionId,jdbcType=INTEGER}, #{jobTaskSchedule.versionName,jdbcType=VARCHAR})
-      </foreach>
-  </insert>
-
-
   <update id="updateByIdSelective" parameterType="com.byit.model.JobTaskSchedule">
-    <!-- generated @mbg.generated date: 2019-12-23 -->
+    <!-- generated @mbg.generated date: 2019-12-25 -->
     update job_task_schedule
     <set>
       <if test="nodeId != null">
         node_id = #{nodeId,jdbcType=INTEGER},
       </if>
-      <if test="alarmEmail != null">
-        alarm_email = #{alarmEmail,jdbcType=VARCHAR},
-      </if>
       <if test="blockStrategy != null">
         block_strategy = #{blockStrategy,jdbcType=VARCHAR},
       </if>
-      <if test="callbackToken != null">
-        callback_token = #{callbackToken,jdbcType=VARCHAR},
-      </if>
-      <if test="dependencyNodes != null">
-        dependency_nodes = #{dependencyNodes,jdbcType=VARCHAR},
+      <if test="pluginToken != null">
+        plugin_token = #{pluginToken,jdbcType=VARCHAR},
       </if>
       <if test="failedRetryCount != null">
         failed_retry_count = #{failedRetryCount,jdbcType=INTEGER},
@@ -398,26 +286,14 @@
       <if test="flowId != null">
         flow_id = #{flowId,jdbcType=INTEGER},
       </if>
-      <if test="followTaskFlow != null">
-        follow_task_flow = #{followTaskFlow,jdbcType=CHAR},
-      </if>
       <if test="gatewayToken != null">
         gateway_token = #{gatewayToken,jdbcType=VARCHAR},
       </if>
       <if test="jobType != null">
         job_type = #{jobType,jdbcType=VARCHAR},
       </if>
-      <if test="localNodeHandlerName != null">
-        local_node_handler_name = #{localNodeHandlerName,jdbcType=VARCHAR},
-      </if>
-      <if test="logId != null">
-        log_id = #{logId,jdbcType=INTEGER},
-      </if>
-      <if test="mailAction != null">
-        mail_action = #{mailAction,jdbcType=CHAR},
-      </if>
-      <if test="nodeCron != null">
-        node_cron = #{nodeCron,jdbcType=VARCHAR},
+      <if test="handlerName != null">
+        handler_name = #{handlerName,jdbcType=VARCHAR},
       </if>
       <if test="nodeDesc != null">
         node_desc = #{nodeDesc,jdbcType=VARCHAR},
@@ -425,14 +301,14 @@
       <if test="nodeName != null">
         node_name = #{nodeName,jdbcType=VARCHAR},
       </if>
-      <if test="nodeOfFlowId != null">
-        node_of_flow_id = #{nodeOfFlowId,jdbcType=INTEGER},
+      <if test="mapFlowId != null">
+        map_flow_id = #{mapFlowId,jdbcType=INTEGER},
       </if>
       <if test="nodeTimeout != null">
         node_timeout = #{nodeTimeout,jdbcType=BIGINT},
       </if>
-      <if test="nodeType != null">
-        node_type = #{nodeType,jdbcType=VARCHAR},
+      <if test="isVirtual != null">
+        is_virtual = #{isVirtual,jdbcType=CHAR},
       </if>
       <if test="pluginUrls != null">
         plugin_urls = #{pluginUrls,jdbcType=VARCHAR},
@@ -440,14 +316,8 @@
       <if test="priority != null">
         priority = #{priority,jdbcType=CHAR},
       </if>
-      <if test="remainingCount != null">
-        remaining_count = #{remainingCount,jdbcType=INTEGER},
-      </if>
-      <if test="repeatCount != null">
-        repeat_count = #{repeatCount,jdbcType=INTEGER},
-      </if>
-      <if test="retryInterval != null">
-        retry_interval = #{retryInterval,jdbcType=BIGINT},
+      <if test="failedRetryInterval != null">
+        failed_retry_interval = #{failedRetryInterval,jdbcType=BIGINT},
       </if>
       <if test="routingStrategy != null">
         routing_strategy = #{routingStrategy,jdbcType=VARCHAR},
@@ -467,32 +337,90 @@
       <if test="sourcePrincipal != null">
         source_principal = #{sourcePrincipal,jdbcType=VARCHAR},
       </if>
-      <if test="sourceUpdateTime != null">
-        source_update_time = #{sourceUpdateTime,jdbcType=DATE},
-      </if>
-      <if test="triggerNextTime != null">
-        trigger_next_time = #{triggerNextTime,jdbcType=BIGINT},
+      <if test="triggerTime != null">
+        trigger_time = #{triggerTime,jdbcType=BIGINT},
       </if>
       <if test="triggerStatus != null">
         trigger_status = #{triggerStatus,jdbcType=CHAR},
       </if>
-      <if test="runSource != null">
-        run_source = #{runSource,jdbcType=LONGVARCHAR},
-      </if>
-      <if test="addTime != null">
-        add_time = #{addTime,jdbcType=DATE},
+      <if test="versionName != null">
+        version_name = #{versionName,jdbcType=VARCHAR},
       </if>
-      <if test="author != null">
-        author = #{author,jdbcType=VARCHAR},
+      <if test="logId != null">
+        log_id = #{logId,jdbcType=INTEGER},
       </if>
-
-      <if test="versionId != null">
-        version_id = #{versionId,jdbcType=INTEGER},
+      <if test="runCommand != null">
+        run_command = #{runCommand,jdbcType=VARCHAR},
       </if>
-      <if test="versionName != null">
-        version_name = #{versionName,jdbcType=VARCHAR},
+      <if test="runSource != null">
+        run_source = #{runSource,jdbcType=LONGVARCHAR},
       </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.byit.model.JobTaskSchedule">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    update job_task_schedule
+    set node_id = #{nodeId,jdbcType=INTEGER},
+      block_strategy = #{blockStrategy,jdbcType=VARCHAR},
+      plugin_token = #{pluginToken,jdbcType=VARCHAR},
+      failed_retry_count = #{failedRetryCount,jdbcType=INTEGER},
+      flow_id = #{flowId,jdbcType=INTEGER},
+      gateway_token = #{gatewayToken,jdbcType=VARCHAR},
+      job_type = #{jobType,jdbcType=VARCHAR},
+      handler_name = #{handlerName,jdbcType=VARCHAR},
+      node_desc = #{nodeDesc,jdbcType=VARCHAR},
+      node_name = #{nodeName,jdbcType=VARCHAR},
+      map_flow_id = #{mapFlowId,jdbcType=INTEGER},
+      node_timeout = #{nodeTimeout,jdbcType=BIGINT},
+      is_virtual = #{isVirtual,jdbcType=CHAR},
+      plugin_urls = #{pluginUrls,jdbcType=VARCHAR},
+      priority = #{priority,jdbcType=CHAR},
+      failed_retry_interval = #{failedRetryInterval,jdbcType=BIGINT},
+      routing_strategy = #{routingStrategy,jdbcType=VARCHAR},
+      run_id = #{runId,jdbcType=VARCHAR},
+      run_param = #{runParam,jdbcType=VARCHAR},
+      run_source_desc = #{runSourceDesc,jdbcType=VARCHAR},
+      script_urls = #{scriptUrls,jdbcType=VARCHAR},
+      source_principal = #{sourcePrincipal,jdbcType=VARCHAR},
+      trigger_time = #{triggerTime,jdbcType=BIGINT},
+      trigger_status = #{triggerStatus,jdbcType=CHAR},
+      version_name = #{versionName,jdbcType=VARCHAR},
+      log_id = #{logId,jdbcType=INTEGER},
+      run_command = #{runCommand,jdbcType=VARCHAR},
+      run_source = #{runSource,jdbcType=LONGVARCHAR}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateById" parameterType="com.byit.model.JobTaskSchedule">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    update job_task_schedule
+    set node_id = #{nodeId,jdbcType=INTEGER},
+      block_strategy = #{blockStrategy,jdbcType=VARCHAR},
+      plugin_token = #{pluginToken,jdbcType=VARCHAR},
+      failed_retry_count = #{failedRetryCount,jdbcType=INTEGER},
+      flow_id = #{flowId,jdbcType=INTEGER},
+      gateway_token = #{gatewayToken,jdbcType=VARCHAR},
+      job_type = #{jobType,jdbcType=VARCHAR},
+      handler_name = #{handlerName,jdbcType=VARCHAR},
+      node_desc = #{nodeDesc,jdbcType=VARCHAR},
+      node_name = #{nodeName,jdbcType=VARCHAR},
+      map_flow_id = #{mapFlowId,jdbcType=INTEGER},
+      node_timeout = #{nodeTimeout,jdbcType=BIGINT},
+      is_virtual = #{isVirtual,jdbcType=CHAR},
+      plugin_urls = #{pluginUrls,jdbcType=VARCHAR},
+      priority = #{priority,jdbcType=CHAR},
+      failed_retry_interval = #{failedRetryInterval,jdbcType=BIGINT},
+      routing_strategy = #{routingStrategy,jdbcType=VARCHAR},
+      run_id = #{runId,jdbcType=VARCHAR},
+      run_param = #{runParam,jdbcType=VARCHAR},
+      run_source_desc = #{runSourceDesc,jdbcType=VARCHAR},
+      script_urls = #{scriptUrls,jdbcType=VARCHAR},
+      source_principal = #{sourcePrincipal,jdbcType=VARCHAR},
+      trigger_time = #{triggerTime,jdbcType=BIGINT},
+      trigger_status = #{triggerStatus,jdbcType=CHAR},
+      version_name = #{versionName,jdbcType=VARCHAR},
+      log_id = #{logId,jdbcType=INTEGER},
+      run_command = #{runCommand,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
 </mapper>
\ No newline at end of file

byit-myth-core/myth-admin-core/src/main/resources/mapper/NodeDependencyMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.byit.mapper.NodeDependencyMapper">
+  <resultMap id="BaseResultMap" type="com.byit.model.NodeDependencyKey">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    <id column="node_id" jdbcType="INTEGER" property="nodeId" />
+    <id column="dependency_id" jdbcType="INTEGER" property="dependencyId" />
+  </resultMap>
+  <delete id="deleteById" parameterType="com.byit.model.NodeDependencyKey">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    delete from node_dependency
+    where node_id = #{nodeId,jdbcType=INTEGER}
+      and dependency_id = #{dependencyId,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.byit.model.NodeDependencyKey">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    insert into node_dependency (node_id, dependency_id)
+    values (#{nodeId,jdbcType=INTEGER}, #{dependencyId,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" parameterType="com.byit.model.NodeDependencyKey">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    insert into node_dependency
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="nodeId != null">
+        node_id,
+      </if>
+      <if test="dependencyId != null">
+        dependency_id,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="nodeId != null">
+        #{nodeId,jdbcType=INTEGER},
+      </if>
+      <if test="dependencyId != null">
+        #{dependencyId,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+</mapper>
\ No newline at end of file

byit-myth-core/myth-admin-core/src/main/resources/mapper/JobFlowNodeMapper.xml → byit-myth-core/myth-admin-core/src/main/resources/mapper/NodeMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.byit.mapper.JobFlowNodeMapper">
-  <resultMap id="BaseResultMap" type="com.byit.model.JobFlowNode">
-    <!-- generated @mbg.generated date: 2019-12-24 -->
+<mapper namespace="com.byit.mapper.NodeMapper">
+  <resultMap id="BaseResultMap" type="com.byit.model.Node">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
     <id column="node_id" jdbcType="INTEGER" property="nodeId" />
-    <result column="alarm_email" jdbcType="VARCHAR" property="alarmEmail" />
     <result column="block_strategy" jdbcType="VARCHAR" property="blockStrategy" />
-    <result column="callback_token" jdbcType="VARCHAR" property="callbackToken" />
-    <result column="dependency_nodes" jdbcType="VARCHAR" property="dependencyNodes" />
+    <result column="plugin_token" jdbcType="VARCHAR" property="pluginToken" />
     <result column="failed_retry_count" jdbcType="INTEGER" property="failedRetryCount" />
     <result column="flow_id" jdbcType="INTEGER" property="flowId" />
-    <result column="follow_task_flow" jdbcType="CHAR" property="followTaskFlow" />
     <result column="gateway_token" jdbcType="VARCHAR" property="gatewayToken" />
     <result column="job_type" jdbcType="VARCHAR" property="jobType" />
-    <result column="local_node_handler_name" jdbcType="VARCHAR" property="localNodeHandlerName" />
-    <result column="mail_action" jdbcType="CHAR" property="mailAction" />
+    <result column="handler_name" jdbcType="VARCHAR" property="handlerName" />
     <result column="node_cron" jdbcType="VARCHAR" property="nodeCron" />
     <result column="node_desc" jdbcType="VARCHAR" property="nodeDesc" />
     <result column="node_name" jdbcType="VARCHAR" property="nodeName" />
-    <result column="node_of_flow_id" jdbcType="INTEGER" property="nodeOfFlowId" />
+    <result column="map_flow_id" jdbcType="INTEGER" property="mapFlowId" />
     <result column="node_timeout" jdbcType="BIGINT" property="nodeTimeout" />
-    <result column="node_type" jdbcType="VARCHAR" property="nodeType" />
+    <result column="is_virtual" jdbcType="CHAR" property="isVirtual" />
     <result column="plugin_urls" jdbcType="VARCHAR" property="pluginUrls" />
     <result column="priority" jdbcType="CHAR" property="priority" />
     <result column="remaining_count" jdbcType="INTEGER" property="remainingCount" />
     <result column="repeat_count" jdbcType="INTEGER" property="repeatCount" />
-    <result column="retry_interval" jdbcType="BIGINT" property="retryInterval" />
+    <result column="failed_retry_interval" jdbcType="BIGINT" property="failedRetryInterval" />
     <result column="routing_strategy" jdbcType="VARCHAR" property="routingStrategy" />
     <result column="run_param" jdbcType="VARCHAR" property="runParam" />
     <result column="run_source_desc" jdbcType="VARCHAR" property="runSourceDesc" />
@@ -35,83 +31,77 @@
     <result column="trigger_next_time" jdbcType="BIGINT" property="triggerNextTime" />
     <result column="author" jdbcType="VARCHAR" property="author" />
     <result column="add_time" jdbcType="TIMESTAMP" property="addTime" />
+    <result column="version_name" jdbcType="VARCHAR" property="versionName" />
+    <result column="on_fork" jdbcType="CHAR" property="onFork" />
+    <result column="run_command" jdbcType="VARCHAR" property="runCommand" />
   </resultMap>
-  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.byit.model.JobFlowNode">
-    <!-- generated @mbg.generated date: 2019-12-24 -->
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.byit.model.Node">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
     <result column="run_source" jdbcType="LONGVARCHAR" property="runSource" />
   </resultMap>
   <sql id="Base_Column_List">
-    <!-- generated @mbg.generated date: 2019-12-24 -->
-    node_id, alarm_email, block_strategy, callback_token, dependency_nodes, failed_retry_count, 
-    flow_id, follow_task_flow, gateway_token, job_type, local_node_handler_name, mail_action, 
-    node_cron, node_desc, node_name, node_of_flow_id, node_timeout, node_type, plugin_urls, 
-    priority, remaining_count, repeat_count, retry_interval, routing_strategy, run_param, 
-    run_source_desc, script_urls, source_principal, source_update_time, trigger_next_time, 
-    author, add_time
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    node_id, block_strategy, plugin_token, failed_retry_count, flow_id, gateway_token, 
+    job_type, handler_name, node_cron, node_desc, node_name, map_flow_id, node_timeout, 
+    is_virtual, plugin_urls, priority, remaining_count, repeat_count, failed_retry_interval, 
+    routing_strategy, run_param, run_source_desc, script_urls, source_principal, source_update_time, 
+    trigger_next_time, author, add_time, version_name, on_fork, run_command
   </sql>
   <sql id="Blob_Column_List">
-    <!-- generated @mbg.generated date: 2019-12-24 -->
+    <!-- generated @mbg.generated date: 2019-12-25 -->
     run_source
   </sql>
   <select id="getById" parameterType="java.lang.Integer" resultMap="ResultMapWithBLOBs">
-    <!-- generated @mbg.generated date: 2019-12-24 -->
+    <!-- generated @mbg.generated date: 2019-12-25 -->
     select 
     <include refid="Base_Column_List" />
     ,
     <include refid="Blob_Column_List" />
-    from job_flow_node_current
+    from node
     where node_id = #{nodeId,jdbcType=INTEGER}
   </select>
   <delete id="deleteById" parameterType="java.lang.Integer">
-    <!-- generated @mbg.generated date: 2019-12-24 -->
-    delete from job_flow_node_current
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    delete from node
     where node_id = #{nodeId,jdbcType=INTEGER}
   </delete>
-  <insert id="insert" parameterType="com.byit.model.JobFlowNode">
-    <!-- generated @mbg.generated date: 2019-12-24 -->
-    insert into job_flow_node_current (node_id, alarm_email, block_strategy, 
-      callback_token, dependency_nodes, failed_retry_count, 
-      flow_id, follow_task_flow, gateway_token, 
-      job_type, local_node_handler_name, mail_action, 
-      node_cron, node_desc, node_name, 
-      node_of_flow_id, node_timeout, node_type, 
-      plugin_urls, priority, remaining_count, 
-      repeat_count, retry_interval, routing_strategy, 
-      run_param, run_source_desc, script_urls, 
-      source_principal, source_update_time, trigger_next_time, 
-      author, add_time, run_source
-      )
-    values (#{nodeId,jdbcType=INTEGER}, #{alarmEmail,jdbcType=VARCHAR}, #{blockStrategy,jdbcType=VARCHAR}, 
-      #{callbackToken,jdbcType=VARCHAR}, #{dependencyNodes,jdbcType=VARCHAR}, #{failedRetryCount,jdbcType=INTEGER}, 
-      #{flowId,jdbcType=INTEGER}, #{followTaskFlow,jdbcType=CHAR}, #{gatewayToken,jdbcType=VARCHAR}, 
-      #{jobType,jdbcType=VARCHAR}, #{localNodeHandlerName,jdbcType=VARCHAR}, #{mailAction,jdbcType=CHAR}, 
-      #{nodeCron,jdbcType=VARCHAR}, #{nodeDesc,jdbcType=VARCHAR}, #{nodeName,jdbcType=VARCHAR}, 
-      #{nodeOfFlowId,jdbcType=INTEGER}, #{nodeTimeout,jdbcType=BIGINT}, #{nodeType,jdbcType=VARCHAR}, 
-      #{pluginUrls,jdbcType=VARCHAR}, #{priority,jdbcType=CHAR}, #{remainingCount,jdbcType=INTEGER}, 
-      #{repeatCount,jdbcType=INTEGER}, #{retryInterval,jdbcType=BIGINT}, #{routingStrategy,jdbcType=VARCHAR}, 
-      #{runParam,jdbcType=VARCHAR}, #{runSourceDesc,jdbcType=VARCHAR}, #{scriptUrls,jdbcType=VARCHAR}, 
-      #{sourcePrincipal,jdbcType=VARCHAR}, #{sourceUpdateTime,jdbcType=DATE}, #{triggerNextTime,jdbcType=BIGINT}, 
-      #{author,jdbcType=VARCHAR}, #{addTime,jdbcType=TIMESTAMP}, #{runSource,jdbcType=LONGVARCHAR}
-      )
+  <insert id="insert" parameterType="com.byit.model.Node">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    insert into node (node_id, block_strategy, plugin_token, 
+      failed_retry_count, flow_id, gateway_token, 
+      job_type, handler_name, node_cron, 
+      node_desc, node_name, map_flow_id, 
+      node_timeout, is_virtual, plugin_urls, 
+      priority, remaining_count, repeat_count, 
+      failed_retry_interval, routing_strategy, run_param, 
+      run_source_desc, script_urls, source_principal, 
+      source_update_time, trigger_next_time, author, 
+      add_time, version_name, on_fork, 
+      run_command, run_source)
+    values (#{nodeId,jdbcType=INTEGER}, #{blockStrategy,jdbcType=VARCHAR}, #{pluginToken,jdbcType=VARCHAR}, 
+      #{failedRetryCount,jdbcType=INTEGER}, #{flowId,jdbcType=INTEGER}, #{gatewayToken,jdbcType=VARCHAR}, 
+      #{jobType,jdbcType=VARCHAR}, #{handlerName,jdbcType=VARCHAR}, #{nodeCron,jdbcType=VARCHAR}, 
+      #{nodeDesc,jdbcType=VARCHAR}, #{nodeName,jdbcType=VARCHAR}, #{mapFlowId,jdbcType=INTEGER}, 
+      #{nodeTimeout,jdbcType=BIGINT}, #{isVirtual,jdbcType=CHAR}, #{pluginUrls,jdbcType=VARCHAR}, 
+      #{priority,jdbcType=CHAR}, #{remainingCount,jdbcType=INTEGER}, #{repeatCount,jdbcType=INTEGER}, 
+      #{failedRetryInterval,jdbcType=BIGINT}, #{routingStrategy,jdbcType=VARCHAR}, #{runParam,jdbcType=VARCHAR}, 
+      #{runSourceDesc,jdbcType=VARCHAR}, #{scriptUrls,jdbcType=VARCHAR}, #{sourcePrincipal,jdbcType=VARCHAR}, 
+      #{sourceUpdateTime,jdbcType=DATE}, #{triggerNextTime,jdbcType=BIGINT}, #{author,jdbcType=VARCHAR}, 
+      #{addTime,jdbcType=TIMESTAMP}, #{versionName,jdbcType=VARCHAR}, #{onFork,jdbcType=CHAR}, 
+      #{runCommand,jdbcType=VARCHAR}, #{runSource,jdbcType=LONGVARCHAR})
   </insert>
-  <insert id="insertSelective" parameterType="com.byit.model.JobFlowNode">
-    <!-- generated @mbg.generated date: 2019-12-24 -->
-    insert into job_flow_node_current
+  <insert id="insertSelective" parameterType="com.byit.model.Node">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    insert into node
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="nodeId != null">
         node_id,
       </if>
-      <if test="alarmEmail != null">
-        alarm_email,
-      </if>
       <if test="blockStrategy != null">
         block_strategy,
       </if>
-      <if test="callbackToken != null">
-        callback_token,
-      </if>
-      <if test="dependencyNodes != null">
-        dependency_nodes,
+      <if test="pluginToken != null">
+        plugin_token,
       </if>
       <if test="failedRetryCount != null">
         failed_retry_count,
@@ -119,20 +109,14 @@
       <if test="flowId != null">
         flow_id,
       </if>
-      <if test="followTaskFlow != null">
-        follow_task_flow,
-      </if>
       <if test="gatewayToken != null">
         gateway_token,
       </if>
       <if test="jobType != null">
         job_type,
       </if>
-      <if test="localNodeHandlerName != null">
-        local_node_handler_name,
-      </if>
-      <if test="mailAction != null">
-        mail_action,
+      <if test="handlerName != null">
+        handler_name,
       </if>
       <if test="nodeCron != null">
         node_cron,
@@ -143,14 +127,14 @@
       <if test="nodeName != null">
         node_name,
       </if>
-      <if test="nodeOfFlowId != null">
-        node_of_flow_id,
+      <if test="mapFlowId != null">
+        map_flow_id,
       </if>
       <if test="nodeTimeout != null">
         node_timeout,
       </if>
-      <if test="nodeType != null">
-        node_type,
+      <if test="isVirtual != null">
+        is_virtual,
       </if>
       <if test="pluginUrls != null">
         plugin_urls,
@@ -164,8 +148,8 @@
       <if test="repeatCount != null">
         repeat_count,
       </if>
-      <if test="retryInterval != null">
-        retry_interval,
+      <if test="failedRetryInterval != null">
+        failed_retry_interval,
       </if>
       <if test="routingStrategy != null">
         routing_strategy,
@@ -194,6 +178,15 @@
       <if test="addTime != null">
         add_time,
       </if>
+      <if test="versionName != null">
+        version_name,
+      </if>
+      <if test="onFork != null">
+        on_fork,
+      </if>
+      <if test="runCommand != null">
+        run_command,
+      </if>
       <if test="runSource != null">
         run_source,
       </if>
@@ -202,17 +195,11 @@
       <if test="nodeId != null">
         #{nodeId,jdbcType=INTEGER},
       </if>
-      <if test="alarmEmail != null">
-        #{alarmEmail,jdbcType=VARCHAR},
-      </if>
       <if test="blockStrategy != null">
         #{blockStrategy,jdbcType=VARCHAR},
       </if>
-      <if test="callbackToken != null">
-        #{callbackToken,jdbcType=VARCHAR},
-      </if>
-      <if test="dependencyNodes != null">
-        #{dependencyNodes,jdbcType=VARCHAR},
+      <if test="pluginToken != null">
+        #{pluginToken,jdbcType=VARCHAR},
       </if>
       <if test="failedRetryCount != null">
         #{failedRetryCount,jdbcType=INTEGER},
@@ -220,20 +207,14 @@
       <if test="flowId != null">
         #{flowId,jdbcType=INTEGER},
       </if>
-      <if test="followTaskFlow != null">
-        #{followTaskFlow,jdbcType=CHAR},
-      </if>
       <if test="gatewayToken != null">
         #{gatewayToken,jdbcType=VARCHAR},
       </if>
       <if test="jobType != null">
         #{jobType,jdbcType=VARCHAR},
       </if>
-      <if test="localNodeHandlerName != null">
-        #{localNodeHandlerName,jdbcType=VARCHAR},
-      </if>
-      <if test="mailAction != null">
-        #{mailAction,jdbcType=CHAR},
+      <if test="handlerName != null">
+        #{handlerName,jdbcType=VARCHAR},
       </if>
       <if test="nodeCron != null">
         #{nodeCron,jdbcType=VARCHAR},
@@ -244,14 +225,14 @@
       <if test="nodeName != null">
         #{nodeName,jdbcType=VARCHAR},
       </if>
-      <if test="nodeOfFlowId != null">
-        #{nodeOfFlowId,jdbcType=INTEGER},
+      <if test="mapFlowId != null">
+        #{mapFlowId,jdbcType=INTEGER},
       </if>
       <if test="nodeTimeout != null">
         #{nodeTimeout,jdbcType=BIGINT},
       </if>
-      <if test="nodeType != null">
-        #{nodeType,jdbcType=VARCHAR},
+      <if test="isVirtual != null">
+        #{isVirtual,jdbcType=CHAR},
       </if>
       <if test="pluginUrls != null">
         #{pluginUrls,jdbcType=VARCHAR},
@@ -265,8 +246,8 @@
       <if test="repeatCount != null">
         #{repeatCount,jdbcType=INTEGER},
       </if>
-      <if test="retryInterval != null">
-        #{retryInterval,jdbcType=BIGINT},
+      <if test="failedRetryInterval != null">
+        #{failedRetryInterval,jdbcType=BIGINT},
       </if>
       <if test="routingStrategy != null">
         #{routingStrategy,jdbcType=VARCHAR},
@@ -295,26 +276,29 @@
       <if test="addTime != null">
         #{addTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="versionName != null">
+        #{versionName,jdbcType=VARCHAR},
+      </if>
+      <if test="onFork != null">
+        #{onFork,jdbcType=CHAR},
+      </if>
+      <if test="runCommand != null">
+        #{runCommand,jdbcType=VARCHAR},
+      </if>
       <if test="runSource != null">
         #{runSource,jdbcType=LONGVARCHAR},
       </if>
     </trim>
   </insert>
-  <update id="updateByIdSelective" parameterType="com.byit.model.JobFlowNode">
-    <!-- generated @mbg.generated date: 2019-12-24 -->
-    update job_flow_node_current
+  <update id="updateByIdSelective" parameterType="com.byit.model.Node">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    update node
     <set>
-      <if test="alarmEmail != null">
-        alarm_email = #{alarmEmail,jdbcType=VARCHAR},
-      </if>
       <if test="blockStrategy != null">
         block_strategy = #{blockStrategy,jdbcType=VARCHAR},
       </if>
-      <if test="callbackToken != null">
-        callback_token = #{callbackToken,jdbcType=VARCHAR},
-      </if>
-      <if test="dependencyNodes != null">
-        dependency_nodes = #{dependencyNodes,jdbcType=VARCHAR},
+      <if test="pluginToken != null">
+        plugin_token = #{pluginToken,jdbcType=VARCHAR},
       </if>
       <if test="failedRetryCount != null">
         failed_retry_count = #{failedRetryCount,jdbcType=INTEGER},
@@ -322,20 +306,14 @@
       <if test="flowId != null">
         flow_id = #{flowId,jdbcType=INTEGER},
       </if>
-      <if test="followTaskFlow != null">
-        follow_task_flow = #{followTaskFlow,jdbcType=CHAR},
-      </if>
       <if test="gatewayToken != null">
         gateway_token = #{gatewayToken,jdbcType=VARCHAR},
       </if>
       <if test="jobType != null">
         job_type = #{jobType,jdbcType=VARCHAR},
       </if>
-      <if test="localNodeHandlerName != null">
-        local_node_handler_name = #{localNodeHandlerName,jdbcType=VARCHAR},
-      </if>
-      <if test="mailAction != null">
-        mail_action = #{mailAction,jdbcType=CHAR},
+      <if test="handlerName != null">
+        handler_name = #{handlerName,jdbcType=VARCHAR},
       </if>
       <if test="nodeCron != null">
         node_cron = #{nodeCron,jdbcType=VARCHAR},
@@ -346,14 +324,14 @@
       <if test="nodeName != null">
         node_name = #{nodeName,jdbcType=VARCHAR},
       </if>
-      <if test="nodeOfFlowId != null">
-        node_of_flow_id = #{nodeOfFlowId,jdbcType=INTEGER},
+      <if test="mapFlowId != null">
+        map_flow_id = #{mapFlowId,jdbcType=INTEGER},
       </if>
       <if test="nodeTimeout != null">
         node_timeout = #{nodeTimeout,jdbcType=BIGINT},
       </if>
-      <if test="nodeType != null">
-        node_type = #{nodeType,jdbcType=VARCHAR},
+      <if test="isVirtual != null">
+        is_virtual = #{isVirtual,jdbcType=CHAR},
       </if>
       <if test="pluginUrls != null">
         plugin_urls = #{pluginUrls,jdbcType=VARCHAR},
@@ -367,8 +345,8 @@
       <if test="repeatCount != null">
         repeat_count = #{repeatCount,jdbcType=INTEGER},
       </if>
-      <if test="retryInterval != null">
-        retry_interval = #{retryInterval,jdbcType=BIGINT},
+      <if test="failedRetryInterval != null">
+        failed_retry_interval = #{failedRetryInterval,jdbcType=BIGINT},
       </if>
       <if test="routingStrategy != null">
         routing_strategy = #{routingStrategy,jdbcType=VARCHAR},
@@ -397,37 +375,42 @@
       <if test="addTime != null">
         add_time = #{addTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="versionName != null">
+        version_name = #{versionName,jdbcType=VARCHAR},
+      </if>
+      <if test="onFork != null">
+        on_fork = #{onFork,jdbcType=CHAR},
+      </if>
+      <if test="runCommand != null">
+        run_command = #{runCommand,jdbcType=VARCHAR},
+      </if>
       <if test="runSource != null">
         run_source = #{runSource,jdbcType=LONGVARCHAR},
       </if>
     </set>
     where node_id = #{nodeId,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.byit.model.JobFlowNode">
-    <!-- generated @mbg.generated date: 2019-12-24 -->
-    update job_flow_node_current
-    set alarm_email = #{alarmEmail,jdbcType=VARCHAR},
-      block_strategy = #{blockStrategy,jdbcType=VARCHAR},
-      callback_token = #{callbackToken,jdbcType=VARCHAR},
-      dependency_nodes = #{dependencyNodes,jdbcType=VARCHAR},
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.byit.model.Node">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    update node
+    set block_strategy = #{blockStrategy,jdbcType=VARCHAR},
+      plugin_token = #{pluginToken,jdbcType=VARCHAR},
       failed_retry_count = #{failedRetryCount,jdbcType=INTEGER},
       flow_id = #{flowId,jdbcType=INTEGER},
-      follow_task_flow = #{followTaskFlow,jdbcType=CHAR},
       gateway_token = #{gatewayToken,jdbcType=VARCHAR},
       job_type = #{jobType,jdbcType=VARCHAR},
-      local_node_handler_name = #{localNodeHandlerName,jdbcType=VARCHAR},
-      mail_action = #{mailAction,jdbcType=CHAR},
+      handler_name = #{handlerName,jdbcType=VARCHAR},
       node_cron = #{nodeCron,jdbcType=VARCHAR},
       node_desc = #{nodeDesc,jdbcType=VARCHAR},
       node_name = #{nodeName,jdbcType=VARCHAR},
-      node_of_flow_id = #{nodeOfFlowId,jdbcType=INTEGER},
+      map_flow_id = #{mapFlowId,jdbcType=INTEGER},
       node_timeout = #{nodeTimeout,jdbcType=BIGINT},
-      node_type = #{nodeType,jdbcType=VARCHAR},
+      is_virtual = #{isVirtual,jdbcType=CHAR},
       plugin_urls = #{pluginUrls,jdbcType=VARCHAR},
       priority = #{priority,jdbcType=CHAR},
       remaining_count = #{remainingCount,jdbcType=INTEGER},
       repeat_count = #{repeatCount,jdbcType=INTEGER},
-      retry_interval = #{retryInterval,jdbcType=BIGINT},
+      failed_retry_interval = #{failedRetryInterval,jdbcType=BIGINT},
       routing_strategy = #{routingStrategy,jdbcType=VARCHAR},
       run_param = #{runParam,jdbcType=VARCHAR},
       run_source_desc = #{runSourceDesc,jdbcType=VARCHAR},
@@ -437,34 +420,33 @@
       trigger_next_time = #{triggerNextTime,jdbcType=BIGINT},
       author = #{author,jdbcType=VARCHAR},
       add_time = #{addTime,jdbcType=TIMESTAMP},
+      version_name = #{versionName,jdbcType=VARCHAR},
+      on_fork = #{onFork,jdbcType=CHAR},
+      run_command = #{runCommand,jdbcType=VARCHAR},
       run_source = #{runSource,jdbcType=LONGVARCHAR}
     where node_id = #{nodeId,jdbcType=INTEGER}
   </update>
-  <update id="updateById" parameterType="com.byit.model.JobFlowNode">
-    <!-- generated @mbg.generated date: 2019-12-24 -->
-    update job_flow_node_current
-    set alarm_email = #{alarmEmail,jdbcType=VARCHAR},
-      block_strategy = #{blockStrategy,jdbcType=VARCHAR},
-      callback_token = #{callbackToken,jdbcType=VARCHAR},
-      dependency_nodes = #{dependencyNodes,jdbcType=VARCHAR},
+  <update id="updateById" parameterType="com.byit.model.Node">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    update node
+    set block_strategy = #{blockStrategy,jdbcType=VARCHAR},
+      plugin_token = #{pluginToken,jdbcType=VARCHAR},
       failed_retry_count = #{failedRetryCount,jdbcType=INTEGER},
       flow_id = #{flowId,jdbcType=INTEGER},
-      follow_task_flow = #{followTaskFlow,jdbcType=CHAR},
       gateway_token = #{gatewayToken,jdbcType=VARCHAR},
       job_type = #{jobType,jdbcType=VARCHAR},
-      local_node_handler_name = #{localNodeHandlerName,jdbcType=VARCHAR},
-      mail_action = #{mailAction,jdbcType=CHAR},
+      handler_name = #{handlerName,jdbcType=VARCHAR},
       node_cron = #{nodeCron,jdbcType=VARCHAR},
       node_desc = #{nodeDesc,jdbcType=VARCHAR},
       node_name = #{nodeName,jdbcType=VARCHAR},
-      node_of_flow_id = #{nodeOfFlowId,jdbcType=INTEGER},
+      map_flow_id = #{mapFlowId,jdbcType=INTEGER},
       node_timeout = #{nodeTimeout,jdbcType=BIGINT},
-      node_type = #{nodeType,jdbcType=VARCHAR},
+      is_virtual = #{isVirtual,jdbcType=CHAR},
       plugin_urls = #{pluginUrls,jdbcType=VARCHAR},
       priority = #{priority,jdbcType=CHAR},
       remaining_count = #{remainingCount,jdbcType=INTEGER},
       repeat_count = #{repeatCount,jdbcType=INTEGER},
-      retry_interval = #{retryInterval,jdbcType=BIGINT},
+      failed_retry_interval = #{failedRetryInterval,jdbcType=BIGINT},
       routing_strategy = #{routingStrategy,jdbcType=VARCHAR},
       run_param = #{runParam,jdbcType=VARCHAR},
       run_source_desc = #{runSourceDesc,jdbcType=VARCHAR},
@@ -473,7 +455,10 @@
       source_update_time = #{sourceUpdateTime,jdbcType=DATE},
       trigger_next_time = #{triggerNextTime,jdbcType=BIGINT},
       author = #{author,jdbcType=VARCHAR},
-      add_time = #{addTime,jdbcType=TIMESTAMP}
+      add_time = #{addTime,jdbcType=TIMESTAMP},
+      version_name = #{versionName,jdbcType=VARCHAR},
+      on_fork = #{onFork,jdbcType=CHAR},
+      run_command = #{runCommand,jdbcType=VARCHAR}
     where node_id = #{nodeId,jdbcType=INTEGER}
   </update>
 </mapper>
\ No newline at end of file

byit-myth-core/myth-admin-core/src/main/resources/mapper/NodeVersionDependencyMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.byit.mapper.NodeVersionDependencyMapper">
+  <resultMap id="BaseResultMap" type="com.byit.model.NodeVersionDependencyKey">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    <id column="node_version_id" jdbcType="INTEGER" property="nodeVersionId" />
+    <id column="dependency_id" jdbcType="INTEGER" property="dependencyId" />
+  </resultMap>
+  <delete id="deleteById" parameterType="com.byit.model.NodeVersionDependencyKey">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    delete from node_version_dependency
+    where node_version_id = #{nodeVersionId,jdbcType=INTEGER}
+      and dependency_id = #{dependencyId,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.byit.model.NodeVersionDependencyKey">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    insert into node_version_dependency (node_version_id, dependency_id)
+    values (#{nodeVersionId,jdbcType=INTEGER}, #{dependencyId,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" parameterType="com.byit.model.NodeVersionDependencyKey">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    insert into node_version_dependency
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="nodeVersionId != null">
+        node_version_id,
+      </if>
+      <if test="dependencyId != null">
+        dependency_id,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="nodeVersionId != null">
+        #{nodeVersionId,jdbcType=INTEGER},
+      </if>
+      <if test="dependencyId != null">
+        #{dependencyId,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+</mapper>
\ No newline at end of file

byit-myth-core/myth-admin-core/src/main/resources/mapper/JobFlowNodeVersionMapper.xml → byit-myth-core/myth-admin-core/src/main/resources/mapper/NodeVersionMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.byit.mapper.jobFlowNodeVersionMapper">
-  <resultMap id="BaseResultMap" type="com.byit.model.jobFlowNodeVersion">
-    <!-- generated @mbg.generated date: 2019-12-24 -->
+<mapper namespace="com.byit.mapper.NodeVersionMapper">
+  <resultMap id="BaseResultMap" type="com.byit.model.NodeVersion">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
     <id column="node_version_id" jdbcType="INTEGER" property="nodeVersionId" />
     <result column="node_id" jdbcType="INTEGER" property="nodeId" />
-    <result column="alarm_email" jdbcType="VARCHAR" property="alarmEmail" />
     <result column="block_strategy" jdbcType="VARCHAR" property="blockStrategy" />
-    <result column="callback_token" jdbcType="VARCHAR" property="callbackToken" />
-    <result column="dependency_nodes" jdbcType="VARCHAR" property="dependencyNodes" />
+    <result column="pugin_token" jdbcType="VARCHAR" property="puginToken" />
     <result column="failed_retry_count" jdbcType="INTEGER" property="failedRetryCount" />
     <result column="flow_id" jdbcType="INTEGER" property="flowId" />
     <result column="flow_version_id" jdbcType="INTEGER" property="flowVersionId" />
-    <result column="follow_task_flow" jdbcType="CHAR" property="followTaskFlow" />
     <result column="gateway_token" jdbcType="VARCHAR" property="gatewayToken" />
     <result column="job_type" jdbcType="VARCHAR" property="jobType" />
-    <result column="local_node_handler_name" jdbcType="VARCHAR" property="localNodeHandlerName" />
-    <result column="mail_action" jdbcType="CHAR" property="mailAction" />
+    <result column="handler_name" jdbcType="VARCHAR" property="handlerName" />
     <result column="node_cron" jdbcType="VARCHAR" property="nodeCron" />
     <result column="node_desc" jdbcType="VARCHAR" property="nodeDesc" />
     <result column="node_name" jdbcType="VARCHAR" property="nodeName" />
-    <result column="node_of_flow_id" jdbcType="INTEGER" property="nodeOfFlowId" />
+    <result column="map_flow_id" jdbcType="INTEGER" property="mapFlowId" />
     <result column="node_timeout" jdbcType="BIGINT" property="nodeTimeout" />
-    <result column="node_type" jdbcType="VARCHAR" property="nodeType" />
+    <result column="is_virtual" jdbcType="VARCHAR" property="isVirtual" />
     <result column="plugin_urls" jdbcType="VARCHAR" property="pluginUrls" />
     <result column="priority" jdbcType="CHAR" property="priority" />
     <result column="remove_mark" jdbcType="CHAR" property="removeMark" />
     <result column="repeat_count" jdbcType="INTEGER" property="repeatCount" />
-    <result column="retry_interval" jdbcType="BIGINT" property="retryInterval" />
+    <result column="failed_retry_interval" jdbcType="BIGINT" property="failedRetryInterval" />
     <result column="routing_strategy" jdbcType="VARCHAR" property="routingStrategy" />
     <result column="run_param" jdbcType="VARCHAR" property="runParam" />
     <result column="run_source_desc" jdbcType="VARCHAR" property="runSourceDesc" />
     <result column="script_urls" jdbcType="VARCHAR" property="scriptUrls" />
     <result column="source_principal" jdbcType="VARCHAR" property="sourcePrincipal" />
-    <result column="source_update_time" jdbcType="DATE" property="sourceUpdateTime" />
-    <result column="trigger_next_time" jdbcType="BIGINT" property="triggerNextTime" />
-    <result column="version_mark" jdbcType="CHAR" property="versionMark" />
+    <result column="source_update_time" jdbcType="TIMESTAMP" property="sourceUpdateTime" />
+    <result column="version_mark" jdbcType="VARCHAR" property="versionMark" />
     <result column="author" jdbcType="VARCHAR" property="author" />
     <result column="add_time" jdbcType="TIMESTAMP" property="addTime" />
+    <result column="version_name" jdbcType="VARCHAR" property="versionName" />
+    <result column="on_fork" jdbcType="CHAR" property="onFork" />
+    <result column="run_command" jdbcType="VARCHAR" property="runCommand" />
   </resultMap>
-  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.byit.model.jobFlowNodeVersion">
-    <!-- generated @mbg.generated date: 2019-12-24 -->
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.byit.model.NodeVersion">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
     <result column="run_source" jdbcType="LONGVARCHAR" property="runSource" />
   </resultMap>
   <sql id="Base_Column_List">
-    <!-- generated @mbg.generated date: 2019-12-24 -->
-    node_version_id, node_id, alarm_email, block_strategy, callback_token, dependency_nodes, 
-    failed_retry_count, flow_id, flow_version_id, follow_task_flow, gateway_token, job_type, 
-    local_node_handler_name, mail_action, node_cron, node_desc, node_name, node_of_flow_id, 
-    node_timeout, node_type, plugin_urls, priority, remove_mark, repeat_count, retry_interval, 
-    routing_strategy, run_param, run_source_desc, script_urls, source_principal, source_update_time, 
-    trigger_next_time, version_mark, author, add_time
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    node_version_id, node_id, block_strategy, pugin_token, failed_retry_count, flow_id, 
+    flow_version_id, gateway_token, job_type, handler_name, node_cron, node_desc, node_name, 
+    map_flow_id, node_timeout, is_virtual, plugin_urls, priority, remove_mark, repeat_count, 
+    failed_retry_interval, routing_strategy, run_param, run_source_desc, script_urls, 
+    source_principal, source_update_time, version_mark, author, add_time, version_name, 
+    on_fork, run_command
   </sql>
   <sql id="Blob_Column_List">
-    <!-- generated @mbg.generated date: 2019-12-24 -->
+    <!-- generated @mbg.generated date: 2019-12-25 -->
     run_source
   </sql>
   <select id="getById" parameterType="java.lang.Integer" resultMap="ResultMapWithBLOBs">
-    <!-- generated @mbg.generated date: 2019-12-24 -->
+    <!-- generated @mbg.generated date: 2019-12-25 -->
     select 
     <include refid="Base_Column_List" />
     ,
     <include refid="Blob_Column_List" />
-    from job_flow_node_version
+    from node_version
     where node_version_id = #{nodeVersionId,jdbcType=INTEGER}
   </select>
   <delete id="deleteById" parameterType="java.lang.Integer">
-    <!-- generated @mbg.generated date: 2019-12-24 -->
-    delete from job_flow_node_version
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    delete from node_version
     where node_version_id = #{nodeVersionId,jdbcType=INTEGER}
   </delete>
-  <insert id="insert" parameterType="com.byit.model.jobFlowNodeVersion">
-    <!-- generated @mbg.generated date: 2019-12-24 -->
-    insert into job_flow_node_version (node_version_id, node_id, alarm_email, 
-      block_strategy, callback_token, dependency_nodes, 
-      failed_retry_count, flow_id, flow_version_id, 
-      follow_task_flow, gateway_token, job_type, 
-      local_node_handler_name, mail_action, node_cron, 
-      node_desc, node_name, node_of_flow_id, 
-      node_timeout, node_type, plugin_urls, 
-      priority, remove_mark, repeat_count, 
-      retry_interval, routing_strategy, run_param, 
-      run_source_desc, script_urls, source_principal, 
-      source_update_time, trigger_next_time, version_mark, 
-      author, add_time, run_source
-      )
-    values (#{nodeVersionId,jdbcType=INTEGER}, #{nodeId,jdbcType=INTEGER}, #{alarmEmail,jdbcType=VARCHAR}, 
-      #{blockStrategy,jdbcType=VARCHAR}, #{callbackToken,jdbcType=VARCHAR}, #{dependencyNodes,jdbcType=VARCHAR}, 
-      #{failedRetryCount,jdbcType=INTEGER}, #{flowId,jdbcType=INTEGER}, #{flowVersionId,jdbcType=INTEGER}, 
-      #{followTaskFlow,jdbcType=CHAR}, #{gatewayToken,jdbcType=VARCHAR}, #{jobType,jdbcType=VARCHAR}, 
-      #{localNodeHandlerName,jdbcType=VARCHAR}, #{mailAction,jdbcType=CHAR}, #{nodeCron,jdbcType=VARCHAR}, 
-      #{nodeDesc,jdbcType=VARCHAR}, #{nodeName,jdbcType=VARCHAR}, #{nodeOfFlowId,jdbcType=INTEGER}, 
-      #{nodeTimeout,jdbcType=BIGINT}, #{nodeType,jdbcType=VARCHAR}, #{pluginUrls,jdbcType=VARCHAR}, 
-      #{priority,jdbcType=CHAR}, #{removeMark,jdbcType=CHAR}, #{repeatCount,jdbcType=INTEGER}, 
-      #{retryInterval,jdbcType=BIGINT}, #{routingStrategy,jdbcType=VARCHAR}, #{runParam,jdbcType=VARCHAR}, 
-      #{runSourceDesc,jdbcType=VARCHAR}, #{scriptUrls,jdbcType=VARCHAR}, #{sourcePrincipal,jdbcType=VARCHAR}, 
-      #{sourceUpdateTime,jdbcType=DATE}, #{triggerNextTime,jdbcType=BIGINT}, #{versionMark,jdbcType=CHAR}, 
-      #{author,jdbcType=VARCHAR}, #{addTime,jdbcType=TIMESTAMP}, #{runSource,jdbcType=LONGVARCHAR}
-      )
+  <insert id="insert" parameterType="com.byit.model.NodeVersion">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    insert into node_version (node_version_id, node_id, block_strategy, 
+      pugin_token, failed_retry_count, flow_id, 
+      flow_version_id, gateway_token, job_type, 
+      handler_name, node_cron, node_desc, 
+      node_name, map_flow_id, node_timeout, 
+      is_virtual, plugin_urls, priority, 
+      remove_mark, repeat_count, failed_retry_interval, 
+      routing_strategy, run_param, run_source_desc, 
+      script_urls, source_principal, source_update_time, 
+      version_mark, author, add_time, 
+      version_name, on_fork, run_command, 
+      run_source)
+    values (#{nodeVersionId,jdbcType=INTEGER}, #{nodeId,jdbcType=INTEGER}, #{blockStrategy,jdbcType=VARCHAR}, 
+      #{puginToken,jdbcType=VARCHAR}, #{failedRetryCount,jdbcType=INTEGER}, #{flowId,jdbcType=INTEGER}, 
+      #{flowVersionId,jdbcType=INTEGER}, #{gatewayToken,jdbcType=VARCHAR}, #{jobType,jdbcType=VARCHAR}, 
+      #{handlerName,jdbcType=VARCHAR}, #{nodeCron,jdbcType=VARCHAR}, #{nodeDesc,jdbcType=VARCHAR}, 
+      #{nodeName,jdbcType=VARCHAR}, #{mapFlowId,jdbcType=INTEGER}, #{nodeTimeout,jdbcType=BIGINT}, 
+      #{isVirtual,jdbcType=VARCHAR}, #{pluginUrls,jdbcType=VARCHAR}, #{priority,jdbcType=CHAR}, 
+      #{removeMark,jdbcType=CHAR}, #{repeatCount,jdbcType=INTEGER}, #{failedRetryInterval,jdbcType=BIGINT}, 
+      #{routingStrategy,jdbcType=VARCHAR}, #{runParam,jdbcType=VARCHAR}, #{runSourceDesc,jdbcType=VARCHAR}, 
+      #{scriptUrls,jdbcType=VARCHAR}, #{sourcePrincipal,jdbcType=VARCHAR}, #{sourceUpdateTime,jdbcType=TIMESTAMP}, 
+      #{versionMark,jdbcType=VARCHAR}, #{author,jdbcType=VARCHAR}, #{addTime,jdbcType=TIMESTAMP}, 
+      #{versionName,jdbcType=VARCHAR}, #{onFork,jdbcType=CHAR}, #{runCommand,jdbcType=VARCHAR}, 
+      #{runSource,jdbcType=LONGVARCHAR})
   </insert>
-  <insert id="insertSelective" parameterType="com.byit.model.jobFlowNodeVersion">
-    <!-- generated @mbg.generated date: 2019-12-24 -->
-    insert into job_flow_node_version
+  <insert id="insertSelective" parameterType="com.byit.model.NodeVersion">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    insert into node_version
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="nodeVersionId != null">
         node_version_id,
@@ -109,17 +105,11 @@
       <if test="nodeId != null">
         node_id,
       </if>
-      <if test="alarmEmail != null">
-        alarm_email,
-      </if>
       <if test="blockStrategy != null">
         block_strategy,
       </if>
-      <if test="callbackToken != null">
-        callback_token,
-      </if>
-      <if test="dependencyNodes != null">
-        dependency_nodes,
+      <if test="puginToken != null">
+        pugin_token,
       </if>
       <if test="failedRetryCount != null">
         failed_retry_count,
@@ -130,20 +120,14 @@
       <if test="flowVersionId != null">
         flow_version_id,
       </if>
-      <if test="followTaskFlow != null">
-        follow_task_flow,
-      </if>
       <if test="gatewayToken != null">
         gateway_token,
       </if>
       <if test="jobType != null">
         job_type,
       </if>
-      <if test="localNodeHandlerName != null">
-        local_node_handler_name,
-      </if>
-      <if test="mailAction != null">
-        mail_action,
+      <if test="handlerName != null">
+        handler_name,
       </if>
       <if test="nodeCron != null">
         node_cron,
@@ -154,14 +138,14 @@
       <if test="nodeName != null">
         node_name,
       </if>
-      <if test="nodeOfFlowId != null">
-        node_of_flow_id,
+      <if test="mapFlowId != null">
+        map_flow_id,
       </if>
       <if test="nodeTimeout != null">
         node_timeout,
       </if>
-      <if test="nodeType != null">
-        node_type,
+      <if test="isVirtual != null">
+        is_virtual,
       </if>
       <if test="pluginUrls != null">
         plugin_urls,
@@ -175,8 +159,8 @@
       <if test="repeatCount != null">
         repeat_count,
       </if>
-      <if test="retryInterval != null">
-        retry_interval,
+      <if test="failedRetryInterval != null">
+        failed_retry_interval,
       </if>
       <if test="routingStrategy != null">
         routing_strategy,
@@ -196,9 +180,6 @@
       <if test="sourceUpdateTime != null">
         source_update_time,
       </if>
-      <if test="triggerNextTime != null">
-        trigger_next_time,
-      </if>
       <if test="versionMark != null">
         version_mark,
       </if>
@@ -208,6 +189,15 @@
       <if test="addTime != null">
         add_time,
       </if>
+      <if test="versionName != null">
+        version_name,
+      </if>
+      <if test="onFork != null">
+        on_fork,
+      </if>
+      <if test="runCommand != null">
+        run_command,
+      </if>
       <if test="runSource != null">
         run_source,
       </if>
@@ -219,17 +209,11 @@
       <if test="nodeId != null">
         #{nodeId,jdbcType=INTEGER},
       </if>
-      <if test="alarmEmail != null">
-        #{alarmEmail,jdbcType=VARCHAR},
-      </if>
       <if test="blockStrategy != null">
         #{blockStrategy,jdbcType=VARCHAR},
       </if>
-      <if test="callbackToken != null">
-        #{callbackToken,jdbcType=VARCHAR},
-      </if>
-      <if test="dependencyNodes != null">
-        #{dependencyNodes,jdbcType=VARCHAR},
+      <if test="puginToken != null">
+        #{puginToken,jdbcType=VARCHAR},
       </if>
       <if test="failedRetryCount != null">
         #{failedRetryCount,jdbcType=INTEGER},
@@ -240,20 +224,14 @@
       <if test="flowVersionId != null">
         #{flowVersionId,jdbcType=INTEGER},
       </if>
-      <if test="followTaskFlow != null">
-        #{followTaskFlow,jdbcType=CHAR},
-      </if>
       <if test="gatewayToken != null">
         #{gatewayToken,jdbcType=VARCHAR},
       </if>
       <if test="jobType != null">
         #{jobType,jdbcType=VARCHAR},
       </if>
-      <if test="localNodeHandlerName != null">
-        #{localNodeHandlerName,jdbcType=VARCHAR},
-      </if>
-      <if test="mailAction != null">
-        #{mailAction,jdbcType=CHAR},
+      <if test="handlerName != null">
+        #{handlerName,jdbcType=VARCHAR},
       </if>
       <if test="nodeCron != null">
         #{nodeCron,jdbcType=VARCHAR},
@@ -264,14 +242,14 @@
       <if test="nodeName != null">
         #{nodeName,jdbcType=VARCHAR},
       </if>
-      <if test="nodeOfFlowId != null">
-        #{nodeOfFlowId,jdbcType=INTEGER},
+      <if test="mapFlowId != null">
+        #{mapFlowId,jdbcType=INTEGER},
       </if>
       <if test="nodeTimeout != null">
         #{nodeTimeout,jdbcType=BIGINT},
       </if>
-      <if test="nodeType != null">
-        #{nodeType,jdbcType=VARCHAR},
+      <if test="isVirtual != null">
+        #{isVirtual,jdbcType=VARCHAR},
       </if>
       <if test="pluginUrls != null">
         #{pluginUrls,jdbcType=VARCHAR},
@@ -285,8 +263,8 @@
       <if test="repeatCount != null">
         #{repeatCount,jdbcType=INTEGER},
       </if>
-      <if test="retryInterval != null">
-        #{retryInterval,jdbcType=BIGINT},
+      <if test="failedRetryInterval != null">
+        #{failedRetryInterval,jdbcType=BIGINT},
       </if>
       <if test="routingStrategy != null">
         #{routingStrategy,jdbcType=VARCHAR},
@@ -304,13 +282,10 @@
         #{sourcePrincipal,jdbcType=VARCHAR},
       </if>
       <if test="sourceUpdateTime != null">
-        #{sourceUpdateTime,jdbcType=DATE},
-      </if>
-      <if test="triggerNextTime != null">
-        #{triggerNextTime,jdbcType=BIGINT},
+        #{sourceUpdateTime,jdbcType=TIMESTAMP},
       </if>
       <if test="versionMark != null">
-        #{versionMark,jdbcType=CHAR},
+        #{versionMark,jdbcType=VARCHAR},
       </if>
       <if test="author != null">
         #{author,jdbcType=VARCHAR},
@@ -318,29 +293,32 @@
       <if test="addTime != null">
         #{addTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="versionName != null">
+        #{versionName,jdbcType=VARCHAR},
+      </if>
+      <if test="onFork != null">
+        #{onFork,jdbcType=CHAR},
+      </if>
+      <if test="runCommand != null">
+        #{runCommand,jdbcType=VARCHAR},
+      </if>
       <if test="runSource != null">
         #{runSource,jdbcType=LONGVARCHAR},
       </if>
     </trim>
   </insert>
-  <update id="updateByIdSelective" parameterType="com.byit.model.jobFlowNodeVersion">
-    <!-- generated @mbg.generated date: 2019-12-24 -->
-    update job_flow_node_version
+  <update id="updateByIdSelective" parameterType="com.byit.model.NodeVersion">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    update node_version
     <set>
       <if test="nodeId != null">
         node_id = #{nodeId,jdbcType=INTEGER},
       </if>
-      <if test="alarmEmail != null">
-        alarm_email = #{alarmEmail,jdbcType=VARCHAR},
-      </if>
       <if test="blockStrategy != null">
         block_strategy = #{blockStrategy,jdbcType=VARCHAR},
       </if>
-      <if test="callbackToken != null">
-        callback_token = #{callbackToken,jdbcType=VARCHAR},
-      </if>
-      <if test="dependencyNodes != null">
-        dependency_nodes = #{dependencyNodes,jdbcType=VARCHAR},
+      <if test="puginToken != null">
+        pugin_token = #{puginToken,jdbcType=VARCHAR},
       </if>
       <if test="failedRetryCount != null">
         failed_retry_count = #{failedRetryCount,jdbcType=INTEGER},
@@ -351,20 +329,14 @@
       <if test="flowVersionId != null">
         flow_version_id = #{flowVersionId,jdbcType=INTEGER},
       </if>
-      <if test="followTaskFlow != null">
-        follow_task_flow = #{followTaskFlow,jdbcType=CHAR},
-      </if>
       <if test="gatewayToken != null">
         gateway_token = #{gatewayToken,jdbcType=VARCHAR},
       </if>
       <if test="jobType != null">
         job_type = #{jobType,jdbcType=VARCHAR},
       </if>
-      <if test="localNodeHandlerName != null">
-        local_node_handler_name = #{localNodeHandlerName,jdbcType=VARCHAR},
-      </if>
-      <if test="mailAction != null">
-        mail_action = #{mailAction,jdbcType=CHAR},
+      <if test="handlerName != null">
+        handler_name = #{handlerName,jdbcType=VARCHAR},
       </if>
       <if test="nodeCron != null">
         node_cron = #{nodeCron,jdbcType=VARCHAR},
@@ -375,14 +347,14 @@
       <if test="nodeName != null">
         node_name = #{nodeName,jdbcType=VARCHAR},
       </if>
-      <if test="nodeOfFlowId != null">
-        node_of_flow_id = #{nodeOfFlowId,jdbcType=INTEGER},
+      <if test="mapFlowId != null">
+        map_flow_id = #{mapFlowId,jdbcType=INTEGER},
       </if>
       <if test="nodeTimeout != null">
         node_timeout = #{nodeTimeout,jdbcType=BIGINT},
       </if>
-      <if test="nodeType != null">
-        node_type = #{nodeType,jdbcType=VARCHAR},
+      <if test="isVirtual != null">
+        is_virtual = #{isVirtual,jdbcType=VARCHAR},
       </if>
       <if test="pluginUrls != null">
         plugin_urls = #{pluginUrls,jdbcType=VARCHAR},
@@ -396,8 +368,8 @@
       <if test="repeatCount != null">
         repeat_count = #{repeatCount,jdbcType=INTEGER},
       </if>
-      <if test="retryInterval != null">
-        retry_interval = #{retryInterval,jdbcType=BIGINT},
+      <if test="failedRetryInterval != null">
+        failed_retry_interval = #{failedRetryInterval,jdbcType=BIGINT},
       </if>
       <if test="routingStrategy != null">
         routing_strategy = #{routingStrategy,jdbcType=VARCHAR},
@@ -415,13 +387,10 @@
         source_principal = #{sourcePrincipal,jdbcType=VARCHAR},
       </if>
       <if test="sourceUpdateTime != null">
-        source_update_time = #{sourceUpdateTime,jdbcType=DATE},
-      </if>
-      <if test="triggerNextTime != null">
-        trigger_next_time = #{triggerNextTime,jdbcType=BIGINT},
+        source_update_time = #{sourceUpdateTime,jdbcType=TIMESTAMP},
       </if>
       <if test="versionMark != null">
-        version_mark = #{versionMark,jdbcType=CHAR},
+        version_mark = #{versionMark,jdbcType=VARCHAR},
       </if>
       <if test="author != null">
         author = #{author,jdbcType=VARCHAR},
@@ -429,89 +398,94 @@
       <if test="addTime != null">
         add_time = #{addTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="versionName != null">
+        version_name = #{versionName,jdbcType=VARCHAR},
+      </if>
+      <if test="onFork != null">
+        on_fork = #{onFork,jdbcType=CHAR},
+      </if>
+      <if test="runCommand != null">
+        run_command = #{runCommand,jdbcType=VARCHAR},
+      </if>
       <if test="runSource != null">
         run_source = #{runSource,jdbcType=LONGVARCHAR},
       </if>
     </set>
     where node_version_id = #{nodeVersionId,jdbcType=INTEGER}
   </update>
-  <update id="updateByIdWithBLOBs" parameterType="com.byit.model.jobFlowNodeVersion">
-    <!-- generated @mbg.generated date: 2019-12-24 -->
-    update job_flow_node_version
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.byit.model.NodeVersion">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    update node_version
     set node_id = #{nodeId,jdbcType=INTEGER},
-      alarm_email = #{alarmEmail,jdbcType=VARCHAR},
       block_strategy = #{blockStrategy,jdbcType=VARCHAR},
-      callback_token = #{callbackToken,jdbcType=VARCHAR},
-      dependency_nodes = #{dependencyNodes,jdbcType=VARCHAR},
+      pugin_token = #{puginToken,jdbcType=VARCHAR},
       failed_retry_count = #{failedRetryCount,jdbcType=INTEGER},
       flow_id = #{flowId,jdbcType=INTEGER},
       flow_version_id = #{flowVersionId,jdbcType=INTEGER},
-      follow_task_flow = #{followTaskFlow,jdbcType=CHAR},
       gateway_token = #{gatewayToken,jdbcType=VARCHAR},
       job_type = #{jobType,jdbcType=VARCHAR},
-      local_node_handler_name = #{localNodeHandlerName,jdbcType=VARCHAR},
-      mail_action = #{mailAction,jdbcType=CHAR},
+      handler_name = #{handlerName,jdbcType=VARCHAR},
       node_cron = #{nodeCron,jdbcType=VARCHAR},
       node_desc = #{nodeDesc,jdbcType=VARCHAR},
       node_name = #{nodeName,jdbcType=VARCHAR},
-      node_of_flow_id = #{nodeOfFlowId,jdbcType=INTEGER},
+      map_flow_id = #{mapFlowId,jdbcType=INTEGER},
       node_timeout = #{nodeTimeout,jdbcType=BIGINT},
-      node_type = #{nodeType,jdbcType=VARCHAR},
+      is_virtual = #{isVirtual,jdbcType=VARCHAR},
       plugin_urls = #{pluginUrls,jdbcType=VARCHAR},
       priority = #{priority,jdbcType=CHAR},
       remove_mark = #{removeMark,jdbcType=CHAR},
       repeat_count = #{repeatCount,jdbcType=INTEGER},
-      retry_interval = #{retryInterval,jdbcType=BIGINT},
+      failed_retry_interval = #{failedRetryInterval,jdbcType=BIGINT},
       routing_strategy = #{routingStrategy,jdbcType=VARCHAR},
       run_param = #{runParam,jdbcType=VARCHAR},
       run_source_desc = #{runSourceDesc,jdbcType=VARCHAR},
       script_urls = #{scriptUrls,jdbcType=VARCHAR},
       source_principal = #{sourcePrincipal,jdbcType=VARCHAR},
-      source_update_time = #{sourceUpdateTime,jdbcType=DATE},
-      trigger_next_time = #{triggerNextTime,jdbcType=BIGINT},
-      version_mark = #{versionMark,jdbcType=CHAR},
+      source_update_time = #{sourceUpdateTime,jdbcType=TIMESTAMP},
+      version_mark = #{versionMark,jdbcType=VARCHAR},
       author = #{author,jdbcType=VARCHAR},
       add_time = #{addTime,jdbcType=TIMESTAMP},
+      version_name = #{versionName,jdbcType=VARCHAR},
+      on_fork = #{onFork,jdbcType=CHAR},
+      run_command = #{runCommand,jdbcType=VARCHAR},
       run_source = #{runSource,jdbcType=LONGVARCHAR}
     where node_version_id = #{nodeVersionId,jdbcType=INTEGER}
   </update>
-  <update id="updateById" parameterType="com.byit.model.jobFlowNodeVersion">
-    <!-- generated @mbg.generated date: 2019-12-24 -->
-    update job_flow_node_version
+  <update id="updateById" parameterType="com.byit.model.NodeVersion">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    update node_version
     set node_id = #{nodeId,jdbcType=INTEGER},
-      alarm_email = #{alarmEmail,jdbcType=VARCHAR},
       block_strategy = #{blockStrategy,jdbcType=VARCHAR},
-      callback_token = #{callbackToken,jdbcType=VARCHAR},
-      dependency_nodes = #{dependencyNodes,jdbcType=VARCHAR},
+      pugin_token = #{puginToken,jdbcType=VARCHAR},
       failed_retry_count = #{failedRetryCount,jdbcType=INTEGER},
       flow_id = #{flowId,jdbcType=INTEGER},
       flow_version_id = #{flowVersionId,jdbcType=INTEGER},
-      follow_task_flow = #{followTaskFlow,jdbcType=CHAR},
       gateway_token = #{gatewayToken,jdbcType=VARCHAR},
       job_type = #{jobType,jdbcType=VARCHAR},
-      local_node_handler_name = #{localNodeHandlerName,jdbcType=VARCHAR},
-      mail_action = #{mailAction,jdbcType=CHAR},
+      handler_name = #{handlerName,jdbcType=VARCHAR},
       node_cron = #{nodeCron,jdbcType=VARCHAR},
       node_desc = #{nodeDesc,jdbcType=VARCHAR},
       node_name = #{nodeName,jdbcType=VARCHAR},
-      node_of_flow_id = #{nodeOfFlowId,jdbcType=INTEGER},
+      map_flow_id = #{mapFlowId,jdbcType=INTEGER},
       node_timeout = #{nodeTimeout,jdbcType=BIGINT},
-      node_type = #{nodeType,jdbcType=VARCHAR},
+      is_virtual = #{isVirtual,jdbcType=VARCHAR},
       plugin_urls = #{pluginUrls,jdbcType=VARCHAR},
       priority = #{priority,jdbcType=CHAR},
       remove_mark = #{removeMark,jdbcType=CHAR},
       repeat_count = #{repeatCount,jdbcType=INTEGER},
-      retry_interval = #{retryInterval,jdbcType=BIGINT},
+      failed_retry_interval = #{failedRetryInterval,jdbcType=BIGINT},
       routing_strategy = #{routingStrategy,jdbcType=VARCHAR},
       run_param = #{runParam,jdbcType=VARCHAR},
       run_source_desc = #{runSourceDesc,jdbcType=VARCHAR},
       script_urls = #{scriptUrls,jdbcType=VARCHAR},
       source_principal = #{sourcePrincipal,jdbcType=VARCHAR},
-      source_update_time = #{sourceUpdateTime,jdbcType=DATE},
-      trigger_next_time = #{triggerNextTime,jdbcType=BIGINT},
-      version_mark = #{versionMark,jdbcType=CHAR},
+      source_update_time = #{sourceUpdateTime,jdbcType=TIMESTAMP},
+      version_mark = #{versionMark,jdbcType=VARCHAR},
       author = #{author,jdbcType=VARCHAR},
-      add_time = #{addTime,jdbcType=TIMESTAMP}
+      add_time = #{addTime,jdbcType=TIMESTAMP},
+      version_name = #{versionName,jdbcType=VARCHAR},
+      on_fork = #{onFork,jdbcType=CHAR},
+      run_command = #{runCommand,jdbcType=VARCHAR}
     where node_version_id = #{nodeVersionId,jdbcType=INTEGER}
   </update>
 </mapper>
\ No newline at end of file

byit-myth-core/myth-admin-core/src/main/resources/mapper/JobFlowRunRecordingMapper.xml → byit-myth-core/myth-admin-core/src/main/resources/mapper/RunRecordingMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.byit.mapper.JobFlowRunRecordingMapper">
-  <resultMap id="BaseResultMap" type="com.byit.model.JobFlowRunRecording">
-    <!-- generated @mbg.generated date: 2019-12-24 -->
+<mapper namespace="com.byit.mapper.RunRecordingMapper">
+  <resultMap id="BaseResultMap" type="com.byit.model.RunRecording">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
     <id column="recording_id" jdbcType="INTEGER" property="recordingId" />
     <result column="run_id" jdbcType="VARCHAR" property="runId" />
     <result column="alarm_email" jdbcType="VARCHAR" property="alarmEmail" />
@@ -11,52 +11,52 @@
     <result column="flow_run_result" jdbcType="CHAR" property="flowRunResult" />
     <result column="flow_status" jdbcType="CHAR" property="flowStatus" />
     <result column="flow_timeout" jdbcType="BIGINT" property="flowTimeout" />
-    <result column="flow_version_id" jdbcType="INTEGER" property="flowVersionId" />
-    <result column="mail_action" jdbcType="CHAR" property="mailAction" />
-    <result column="node_count" jdbcType="INTEGER" property="nodeCount" />
+    <result column="flow_version_name" jdbcType="INTEGER" property="flowVersionName" />
+    <result column="alarml_action" jdbcType="CHAR" property="alarmlAction" />
     <result column="priority" jdbcType="CHAR" property="priority" />
-    <result column="remaining_node" jdbcType="INTEGER" property="remainingNode" />
-    <result column="trigger_status" jdbcType="CHAR" property="triggerStatus" />
     <result column="trigger_time" jdbcType="BIGINT" property="triggerTime" />
-    <result column="add_time" jdbcType="TIMESTAMP" property="addTime" />
-    <result column="author" jdbcType="VARCHAR" property="author" />
+    <result column="principal" jdbcType="VARCHAR" property="principal" />
+    <result column="flow_id" jdbcType="INTEGER" property="flowId" />
+    <result column="start_time" jdbcType="TIMESTAMP" property="startTime" />
+    <result column="end_time" jdbcType="TIMESTAMP" property="endTime" />
+    <result column="is_alarm" jdbcType="CHAR" property="isAlarm" />
   </resultMap>
   <sql id="Base_Column_List">
-    <!-- generated @mbg.generated date: 2019-12-24 -->
+    <!-- generated @mbg.generated date: 2019-12-25 -->
     recording_id, run_id, alarm_email, dispatch_ip, flow_name, flow_run_result, flow_status, 
-    flow_timeout, flow_version_id, mail_action, node_count, priority, remaining_node, 
-    trigger_status, trigger_time, add_time, author
+    flow_timeout, flow_version_name, alarml_action, priority, trigger_time, principal, 
+    flow_id, start_time, end_time, is_alarm
   </sql>
   <select id="getById" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-    <!-- generated @mbg.generated date: 2019-12-24 -->
+    <!-- generated @mbg.generated date: 2019-12-25 -->
     select 
     <include refid="Base_Column_List" />
-    from job_flow_run_recording
+    from run_recording
     where recording_id = #{recordingId,jdbcType=INTEGER}
   </select>
   <delete id="deleteById" parameterType="java.lang.Integer">
-    <!-- generated @mbg.generated date: 2019-12-24 -->
-    delete from job_flow_run_recording
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    delete from run_recording
     where recording_id = #{recordingId,jdbcType=INTEGER}
   </delete>
-  <insert id="insert" parameterType="com.byit.model.JobFlowRunRecording">
-    <!-- generated @mbg.generated date: 2019-12-24 -->
-    insert into job_flow_run_recording (recording_id, run_id, alarm_email, 
+  <insert id="insert" parameterType="com.byit.model.RunRecording">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    insert into run_recording (recording_id, run_id, alarm_email, 
       dispatch_ip, flow_name, flow_run_result, 
-      flow_status, flow_timeout, flow_version_id, 
-      mail_action, node_count, priority, 
-      remaining_node, trigger_status, trigger_time, 
-      add_time, author)
+      flow_status, flow_timeout, flow_version_name, 
+      alarml_action, priority, trigger_time, 
+      principal, flow_id, start_time, 
+      end_time, is_alarm)
     values (#{recordingId,jdbcType=INTEGER}, #{runId,jdbcType=VARCHAR}, #{alarmEmail,jdbcType=VARCHAR}, 
       #{dispatchIp,jdbcType=VARCHAR}, #{flowName,jdbcType=VARCHAR}, #{flowRunResult,jdbcType=CHAR}, 
-      #{flowStatus,jdbcType=CHAR}, #{flowTimeout,jdbcType=BIGINT}, #{flowVersionId,jdbcType=INTEGER}, 
-      #{mailAction,jdbcType=CHAR}, #{nodeCount,jdbcType=INTEGER}, #{priority,jdbcType=CHAR}, 
-      #{remainingNode,jdbcType=INTEGER}, #{triggerStatus,jdbcType=CHAR}, #{triggerTime,jdbcType=BIGINT}, 
-      #{addTime,jdbcType=TIMESTAMP}, #{author,jdbcType=VARCHAR})
+      #{flowStatus,jdbcType=CHAR}, #{flowTimeout,jdbcType=BIGINT}, #{flowVersionName,jdbcType=INTEGER}, 
+      #{alarmlAction,jdbcType=CHAR}, #{priority,jdbcType=CHAR}, #{triggerTime,jdbcType=BIGINT}, 
+      #{principal,jdbcType=VARCHAR}, #{flowId,jdbcType=INTEGER}, #{startTime,jdbcType=TIMESTAMP}, 
+      #{endTime,jdbcType=TIMESTAMP}, #{isAlarm,jdbcType=CHAR})
   </insert>
-  <insert id="insertSelective" parameterType="com.byit.model.JobFlowRunRecording">
-    <!-- generated @mbg.generated date: 2019-12-24 -->
-    insert into job_flow_run_recording
+  <insert id="insertSelective" parameterType="com.byit.model.RunRecording">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    insert into run_recording
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="recordingId != null">
         recording_id,
@@ -82,32 +82,32 @@
       <if test="flowTimeout != null">
         flow_timeout,
       </if>
-      <if test="flowVersionId != null">
-        flow_version_id,
+      <if test="flowVersionName != null">
+        flow_version_name,
       </if>
-      <if test="mailAction != null">
-        mail_action,
-      </if>
-      <if test="nodeCount != null">
-        node_count,
+      <if test="alarmlAction != null">
+        alarml_action,
       </if>
       <if test="priority != null">
         priority,
       </if>
-      <if test="remainingNode != null">
-        remaining_node,
-      </if>
-      <if test="triggerStatus != null">
-        trigger_status,
-      </if>
       <if test="triggerTime != null">
         trigger_time,
       </if>
-      <if test="addTime != null">
-        add_time,
+      <if test="principal != null">
+        principal,
+      </if>
+      <if test="flowId != null">
+        flow_id,
+      </if>
+      <if test="startTime != null">
+        start_time,
       </if>
-      <if test="author != null">
-        author,
+      <if test="endTime != null">
+        end_time,
+      </if>
+      <if test="isAlarm != null">
+        is_alarm,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -135,38 +135,38 @@
       <if test="flowTimeout != null">
         #{flowTimeout,jdbcType=BIGINT},
       </if>
-      <if test="flowVersionId != null">
-        #{flowVersionId,jdbcType=INTEGER},
-      </if>
-      <if test="mailAction != null">
-        #{mailAction,jdbcType=CHAR},
+      <if test="flowVersionName != null">
+        #{flowVersionName,jdbcType=INTEGER},
       </if>
-      <if test="nodeCount != null">
-        #{nodeCount,jdbcType=INTEGER},
+      <if test="alarmlAction != null">
+        #{alarmlAction,jdbcType=CHAR},
       </if>
       <if test="priority != null">
         #{priority,jdbcType=CHAR},
       </if>
-      <if test="remainingNode != null">
-        #{remainingNode,jdbcType=INTEGER},
-      </if>
-      <if test="triggerStatus != null">
-        #{triggerStatus,jdbcType=CHAR},
-      </if>
       <if test="triggerTime != null">
         #{triggerTime,jdbcType=BIGINT},
       </if>
-      <if test="addTime != null">
-        #{addTime,jdbcType=TIMESTAMP},
+      <if test="principal != null">
+        #{principal,jdbcType=VARCHAR},
       </if>
-      <if test="author != null">
-        #{author,jdbcType=VARCHAR},
+      <if test="flowId != null">
+        #{flowId,jdbcType=INTEGER},
+      </if>
+      <if test="startTime != null">
+        #{startTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="endTime != null">
+        #{endTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="isAlarm != null">
+        #{isAlarm,jdbcType=CHAR},
       </if>
     </trim>
   </insert>
-  <update id="updateByIdSelective" parameterType="com.byit.model.JobFlowRunRecording">
-    <!-- generated @mbg.generated date: 2019-12-24 -->
-    update job_flow_run_recording
+  <update id="updateByIdSelective" parameterType="com.byit.model.RunRecording">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    update run_recording
     <set>
       <if test="runId != null">
         run_id = #{runId,jdbcType=VARCHAR},
@@ -189,39 +189,39 @@
       <if test="flowTimeout != null">
         flow_timeout = #{flowTimeout,jdbcType=BIGINT},
       </if>
-      <if test="flowVersionId != null">
-        flow_version_id = #{flowVersionId,jdbcType=INTEGER},
+      <if test="flowVersionName != null">
+        flow_version_name = #{flowVersionName,jdbcType=INTEGER},
       </if>
-      <if test="mailAction != null">
-        mail_action = #{mailAction,jdbcType=CHAR},
-      </if>
-      <if test="nodeCount != null">
-        node_count = #{nodeCount,jdbcType=INTEGER},
+      <if test="alarmlAction != null">
+        alarml_action = #{alarmlAction,jdbcType=CHAR},
       </if>
       <if test="priority != null">
         priority = #{priority,jdbcType=CHAR},
       </if>
-      <if test="remainingNode != null">
-        remaining_node = #{remainingNode,jdbcType=INTEGER},
-      </if>
-      <if test="triggerStatus != null">
-        trigger_status = #{triggerStatus,jdbcType=CHAR},
-      </if>
       <if test="triggerTime != null">
         trigger_time = #{triggerTime,jdbcType=BIGINT},
       </if>
-      <if test="addTime != null">
-        add_time = #{addTime,jdbcType=TIMESTAMP},
+      <if test="principal != null">
+        principal = #{principal,jdbcType=VARCHAR},
+      </if>
+      <if test="flowId != null">
+        flow_id = #{flowId,jdbcType=INTEGER},
+      </if>
+      <if test="startTime != null">
+        start_time = #{startTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="endTime != null">
+        end_time = #{endTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="author != null">
-        author = #{author,jdbcType=VARCHAR},
+      <if test="isAlarm != null">
+        is_alarm = #{isAlarm,jdbcType=CHAR},
       </if>
     </set>
     where recording_id = #{recordingId,jdbcType=INTEGER}
   </update>
-  <update id="updateById" parameterType="com.byit.model.JobFlowRunRecording">
-    <!-- generated @mbg.generated date: 2019-12-24 -->
-    update job_flow_run_recording
+  <update id="updateById" parameterType="com.byit.model.RunRecording">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    update run_recording
     set run_id = #{runId,jdbcType=VARCHAR},
       alarm_email = #{alarmEmail,jdbcType=VARCHAR},
       dispatch_ip = #{dispatchIp,jdbcType=VARCHAR},
@@ -229,15 +229,15 @@
       flow_run_result = #{flowRunResult,jdbcType=CHAR},
       flow_status = #{flowStatus,jdbcType=CHAR},
       flow_timeout = #{flowTimeout,jdbcType=BIGINT},
-      flow_version_id = #{flowVersionId,jdbcType=INTEGER},
-      mail_action = #{mailAction,jdbcType=CHAR},
-      node_count = #{nodeCount,jdbcType=INTEGER},
+      flow_version_name = #{flowVersionName,jdbcType=INTEGER},
+      alarml_action = #{alarmlAction,jdbcType=CHAR},
       priority = #{priority,jdbcType=CHAR},
-      remaining_node = #{remainingNode,jdbcType=INTEGER},
-      trigger_status = #{triggerStatus,jdbcType=CHAR},
       trigger_time = #{triggerTime,jdbcType=BIGINT},
-      add_time = #{addTime,jdbcType=TIMESTAMP},
-      author = #{author,jdbcType=VARCHAR}
+      principal = #{principal,jdbcType=VARCHAR},
+      flow_id = #{flowId,jdbcType=INTEGER},
+      start_time = #{startTime,jdbcType=TIMESTAMP},
+      end_time = #{endTime,jdbcType=TIMESTAMP},
+      is_alarm = #{isAlarm,jdbcType=CHAR}
     where recording_id = #{recordingId,jdbcType=INTEGER}
   </update>
 </mapper>
\ No newline at end of file

byit-myth-core/myth-admin-core/src/main/resources/mapper/SourceHistoryMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.byit.mapper.SourceHistoryMapper">
+  <resultMap id="BaseResultMap" type="com.byit.model.SourceHistory">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="job_node_id" jdbcType="VARCHAR" property="jobNodeId" />
+    <result column="glue_remark" jdbcType="VARCHAR" property="glueRemark" />
+    <result column="add_time" jdbcType="TIMESTAMP" property="addTime" />
+  </resultMap>
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.byit.model.SourceHistory">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    <result column="glue_source" jdbcType="LONGVARCHAR" property="glueSource" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    id, job_node_id, glue_remark, add_time
+  </sql>
+  <sql id="Blob_Column_List">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    glue_source
+  </sql>
+  <select id="getById" parameterType="java.lang.String" resultMap="ResultMapWithBLOBs">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    select 
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from source_history
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteById" parameterType="java.lang.String">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    delete from source_history
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.byit.model.SourceHistory">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    insert into source_history (id, job_node_id, glue_remark, 
+      add_time, glue_source)
+    values (#{id,jdbcType=VARCHAR}, #{jobNodeId,jdbcType=VARCHAR}, #{glueRemark,jdbcType=VARCHAR}, 
+      #{addTime,jdbcType=TIMESTAMP}, #{glueSource,jdbcType=LONGVARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.byit.model.SourceHistory">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    insert into source_history
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="jobNodeId != null">
+        job_node_id,
+      </if>
+      <if test="glueRemark != null">
+        glue_remark,
+      </if>
+      <if test="addTime != null">
+        add_time,
+      </if>
+      <if test="glueSource != null">
+        glue_source,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="jobNodeId != null">
+        #{jobNodeId,jdbcType=VARCHAR},
+      </if>
+      <if test="glueRemark != null">
+        #{glueRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="addTime != null">
+        #{addTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="glueSource != null">
+        #{glueSource,jdbcType=LONGVARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByIdSelective" parameterType="com.byit.model.SourceHistory">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    update source_history
+    <set>
+      <if test="jobNodeId != null">
+        job_node_id = #{jobNodeId,jdbcType=VARCHAR},
+      </if>
+      <if test="glueRemark != null">
+        glue_remark = #{glueRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="addTime != null">
+        add_time = #{addTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="glueSource != null">
+        glue_source = #{glueSource,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.byit.model.SourceHistory">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    update source_history
+    set job_node_id = #{jobNodeId,jdbcType=VARCHAR},
+      glue_remark = #{glueRemark,jdbcType=VARCHAR},
+      add_time = #{addTime,jdbcType=TIMESTAMP},
+      glue_source = #{glueSource,jdbcType=LONGVARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateById" parameterType="com.byit.model.SourceHistory">
+    <!-- generated @mbg.generated date: 2019-12-25 -->
+    update source_history
+    set job_node_id = #{jobNodeId,jdbcType=VARCHAR},
+      glue_remark = #{glueRemark,jdbcType=VARCHAR},
+      add_time = #{addTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>
\ No newline at end of file