Merge branch 'developer' of 39.105.146.189:liyuan/byit-myth-job into developer

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

@@ -98,4 +98,14 @@ public class MythJobFlowCurrent {
      */
     @Column(columnDefinition = "char(1) COMMENT '执行类型  周期执行1  手动执行2'")
     private String execType;
+    /**
+     * 是否有下游节点  0 否，1 是
+     */
+    @Column(columnDefinition = "char(1) COMMENT '是否有下游节点  0 否，1 是'")
+    private String isHaveDepend;
+    /**
+     * 是否是顶级工作流 0 是， 1 是
+     */
+    @Column(columnDefinition = "char(1) COMMENT '是否是顶级工作流 0 是， 1 是'")
+    private String isTop;
 }

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

+package com.byit.model;
+
+import lombok.*;
+
+import javax.persistence.*;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@EqualsAndHashCode
+@Builder
+@Entity
+@Table(name = "job_flow_dependent")
+@org.hibernate.annotations.Table(appliesTo = "job_flow_dependent",comment="任务流的关联表，现实表")
+public class MythJobFlowDependent {
+
+    @Id
+    @Column(nullable = false,columnDefinition = "int(13) COMMENT '工作流Id'")
+    private Integer flowId;
+
+    @Id
+    @Column(nullable = false,columnDefinition = "int(13) COMMENT '上游依赖的工作流Id'")
+    private Integer dependFlowId;
+}

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

@@ -54,7 +54,7 @@ public class MythJobFlowRunRecording {
     /**
      * 1 未开始  2运行  3暂停  4结束
      */
-    @Column(nullable = false,columnDefinition = "char(1) COMMENT '1 未开始  2运行  3暂停  4结束'")
+    @Column(nullable = false,columnDefinition = "char(1) COMMENT '1 未开始  2运行中  3暂停  4成功  5失败'")
     private String flowStatus;
     /**
      * 本次任务的执行时间
@@ -94,7 +94,7 @@ public class MythJobFlowRunRecording {
     /**
      * 调度状态：0-暂停，1-运行
      */
-    @Column(columnDefinition = "char(1) COMMENT '调度状态：0-暂停，1-运行'")
+    @Column(columnDefinition = "char(1) COMMENT '调度状态：0-未开始，1-调度成功， 2-调度失败'")
     private String triggerStatus;
 
 }