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

byit-myth-admin/src/main/java/com/byit/api/ApiFlowController.java

@@ -26,7 +26,7 @@ public class ApiFlowController {
 
     @PostMapping("publish")
     @ApiOperation("发布工作流，并开始调度")
-    public String publishFlow(@RequestBody PluginPackage pluginPackage){
+    public String publishFlow(@RequestBody PluginPackage pluginPackage) throws Exception {
         apiFlowService.publishFlow(pluginPackage);
         return "SUCCESS";
     }
@@ -34,7 +34,7 @@ public class ApiFlowController {
     @PostMapping("delete")
     @ApiOperation("删除工作流,若当前工作流被依赖则删除失败，只允许删除不被依赖的工作流，当前工作流依赖其他工作流不影响")
     public String deleteFlow(String flowName, String workspaceName){
-        apiFlowService.deleteFlow(flowName);
+        apiFlowService.deleteFlow(flowName, workspaceName);
         return "SUCCESS";
     }
 

byit-myth-admin/src/main/java/com/byit/service/ApiFlowService.java

@@ -10,7 +10,7 @@ import com.byit.job.dto.plugin.PluginPackage;
  */
 public interface ApiFlowService {
 
-    void deleteFlow(String flowName);
+    void deleteFlow(String flowName, String workspaceName);
 
     void start(String flowName, String workspaceName);
 
@@ -22,7 +22,7 @@ public interface ApiFlowService {
 
     void reStartSchedule(String runId);
 
-    void publishFlow(PluginPackage pluginPackage);
+    void publishFlow(PluginPackage pluginPackage) throws Exception;
 
     /**
      * 判断工作流石佛存在

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

@@ -11,4 +11,10 @@ public interface FlowVersionMapper {
 
     int updateByIdSelective(FlowVersion record);
 
+    /**
+     * 根据当前工作流id查找当前应用的版本
+     * @param flowId
+     * @return
+     */
+    FlowVersion getByFlowIdAndThis(Integer flowId);
 }
\ No newline at end of file

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

@@ -51,4 +51,10 @@ public interface JobTaskMapper {
      * @param jobTasks
      */
     void deleteInId(@Param("jobTasks") List<JobTask> jobTasks);
+
+    /**
+     * 根据runid删除运行信息
+     * @param runId
+     */
+    int deleteByRunId(String runId);
 }
\ No newline at end of file

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

@@ -24,5 +24,7 @@ public interface NodeDependencyMapper {
      * @param nodeId
      * @return
      */
-    List<Integer> findByNodeId(Integer nodeId);
+    List<Integer> findDependIdByNodeId(Integer nodeId);
+
+    List<NodeDependencyKey> findByNodeId(Integer nodeId);
 }
\ 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;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -46,4 +47,12 @@ public interface NodeMapper {
      * @param flowId
      */
     void deleteVirtualNode(Integer flowId);
+
+    /**
+     * 根据工作流id和节点名称查询节点信息
+     * @param nodeName
+     * @param flowId
+     * @return
+     */
+    Node getByNameAndFlow(@Param("nodeName") String nodeName, @Param("flowId") Integer flowId);
 }
\ 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;
+import org.apache.ibatis.annotations.Param;
+
+public interface NodeVersionDependencyMapper {
+    int deleteById(NodeVersionDependencyKey key);
+
+    int insert(@Param("nodeVersionId") Integer nodeVersionId, @Param("dependencyId") Integer dependencyId);
+
+    int insertSelective(NodeVersionDependencyKey record);
+}
\ No newline at end of file

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

@@ -11,4 +11,10 @@ public interface NodeVersionMapper {
 
     int updateByIdSelective(NodeVersion record);
 
+    /**
+     * 将当前工作流下版本表中所有节点都设置为不是当前版本
+     * @param flowId
+     * @return
+     */
+    int updateNotCurrentVersion(Integer flowId);
 }
\ No newline at end of file

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

@@ -57,4 +57,22 @@ public interface RunRecordingMapper {
      */
     int deleteById(Integer recordingId);
 
+    /**
+     * 根据工作流id查询正在调度中的工作流
+     * @param flowId
+     */
+    List<RunRecording> findOnScheduleByFlowId(Integer flowId);
+
+    /**
+     * 根据工作流id查询未开始的工作流
+     * @param flowId
+     * @return
+     */
+    List<RunRecording> findUnStartByFlowId(Integer flowId);
+
+    /**
+     * 根据runid删除工作流的运行记录
+     * @param runId
+     */
+    int deleteByRunId(String runId);
 }
\ No newline at end of file

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

@@ -2,9 +2,10 @@ package com.byit.model;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 /**
  *  
@@ -97,9 +98,9 @@ public class FlowVersion implements Serializable {
     private Integer repeatCount;
 
     /**
-     * 当前版本的标志  this
+     * 当前版本的标志  0 是， 1 不是
      */
-    @ApiModelProperty("当前版本的标志  this")
+    @ApiModelProperty("当前版本的标志  0 是， 1 不是")
     private String versionMark;
 
     /**

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 lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *  
+ */
+@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/service/impl/FlowServiceImpl.java

@@ -215,7 +215,7 @@ public class FlowServiceImpl implements FlowService {
             nodeList.forEach(node -> {
                 NodeVo nodeVo = new NodeVo();
                 BeanUtils.copyProperties(node, nodeVo);
-                List<Integer> dependNodeIdList = nodeDependencyMapper.findByNodeId(node.getNodeId());
+                List<Integer> dependNodeIdList = nodeDependencyMapper.findDependIdByNodeId(node.getNodeId());
                 nodeVoList.add(nodeVo);
             });
             flowVo.setNodeVoList(nodeVoList);

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

@@ -55,19 +55,7 @@
                              type="XMLMAPPER">
             <property name="enableSubPackages" value="false"/>
         </javaClientGenerator>
-        <table tableName="email_alarm" domainObjectName="EmailAlarm" />
-        <table tableName="flow" domainObjectName="Flow" />
-        <table tableName="flow_version" domainObjectName="FlowVersion" />
-        <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="workspace" domainObjectName="Workspace" />
+        <table tableName="node_version_dependency" domainObjectName="NodeVersionDependency" />
 
     </context>
 

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

@@ -30,6 +30,7 @@
     flow_name, flow_node_count, alarml_action, schedule_follow, priority, remove_mark, 
     repeat_count, version_mark, workspace_id, author, principal, version_name, is_inner
   </sql>
+
   <select id="getById" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     <!-- generated @mbg.generated date: 2019-12-31 -->
     select 
@@ -37,29 +38,22 @@
     from flow_version
     where flow_version_id = #{flowVersionId,jdbcType=INTEGER}
   </select>
+
+  <select id="getByFlowIdAndThis"  parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from flow_version
+    where flow_id = #{flowId,jdbcType=INTEGER}
+        and version_mark = '0'
+  </select>
+
   <delete id="deleteById" parameterType="java.lang.Integer">
     <!-- generated @mbg.generated date: 2019-12-31 -->
     delete from flow_version
     where flow_version_id = #{flowVersionId,jdbcType=INTEGER}
   </delete>
-  <insert id="insert" parameterType="com.byit.model.FlowVersion">
-    <!-- generated @mbg.generated date: 2019-12-31 -->
-    insert into flow_version (flow_version_id, add_time, alarm_email, 
-      exec_type, flow_cron, flow_desc, 
-      flow_id, flow_name, flow_node_count, 
-      alarml_action, schedule_follow, priority, 
-      remove_mark, repeat_count, version_mark, 
-      workspace_id, author, principal, 
-      version_name, is_inner)
-    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}, 
-      #{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}, #{isInner,jdbcType=CHAR})
-  </insert>
-  <insert id="insertSelective" parameterType="com.byit.model.FlowVersion">
+
+  <insert id="insertSelective" useGeneratedKeys="true" keyProperty="flowVersionId"  parameterType="com.byit.model.FlowVersion">
     <!-- generated @mbg.generated date: 2019-12-31 -->
     insert into flow_version
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -251,28 +245,5 @@
     </set>
     where flow_version_id = #{flowVersionId,jdbcType=INTEGER}
   </update>
-  <update id="updateById" parameterType="com.byit.model.FlowVersion">
-    <!-- generated @mbg.generated date: 2019-12-31 -->
-    update flow_version
-    set add_time = #{addTime,jdbcType=TIMESTAMP},
-      alarm_email = #{alarmEmail,jdbcType=VARCHAR},
-      exec_type = #{execType,jdbcType=CHAR},
-      flow_cron = #{flowCron,jdbcType=VARCHAR},
-      flow_desc = #{flowDesc,jdbcType=VARCHAR},
-      flow_id = #{flowId,jdbcType=INTEGER},
-      flow_name = #{flowName,jdbcType=VARCHAR},
-      flow_node_count = #{flowNodeCount,jdbcType=INTEGER},
-      alarml_action = #{alarmlAction,jdbcType=CHAR},
-      schedule_follow = #{scheduleFollow,jdbcType=CHAR},
-      priority = #{priority,jdbcType=CHAR},
-      remove_mark = #{removeMark,jdbcType=CHAR},
-      repeat_count = #{repeatCount,jdbcType=INTEGER},
-      version_mark = #{versionMark,jdbcType=CHAR},
-      workspace_id = #{workspaceId,jdbcType=INTEGER},
-      author = #{author,jdbcType=VARCHAR},
-      principal = #{principal,jdbcType=VARCHAR},
-      version_name = #{versionName,jdbcType=VARCHAR},
-      is_inner = #{isInner,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

@@ -344,4 +344,9 @@
     delete from job_task
     where id = #{id,jdbcType=INTEGER}
   </delete>
+
+  <delete id="deleteByRunId" parameterType="java.lang.Integer">
+    delete from job_task
+    where run_id = #{runId,jdbcType=INTEGER}
+  </delete>
 </mapper>
\ No newline at end of file

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

@@ -6,13 +6,32 @@
     <id column="node_id" jdbcType="INTEGER" property="nodeId" />
     <id column="dependency_id" jdbcType="INTEGER" property="dependencyId" />
   </resultMap>
+
+  <select id="findDependIdByNodeId" parameterType="integer" resultType="integer">
+    select dependency_id
+    from node_dependency
+    where node_id = #{nodeId,jdbcType=INTEGER}
+  </select>
+
+  <select id="findByNodeId" parameterType="integer" resultMap="BaseResultMap">
+    select node_id, dependency_id
+    from node_dependency
+    where node_id = #{nodeId,jdbcType=INTEGER}
+  </select>
+
   <delete id="deleteById" parameterType="com.byit.model.NodeDependencyKey">
     <!-- generated @mbg.generated date: 2019-12-31 -->
     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">
+
+  <delete id="deleteByNodeId" parameterType="integer">
+    delete from node_dependency
+    where node_id = #{nodeId,jdbcType=INTEGER}
+  </delete>
+
+  <insert id="insert">
     <!-- generated @mbg.generated date: 2019-12-31 -->
     insert into node_dependency (node_id, dependency_id)
     values (#{nodeId,jdbcType=INTEGER}, #{dependencyId,jdbcType=INTEGER})

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

@@ -60,37 +60,50 @@
     from node
     where node_id = #{nodeId,jdbcType=INTEGER}
   </select>
+
+  <select id="findOnforkByFlowId"  parameterType="integer" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from node
+    where flow_id = #{flowId,jdbcType=INTEGER}
+    and on_fork = '0';
+  </select>
+
+  <select id="findVirtualByFlowId" parameterType="integer" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from node
+    where flow_id = #{flowId,jdbcType=INTEGER}
+    and is_virtual = '0';
+  </select>
+
+  <select id="getByNameAndFlow" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from node
+    where flow_id = #{flowId,jdbcType=INTEGER}
+        and node_name = #{nodeName,jdbcType=VARCHAR}
+  </select>
+
+  <delete id="deleteVirtualNode">
+    delete from node
+    where flow_id = #{flowId,jdbcType=INTEGER}
+    and is_virtual = '0';
+  </delete>
+
   <delete id="deleteById" parameterType="java.lang.Integer">
     <!-- generated @mbg.generated date: 2019-12-31 -->
     delete from node
     where node_id = #{nodeId,jdbcType=INTEGER}
   </delete>
-  <insert id="insert" parameterType="com.byit.model.Node">
-    <!-- generated @mbg.generated date: 2019-12-31 -->
-    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.Node">
+
+  <insert id="insertSelective"  useGeneratedKeys="true" keyProperty="nodeId" parameterType="com.byit.model.Node">
     <!-- generated @mbg.generated date: 2019-12-31 -->
     insert into node
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -290,6 +303,16 @@
       </if>
     </trim>
   </insert>
+
+  <!--将节点更改为在调度上-->
+  <update id="updateOnforkUp" parameterType="integer" >
+     update node set on_fork = '0' where node_id = #{nodeId, jdbcType=INTEGER}
+  </update>
+
+  <update id="updateOnforkDown" parameterType="integer" >
+    update node set on_fork = '1' where flow_id = #{flowId, jdbcType=INTEGER}
+  </update>
+
   <update id="updateByIdSelective" parameterType="com.byit.model.Node">
     <!-- generated @mbg.generated date: 2019-12-31 -->
     update node
@@ -390,75 +413,5 @@
     </set>
     where node_id = #{nodeId,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.byit.model.Node">
-    <!-- generated @mbg.generated date: 2019-12-31 -->
-    update node
-    set 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_cron = #{nodeCron,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},
-      remaining_count = #{remainingCount,jdbcType=INTEGER},
-      repeat_count = #{repeatCount,jdbcType=INTEGER},
-      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},
-      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.Node">
-    <!-- generated @mbg.generated date: 2019-12-31 -->
-    update node
-    set 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_cron = #{nodeCron,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},
-      remaining_count = #{remainingCount,jdbcType=INTEGER},
-      repeat_count = #{repeatCount,jdbcType=INTEGER},
-      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},
-      author = #{author,jdbcType=VARCHAR},
-      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: 2020-01-03 -->
+    <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: 2020-01-03 -->
+    delete from node_version_dependency
+    where node_version_id = #{nodeVersionId,jdbcType=INTEGER}
+      and dependency_id = #{dependencyId,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert">
+    <!-- generated @mbg.generated date: 2020-01-03 -->
+    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: 2020-01-03 -->
+    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/NodeVersionMapper.xml

@@ -54,6 +54,7 @@
     <!-- generated @mbg.generated date: 2019-12-31 -->
     run_source
   </sql>
+
   <select id="getById" parameterType="java.lang.Integer" resultMap="ResultMapWithBLOBs">
     <!-- generated @mbg.generated date: 2019-12-31 -->
     select 
@@ -63,38 +64,14 @@
     from node_version
     where node_version_id = #{nodeVersionId,jdbcType=INTEGER}
   </select>
+
+
   <delete id="deleteById" parameterType="java.lang.Integer">
     <!-- generated @mbg.generated date: 2019-12-31 -->
     delete from node_version
     where node_version_id = #{nodeVersionId,jdbcType=INTEGER}
   </delete>
-  <insert id="insert" parameterType="com.byit.model.NodeVersion">
-    <!-- generated @mbg.generated date: 2019-12-31 -->
-    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.NodeVersion">
     <!-- generated @mbg.generated date: 2019-12-31 -->
     insert into node_version
@@ -307,6 +284,13 @@
       </if>
     </trim>
   </insert>
+
+  <update id="updateNotCurrentVersion" parameterType="integer">
+    update node_version
+    set version_mark = '1'
+    where flow_id = #{flowId}
+  </update>
+
   <update id="updateByIdSelective" parameterType="com.byit.model.NodeVersion">
     <!-- generated @mbg.generated date: 2019-12-31 -->
     update node_version
@@ -413,79 +397,5 @@
     </set>
     where node_version_id = #{nodeVersionId,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.byit.model.NodeVersion">
-    <!-- generated @mbg.generated date: 2019-12-31 -->
-    update node_version
-    set node_id = #{nodeId,jdbcType=INTEGER},
-      block_strategy = #{blockStrategy,jdbcType=VARCHAR},
-      pugin_token = #{puginToken,jdbcType=VARCHAR},
-      failed_retry_count = #{failedRetryCount,jdbcType=INTEGER},
-      flow_id = #{flowId,jdbcType=INTEGER},
-      flow_version_id = #{flowVersionId,jdbcType=INTEGER},
-      gateway_token = #{gatewayToken,jdbcType=VARCHAR},
-      job_type = #{jobType,jdbcType=VARCHAR},
-      handler_name = #{handlerName,jdbcType=VARCHAR},
-      node_cron = #{nodeCron,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=VARCHAR},
-      plugin_urls = #{pluginUrls,jdbcType=VARCHAR},
-      priority = #{priority,jdbcType=CHAR},
-      remove_mark = #{removeMark,jdbcType=CHAR},
-      repeat_count = #{repeatCount,jdbcType=INTEGER},
-      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=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.NodeVersion">
-    <!-- generated @mbg.generated date: 2019-12-31 -->
-    update node_version
-    set node_id = #{nodeId,jdbcType=INTEGER},
-      block_strategy = #{blockStrategy,jdbcType=VARCHAR},
-      pugin_token = #{puginToken,jdbcType=VARCHAR},
-      failed_retry_count = #{failedRetryCount,jdbcType=INTEGER},
-      flow_id = #{flowId,jdbcType=INTEGER},
-      flow_version_id = #{flowVersionId,jdbcType=INTEGER},
-      gateway_token = #{gatewayToken,jdbcType=VARCHAR},
-      job_type = #{jobType,jdbcType=VARCHAR},
-      handler_name = #{handlerName,jdbcType=VARCHAR},
-      node_cron = #{nodeCron,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=VARCHAR},
-      plugin_urls = #{pluginUrls,jdbcType=VARCHAR},
-      priority = #{priority,jdbcType=CHAR},
-      remove_mark = #{removeMark,jdbcType=CHAR},
-      repeat_count = #{repeatCount,jdbcType=INTEGER},
-      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=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}
-    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/RunRecordingMapper.xml

@@ -49,11 +49,34 @@
     from run_recording
     where recording_id = #{recordingId,jdbcType=INTEGER}
   </select>
+
+  <select id="findOnScheduleByFlowId" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from run_recording
+    where flow_id = #{flowId,jdbcType=INTEGER}
+        and flow_status not in ('1','4')
+  </select>
+
+  <select id="findUnStartByFlowId" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from run_recording
+    where flow_id = #{flowId,jdbcType=INTEGER}
+        and flow_status = '1'
+  </select>
+
   <delete id="deleteById" parameterType="java.lang.Integer">
     <!-- generated @mbg.generated date: 2019-12-25 -->
     delete from run_recording
     where recording_id = #{recordingId,jdbcType=INTEGER}
   </delete>
+
+  <delete id="deleteByRunId" parameterType="java.lang.Integer">
+    delete from run_recording
+    where run_id = #{runId,jdbcType=INTEGER}
+  </delete>
+
   <insert id="saveRunRecording" parameterType="com.byit.model.RunRecording">
     <!-- generated @mbg.generated date: 2019-12-25 -->
     insert into run_recording