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

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/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/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/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/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