【表增加字段】增加表字段

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 nodeId);
-
-    int insert(JobFlowNodeVersion record);
-
-    int insertSelective(JobFlowNodeVersion record);
-
-    JobFlowNodeVersion getById(Integer nodeId);
-
-    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/mapper/JobFlowVersionMapper.java

@@ -3,13 +3,13 @@ package com.byit.mapper;
 import com.byit.model.JobFlowVersion;
 
 public interface JobFlowVersionMapper {
-    int deleteById(Integer versionId);
+    int deleteById(Integer flowVersionId);
 
     int insert(JobFlowVersion record);
 
     int insertSelective(JobFlowVersion record);
 
-    JobFlowVersion getById(Integer versionId);
+    JobFlowVersion getById(Integer flowVersionId);
 
     int updateByIdSelective(JobFlowVersion record);
 

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/JobFlowVersion.java

@@ -16,7 +16,7 @@ public class JobFlowVersion implements Serializable {
      * 版本工作流主键
      */
     @ApiModelProperty("版本工作流主键")
-    private Integer versionId;
+    private Integer flowVersionId;
 
     /**
      * 添加时间

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

@@ -226,7 +226,16 @@ public class JobTask implements Serializable {
      */
     @ApiModelProperty("创建时间")
     private Date addTime;
-
+    /**
+     * 创建人
+     */
+    @ApiModelProperty("版本id")
+    private String versionId;
+    /**
+     * 创建人
+     */
+    @ApiModelProperty("版本名称")
+    private String versionName;
     /**
      */
     private static final long serialVersionUID = 1L;

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

@@ -233,7 +233,16 @@ public class JobTaskSchedule implements Serializable {
      */
     @ApiModelProperty("创建时间")
     private Date addTime;
-
+    /**
+     * 创建人
+     */
+    @ApiModelProperty("版本id")
+    private String versionId;
+    /**
+     * 创建人
+     */
+    @ApiModelProperty("版本名称")
+    private String versionName;
     /**
      */
     private static final long serialVersionUID = 1L;

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/jobFlowNodeVersion.java

@@ -11,11 +11,17 @@ import lombok.Data;
  */
 @ApiModel
 @Data
-public class JobFlowNodeVersion implements Serializable {
+public class jobFlowNodeVersion implements Serializable {
     /**
      * 当前版本节点主键
      */
     @ApiModelProperty("当前版本节点主键")
+    private Integer nodeVersionId;
+
+    /**
+     * 节点的id
+     */
+    @ApiModelProperty("节点的id")
     private Integer nodeId;
 
     /**

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

@@ -55,7 +55,8 @@
                              type="XMLMAPPER">
             <property name="enableSubPackages" value="false"/>
         </javaClientGenerator>
-        <table tableName="job_flow_current" domainObjectName="JobFlow" />
+        <table tableName="job_flow_version" domainObjectName="JobFlowVersion" />
+        <table tableName="job_flow_node_version" domainObjectName="jobFlowNodeVersion" />
     </context>
 
 </generatorConfiguration>

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

@@ -3,7 +3,7 @@
 <mapper namespace="com.byit.mapper.JobFlowVersionMapper">
   <resultMap id="BaseResultMap" type="com.byit.model.JobFlowVersion">
     <!-- generated @mbg.generated date: 2019-12-24 -->
-    <id column="version_id" jdbcType="INTEGER" property="versionId" />
+    <id column="flow_version_id" jdbcType="INTEGER" property="flowVersionId" />
     <result column="add_time" jdbcType="TIMESTAMP" property="addTime" />
     <result column="alarm_email" jdbcType="VARCHAR" property="alarmEmail" />
     <result column="exec_type" jdbcType="CHAR" property="execType" />
@@ -25,32 +25,32 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!-- generated @mbg.generated date: 2019-12-24 -->
-    version_id, add_time, alarm_email, exec_type, flow_cron, flow_desc, flow_id, flow_name, 
-    flow_node_count, flow_timeout, mail_action, node_date_is_follow_flow, priority, remove_mark, 
-    repeat_count, update_time, version_mark, workspace_id, author
+    flow_version_id, add_time, alarm_email, exec_type, flow_cron, flow_desc, flow_id, 
+    flow_name, flow_node_count, flow_timeout, mail_action, node_date_is_follow_flow, 
+    priority, remove_mark, repeat_count, update_time, version_mark, workspace_id, author
   </sql>
   <select id="getById" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     <!-- generated @mbg.generated date: 2019-12-24 -->
     select 
     <include refid="Base_Column_List" />
     from job_flow_version
-    where version_id = #{versionId,jdbcType=INTEGER}
+    where flow_version_id = #{flowVersionId,jdbcType=INTEGER}
   </select>
   <delete id="deleteById" parameterType="java.lang.Integer">
     <!-- generated @mbg.generated date: 2019-12-24 -->
     delete from job_flow_version
-    where version_id = #{versionId,jdbcType=INTEGER}
+    where flow_version_id = #{flowVersionId,jdbcType=INTEGER}
   </delete>
   <insert id="insert" parameterType="com.byit.model.JobFlowVersion">
     <!-- generated @mbg.generated date: 2019-12-24 -->
-    insert into job_flow_version (version_id, add_time, alarm_email, 
+    insert into job_flow_version (flow_version_id, add_time, alarm_email, 
       exec_type, flow_cron, flow_desc, 
       flow_id, flow_name, flow_node_count, 
       flow_timeout, mail_action, node_date_is_follow_flow, 
       priority, remove_mark, repeat_count, 
       update_time, version_mark, workspace_id, 
       author)
-    values (#{versionId,jdbcType=INTEGER}, #{addTime,jdbcType=TIMESTAMP}, #{alarmEmail,jdbcType=VARCHAR}, 
+    values (#{flowVersionId,jdbcType=INTEGER}, #{addTime,jdbcType=TIMESTAMP}, #{alarmEmail,jdbcType=VARCHAR}, 
       #{execType,jdbcType=CHAR}, #{flowCron,jdbcType=VARCHAR}, #{flowDesc,jdbcType=VARCHAR}, 
       #{flowId,jdbcType=INTEGER}, #{flowName,jdbcType=VARCHAR}, #{flowNodeCount,jdbcType=INTEGER}, 
       #{flowTimeout,jdbcType=BIGINT}, #{mailAction,jdbcType=CHAR}, #{nodeDateIsFollowFlow,jdbcType=CHAR}, 
@@ -62,8 +62,8 @@
     <!-- generated @mbg.generated date: 2019-12-24 -->
     insert into job_flow_version
     <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="versionId != null">
-        version_id,
+      <if test="flowVersionId != null">
+        flow_version_id,
       </if>
       <if test="addTime != null">
         add_time,
@@ -121,8 +121,8 @@
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="versionId != null">
-        #{versionId,jdbcType=INTEGER},
+      <if test="flowVersionId != null">
+        #{flowVersionId,jdbcType=INTEGER},
       </if>
       <if test="addTime != null">
         #{addTime,jdbcType=TIMESTAMP},
@@ -239,7 +239,7 @@
         author = #{author,jdbcType=VARCHAR},
       </if>
     </set>
-    where version_id = #{versionId,jdbcType=INTEGER}
+    where flow_version_id = #{flowVersionId,jdbcType=INTEGER}
   </update>
   <update id="updateById" parameterType="com.byit.model.JobFlowVersion">
     <!-- generated @mbg.generated date: 2019-12-24 -->
@@ -262,6 +262,6 @@
       version_mark = #{versionMark,jdbcType=CHAR},
       workspace_id = #{workspaceId,jdbcType=INTEGER},
       author = #{author,jdbcType=VARCHAR}
-    where version_id = #{versionId,jdbcType=INTEGER}
+    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

@@ -39,6 +39,8 @@
     <result column="run_source" jdbcType="LONGVARCHAR" property="runSource" />
     <result column="add_time" jdbcType="DATE" property="addTime" />
     <result column="author" jdbcType="VARCHAR" property="author" />
+    <result column="version_id" jdbcType="VARCHAR" property="versionId" />
+    <result column="version_name" jdbcType="VARCHAR" property="versionName" />
   </resultMap>
 
   <sql id="Base_Column_List">
@@ -47,7 +49,7 @@
     node_cron, node_desc, node_name, node_of_flow_id, node_timeout, node_type, plugin_urls, 
     priority, remaining_count, repeat_count, retry_interval, routing_strategy, run_id, 
     run_param, run_source_desc, script_urls, source_principal, source_update_time, trigger_next_time, 
-    trigger_status,run_source,add_time,author
+    trigger_status,run_source,add_time,author,version_id,version_name
   </sql>
 
   <!--查询七秒内将要执行的数据-->
@@ -91,7 +93,7 @@
       routing_strategy, run_id, run_param, 
       run_source_desc, script_urls, source_principal, 
       source_update_time, trigger_next_time, trigger_status, 
-      run_source,add_time,author)
+      run_source,add_time,author,version_id,version_name)
     values (#{id,jdbcType=INTEGER}, #{nodeId,jdbcType=INTEGER}, #{alarmEmail,jdbcType=VARCHAR}, 
       #{blockStrategy,jdbcType=VARCHAR}, #{callbackToken,jdbcType=VARCHAR}, #{dependencyNodes,jdbcType=VARCHAR}, 
       #{failedRetryCount,jdbcType=INTEGER}, #{flowId,jdbcType=INTEGER}, #{followTaskFlow,jdbcType=CHAR}, 
@@ -103,7 +105,8 @@
       #{routingStrategy,jdbcType=VARCHAR}, #{runId,jdbcType=VARCHAR}, #{runParam,jdbcType=VARCHAR}, 
       #{runSourceDesc,jdbcType=VARCHAR}, #{scriptUrls,jdbcType=VARCHAR}, #{sourcePrincipal,jdbcType=VARCHAR}, 
       #{sourceUpdateTime,jdbcType=DATE}, #{triggerNextTime,jdbcType=BIGINT}, #{triggerStatus,jdbcType=CHAR}, 
-      #{runSource,jdbcType=LONGVARCHAR},#{addTime,jdbcType=DATE},#{author,jdbcType=VARCHAR})
+      #{runSource,jdbcType=LONGVARCHAR},#{addTime,jdbcType=DATE},#{author,jdbcType=VARCHAR},#{versionId,jdbcType=VARCHAR},
+      #{versionName,jdbcType=VARCHAR})
   </insert>
   <!--动态数据添加-->
   <insert id="insertSelective" parameterType="com.byit.model.JobTask">
@@ -217,6 +220,13 @@
       <if test="author != null">
         author,
       </if>
+
+      <if test="versionId != null">
+        version_id,
+      </if>
+      <if test="versionName != null">
+        version_name,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -327,6 +337,12 @@
       <if test="author != null">
         #{author,jdbcType=VARCHAR},
       </if>
+      <if test="versionId != null">
+        #{versionId,jdbcType=VARCHAR},
+      </if>
+      <if test="versionName != null">
+        #{versionName,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <!--动态修改-->
@@ -438,6 +454,12 @@
       <if test="author != null">
         author = #{author,jdbcType=VARCHAR},
       </if>
+      <if test="versionId != null">
+        version_id = #{versionId,jdbcType=VARCHAR},
+      </if>
+      <if test="versionName != null">
+        version_name = #{versionName,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>

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

@@ -271,7 +271,7 @@
         trigger_msg = #{triggerMsg,jdbcType=LONGVARCHAR},
       </if>
       <if test="jobVersionName != null">
-        jobVersionName = #{jobVersionName,jdbcType=VARCHAR},
+        job_version_name = #{jobVersionName,jdbcType=VARCHAR},
       </if>
     </set>
     where log_id = #{logId,jdbcType=INTEGER}
@@ -299,7 +299,8 @@
       trigger_code = #{triggerCode,jdbcType=VARCHAR},
       trigger_time = #{triggerTime,jdbcType=DATE},
       run_msg = #{runMsg,jdbcType=LONGVARCHAR},
-      trigger_msg = #{triggerMsg,jdbcType=LONGVARCHAR}
+      trigger_msg = #{triggerMsg,jdbcType=LONGVARCHAR},
+      job_version_name = #{jobVersionName,jdbcType=VARCHAR}
     where log_id = #{logId,jdbcType=INTEGER}
   </update>
 
@@ -323,7 +324,8 @@
       run_time = #{runTime,jdbcType=DATE},
       run_type = #{runType,jdbcType=CHAR},
       trigger_code = #{triggerCode,jdbcType=VARCHAR},
-      trigger_time = #{triggerTime,jdbcType=DATE}
+      trigger_time = #{triggerTime,jdbcType=DATE},
+      job_version_name = #{jobVersionName,jdbcType=VARCHAR}
     where log_id = #{logId,jdbcType=INTEGER}
   </update>
 </mapper>
\ No newline at end of file

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

@@ -40,6 +40,8 @@
     <result column="run_source" jdbcType="LONGVARCHAR" property="runSource" />
     <result column="add_time" jdbcType="DATE" property="addTime" />
     <result column="author" jdbcType="VARCHAR" property="author" />
+    <result column="version_id" jdbcType="VARCHAR" property="versionId" />
+    <result column="version_name" jdbcType="VARCHAR" property="versionName" />
   </resultMap>
 
   <sql id="Base_Column_List">
@@ -48,7 +50,7 @@
     mail_action, node_cron, node_desc, node_name, node_of_flow_id, node_timeout, node_type, 
     plugin_urls, priority, remaining_count, repeat_count, retry_interval, routing_strategy, 
     run_id, run_param, run_source_desc, script_urls, source_principal, source_update_time, 
-    trigger_next_time, trigger_status,run_source,add_time,author
+    trigger_next_time, trigger_status,run_source,add_time,author,version_id,version_name
   </sql>
   <!--查询五秒内将要执行的数据-->
   <select id="findJobTaskScheduleByTriggerNextTimeLessThanEqual" resultMap="BaseResultMap">
@@ -80,7 +82,7 @@
       retry_interval, routing_strategy, run_id, 
       run_param, run_source_desc, script_urls, 
       source_principal, source_update_time, trigger_next_time, 
-      trigger_status, run_source,add_time,author)
+      trigger_status, run_source,add_time,author,version_id,version_name)
     values (#{id,jdbcType=INTEGER}, #{nodeId,jdbcType=INTEGER}, #{alarmEmail,jdbcType=VARCHAR}, 
       #{blockStrategy,jdbcType=VARCHAR}, #{callbackToken,jdbcType=VARCHAR}, #{dependencyNodes,jdbcType=VARCHAR}, 
       #{failedRetryCount,jdbcType=INTEGER}, #{flowId,jdbcType=INTEGER}, #{followTaskFlow,jdbcType=CHAR}, 
@@ -92,7 +94,8 @@
       #{retryInterval,jdbcType=BIGINT}, #{routingStrategy,jdbcType=VARCHAR}, #{runId,jdbcType=VARCHAR}, 
       #{runParam,jdbcType=VARCHAR}, #{runSourceDesc,jdbcType=VARCHAR}, #{scriptUrls,jdbcType=VARCHAR}, 
       #{sourcePrincipal,jdbcType=VARCHAR}, #{sourceUpdateTime,jdbcType=DATE}, #{triggerNextTime,jdbcType=BIGINT}, 
-      #{triggerStatus,jdbcType=CHAR}, #{runSource,jdbcType=LONGVARCHAR},#{addTime,jdbcType=DATE},#{author,jdbcType=VARCHAR})
+      #{triggerStatus,jdbcType=CHAR}, #{runSource,jdbcType=LONGVARCHAR},#{addTime,jdbcType=DATE},#{author,jdbcType=VARCHAR},
+      #{versionId,jdbcType=VARCHAR}, #{versionName,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.byit.model.JobTaskSchedule">
     insert into job_task_schedule
@@ -208,6 +211,13 @@
       <if test="author != null">
         author,
       </if>
+      <if test="versionId != null">
+        version_id,
+      </if>
+      <if test="versionName != null">
+        version_name,
+      </if>
+
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -321,6 +331,12 @@
       <if test="author != null">
         #{author,jdbcType=VARCHAR},
       </if>
+      <if test="versionId != null">
+        #{versionId,jdbcType=VARCHAR},
+      </if>
+      <if test="versionName != null">
+        #{versionName,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
 
@@ -337,7 +353,7 @@
       retry_interval, routing_strategy, run_id,
       run_param, run_source_desc, script_urls,
       source_principal, source_update_time, trigger_next_time,
-      trigger_status,run_source,add_time,author)
+      trigger_status,run_source,add_time,author,version_id,version_name)
     values
       <foreach collection="jobTaskSchedules" item="jobTaskSchedule" separator =",">
         (#{jobTaskSchedule.id,jdbcType=INTEGER}, #{jobTaskSchedule.nodeId,jdbcType=INTEGER}, #{jobTaskSchedule.alarmEmail,jdbcType=VARCHAR},
@@ -352,7 +368,7 @@
         #{jobTaskSchedule.runParam,jdbcType=VARCHAR}, #{jobTaskSchedule.runSourceDesc,jdbcType=VARCHAR}, #{jobTaskSchedule.scriptUrls,jdbcType=VARCHAR},
         #{jobTaskSchedule.sourcePrincipal,jdbcType=VARCHAR}, #{jobTaskSchedule.sourceUpdateTime,jdbcType=DATE}, #{jobTaskSchedule.triggerNextTime,jdbcType=BIGINT},
         #{jobTaskSchedule.triggerStatus,jdbcType=CHAR}, #{jobTaskSchedule.runSource,jdbcType=LONGVARCHAR},#{jobTaskSchedule.addTime,jdbcType=DATE},
-        #{jobTaskSchedule.author,jdbcType=VARCHAR})
+        #{jobTaskSchedule.author,jdbcType=VARCHAR},#{jobTaskSchedule.versionId,jdbcType=VARCHAR}, #{jobTaskSchedule.versionName,jdbcType=VARCHAR})
       </foreach>
   </insert>
 
@@ -469,6 +485,13 @@
       <if test="author != null">
         author = #{author,jdbcType=VARCHAR},
       </if>
+
+      <if test="versionId != null">
+        version_id = #{versionId,jdbcType=VARCHAR},
+      </if>
+      <if test="versionName != null">
+        version_name = #{versionName,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>