支持不同的colspan

src/main/java/net/wicp/tams/app/duckula/controller/bean/models/RtdwFlinktask.java

@@ -27,19 +27,19 @@ public class RtdwFlinktask {
 	 * Database Column Remarks: task内存 This field was generated by MyBatis Generator. This field corresponds to the database column rtdw_flinktask.mem
 	 * @mbg.generated
 	 */
-	@TamsCol(value = "任务内存", save = 1, query = -1, showWidth = 100, orderby = 3,pageElement = PageElement.NumberBox,pageElementOpt = "{'min':128,'max':65536,'missingmsg':'内存在128M到64G之间'}")
+	@TamsCol(value = "任务内存", save = 1, query = -1, showWidth = 100, orderby = 3, pageElement = PageElement.NumberBox, pageElementOpt = "{'min':128,'max':65536,'missingmsg':'内存在128M到64G之间'}")
 	private Integer mem;
 	/**
 	 * Database Column Remarks: task需要CPU This field was generated by MyBatis Generator. This field corresponds to the database column rtdw_flinktask.cpu
 	 * @mbg.generated
 	 */
-	@TamsCol(value = "任务CPU", save = 1, query = -1, showWidth = 100, orderby = 4,pageElement = PageElement.NumberBox,pageElementOpt = "{'precision':2,'min':0,'max':32,'missingmsg':'cpu任务在0到32之间'}")
+	@TamsCol(value = "任务CPU", save = 1, query = -1, showWidth = 100, orderby = 4, pageElement = PageElement.NumberBox, pageElementOpt = "{'precision':2,'min':0,'max':32,'missingmsg':'cpu任务在0到32之间'}")
 	private Double cpu;
 	/**
 	 * Database Column Remarks: image仓库 This field was generated by MyBatis Generator. This field corresponds to the database column rtdw_flinktask.image_rep
 	 * @mbg.generated
 	 */
-	@TamsCol(value = "镜像仓库", save = 1, query = -1, orderby = 5)
+	@TamsCol(value = "镜像仓库", save = 1, query = -1, orderby = 5,colspan = 3)
 	private String imageRep;
 	/**
 	 * Database Column Remarks: image版本标签 This field was generated by MyBatis Generator. This field corresponds to the database column rtdw_flinktask.image_tag
@@ -57,15 +57,21 @@ public class RtdwFlinktask {
 	 * Database Column Remarks: 环境：开发/测试/预发/演示/生产 This field was generated by MyBatis Generator. This field corresponds to the database column rtdw_flinktask.env
 	 * @mbg.generated
 	 */
-	@TamsCol(value = "部署环境", save = -1, query = -1, orderby = 7) 
+	@TamsCol(value = "部署环境", save = -1, query = -1, orderby = 7)
 	private String env;
+	/**
+	 * Database Column Remarks: 用户执行程序保存的路径 This field was generated by MyBatis Generator. This field corresponds to the database column rtdw_flinktask.user_jar_path
+	 * @mbg.generated
+	 */
+	@TamsCol(value = "执行程序", save = 1, query = -1, showWidth = 100, orderby = 8, pageElement = PageElement.Upload, pageElementOpt = "{}")
+	private String userJarPath;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table rtdw_flinktask
 	 * @mbg.generated
 	 */
 	public RtdwFlinktask(Long id, String name, Integer mem, Double cpu, String imageRep, String imageTag,
-			String namespace, String env) {
+			String namespace, String env, String userJarPath) {
 		this.id = id;
 		this.name = name;
 		this.mem = mem;
@@ -74,6 +80,7 @@ public class RtdwFlinktask {
 		this.imageTag = imageTag;
 		this.namespace = namespace;
 		this.env = env;
+		this.userJarPath = userJarPath;
 	}
 
 	/**
@@ -227,4 +234,22 @@ public class RtdwFlinktask {
 	public void setEnv(String env) {
 		this.env = env;
 	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column rtdw_flinktask.user_jar_path
+	 * @return  the value of rtdw_flinktask.user_jar_path
+	 * @mbg.generated
+	 */
+	public String getUserJarPath() {
+		return userJarPath;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column rtdw_flinktask.user_jar_path
+	 * @param userJarPath  the value for rtdw_flinktask.user_jar_path
+	 * @mbg.generated
+	 */
+	public void setUserJarPath(String userJarPath) {
+		this.userJarPath = userJarPath;
+	}
 }
\ No newline at end of file

src/main/java/net/wicp/tams/app/duckula/controller/bean/models/RtdwFlinktaskExample.java

@@ -691,6 +691,76 @@ public class RtdwFlinktaskExample {
 			addCriterion("env not between", value1, value2, "env");
 			return (Criteria) this;
 		}
+
+		public Criteria andUserJarPathIsNull() {
+			addCriterion("user_jar_path is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andUserJarPathIsNotNull() {
+			addCriterion("user_jar_path is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andUserJarPathEqualTo(String value) {
+			addCriterion("user_jar_path =", value, "userJarPath");
+			return (Criteria) this;
+		}
+
+		public Criteria andUserJarPathNotEqualTo(String value) {
+			addCriterion("user_jar_path <>", value, "userJarPath");
+			return (Criteria) this;
+		}
+
+		public Criteria andUserJarPathGreaterThan(String value) {
+			addCriterion("user_jar_path >", value, "userJarPath");
+			return (Criteria) this;
+		}
+
+		public Criteria andUserJarPathGreaterThanOrEqualTo(String value) {
+			addCriterion("user_jar_path >=", value, "userJarPath");
+			return (Criteria) this;
+		}
+
+		public Criteria andUserJarPathLessThan(String value) {
+			addCriterion("user_jar_path <", value, "userJarPath");
+			return (Criteria) this;
+		}
+
+		public Criteria andUserJarPathLessThanOrEqualTo(String value) {
+			addCriterion("user_jar_path <=", value, "userJarPath");
+			return (Criteria) this;
+		}
+
+		public Criteria andUserJarPathLike(String value) {
+			addCriterion("user_jar_path like", value, "userJarPath");
+			return (Criteria) this;
+		}
+
+		public Criteria andUserJarPathNotLike(String value) {
+			addCriterion("user_jar_path not like", value, "userJarPath");
+			return (Criteria) this;
+		}
+
+		public Criteria andUserJarPathIn(List<String> values) {
+			addCriterion("user_jar_path in", values, "userJarPath");
+			return (Criteria) this;
+		}
+
+		public Criteria andUserJarPathNotIn(List<String> values) {
+			addCriterion("user_jar_path not in", values, "userJarPath");
+			return (Criteria) this;
+		}
+
+		public Criteria andUserJarPathBetween(String value1, String value2) {
+			addCriterion("user_jar_path between", value1, value2, "userJarPath");
+			return (Criteria) this;
+		}
+
+		public Criteria andUserJarPathNotBetween(String value1, String value2) {
+			addCriterion("user_jar_path not between", value1, value2, "userJarPath");
+			return (Criteria) this;
+		}
 	}
 
 	/**

src/main/java/net/wicp/tams/app/duckula/controller/dao/RtdwFlinktaskMapper.java

@@ -39,10 +39,11 @@ public interface RtdwFlinktaskMapper  extends BaseMapper<RtdwFlinktask>{
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table rtdw_flinktask
 	 * @mbg.generated
 	 */
-	@Insert({ "insert into rtdw_flinktask (id, name, ", "mem, cpu, image_rep, ", "image_tag, namespace, ", "env)",
-			"values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, ",
+	@Insert({ "insert into rtdw_flinktask (id, name, ", "mem, cpu, image_rep, ", "image_tag, namespace, ",
+			"env, user_jar_path)", "values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, ",
 			"#{mem,jdbcType=INTEGER}, #{cpu,jdbcType=DOUBLE}, #{imageRep,jdbcType=VARCHAR}, ",
-			"#{imageTag,jdbcType=VARCHAR}, #{namespace,jdbcType=VARCHAR}, ", "#{env,jdbcType=VARCHAR})" })
+			"#{imageTag,jdbcType=VARCHAR}, #{namespace,jdbcType=VARCHAR}, ",
+			"#{env,jdbcType=VARCHAR}, #{userJarPath,jdbcType=VARCHAR})" })
 	int insert(RtdwFlinktask record);
 
 	/**
@@ -61,8 +62,8 @@ public interface RtdwFlinktaskMapper  extends BaseMapper<RtdwFlinktask>{
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table rtdw_flinktask
 	 * @mbg.generated
 	 */
-	@Select({ "select", "id, name, mem, cpu, image_rep, image_tag, namespace, env", "from rtdw_flinktask",
-			"where id = #{id,jdbcType=BIGINT}" })
+	@Select({ "select", "id, name, mem, cpu, image_rep, image_tag, namespace, env, user_jar_path",
+			"from rtdw_flinktask", "where id = #{id,jdbcType=BIGINT}" })
 	@ResultMap("net.wicp.tams.app.duckula.controller.dao.RtdwFlinktaskMapper.BaseResultMap")
 	RtdwFlinktask selectByPrimaryKey(Long id);
 
@@ -91,6 +92,7 @@ public interface RtdwFlinktaskMapper  extends BaseMapper<RtdwFlinktask>{
 	@Update({ "update rtdw_flinktask", "set name = #{name,jdbcType=VARCHAR},", "mem = #{mem,jdbcType=INTEGER},",
 			"cpu = #{cpu,jdbcType=DOUBLE},", "image_rep = #{imageRep,jdbcType=VARCHAR},",
 			"image_tag = #{imageTag,jdbcType=VARCHAR},", "namespace = #{namespace,jdbcType=VARCHAR},",
-			"env = #{env,jdbcType=VARCHAR}", "where id = #{id,jdbcType=BIGINT}" })
+			"env = #{env,jdbcType=VARCHAR},", "user_jar_path = #{userJarPath,jdbcType=VARCHAR}",
+			"where id = #{id,jdbcType=BIGINT}" })
 	int updateByPrimaryKey(RtdwFlinktask record);
 }
\ No newline at end of file

src/main/java/net/wicp/tams/duckula/ops/pages/rtdw/FlinkTask.java

 package net.wicp.tams.duckula.ops.pages.rtdw;
 
+import java.io.File;
+import java.util.List;
+
 import org.apache.tapestry5.ioc.annotations.Inject;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -7,15 +10,22 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 import net.wicp.tams.app.duckula.controller.bean.models.RtdwFlinktask;
 import net.wicp.tams.app.duckula.controller.dao.RtdwFlinktaskMapper;
+import net.wicp.tams.component.services.IReq;
 import net.wicp.tams.duckula.ops.pages.ParentPageBean;
 
 public class FlinkTask extends ParentPageBean<RtdwFlinktask> {
 
 	@Inject
 	private RtdwFlinktaskMapper rtdwFlinktaskMapper;
+	
+	@Inject
+	private IReq req;
+
 
 	@Override
 	public void doSave(RtdwFlinktask t, boolean isInsert) {
+		List<File> saveUpload = req.saveUpload();
+		System.out.println(saveUpload);
 		if (isInsert) {
 			this.rtdwFlinktaskMapper.insert(t);
 		} else {

src/main/java/net/wicp/tams/duckula/ops/services/AppModule.java

@@ -25,6 +25,7 @@ import net.wicp.tams.common.Conf;
 import net.wicp.tams.common.jdbc.service.IProParam;
 import net.wicp.tams.common.thread.threadlocal.PerThreadValue;
 import net.wicp.tams.common.thread.threadlocal.PerthreadManager;
+import net.wicp.tams.component.SymbolConstantsCus;
 import net.wicp.tams.duckula.ops.ajax.AjaxImpl;
 import net.wicp.tams.duckula.ops.ajax.IAjax;
 import net.wicp.tams.duckula.ops.beans.SessionBean;
@@ -57,6 +58,9 @@ public class AppModule {
 		// useful
 		// in the early stages of development.
 		configuration.override(SymbolConstants.PRODUCTION_MODE, false);
+		//设置文件上传的目录
+		configuration.override(SymbolConstantsCus.PATH_FILE_UPLOAD_DIR, "abs:/data/user");
+		
 	}
 
 	public static void contributeApplicationDefaults(MappedConfiguration<String, Object> configuration) {

src/main/resources/mybatis/primary/sqlmap/RtdwFlinktaskMapper.xml

@@ -15,6 +15,7 @@
       <arg column="image_tag" javaType="java.lang.String" jdbcType="VARCHAR" />
       <arg column="namespace" javaType="java.lang.String" jdbcType="VARCHAR" />
       <arg column="env" javaType="java.lang.String" jdbcType="VARCHAR" />
+      <arg column="user_jar_path" javaType="java.lang.String" jdbcType="VARCHAR" />
     </constructor>
   </resultMap>
   <sql id="Example_Where_Clause">
@@ -88,7 +89,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    id, name, mem, cpu, image_rep, image_tag, namespace, env
+    id, name, mem, cpu, image_rep, image_tag, namespace, env, user_jar_path
   </sql>
   <select id="selectByExample" parameterType="net.wicp.tams.app.duckula.controller.bean.models.RtdwFlinktaskExample" resultMap="BaseResultMap">
     <!--
@@ -149,6 +150,9 @@
       <if test="env != null">
         env,
       </if>
+      <if test="userJarPath != null">
+        user_jar_path,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -175,6 +179,9 @@
       <if test="env != null">
         #{env,jdbcType=VARCHAR},
       </if>
+      <if test="userJarPath != null">
+        #{userJarPath,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="net.wicp.tams.app.duckula.controller.bean.models.RtdwFlinktaskExample" resultType="java.lang.Long">
@@ -218,6 +225,9 @@
       <if test="record.env != null">
         env = #{record.env,jdbcType=VARCHAR},
       </if>
+      <if test="record.userJarPath != null">
+        user_jar_path = #{record.userJarPath,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -236,7 +246,8 @@
       image_rep = #{record.imageRep,jdbcType=VARCHAR},
       image_tag = #{record.imageTag,jdbcType=VARCHAR},
       namespace = #{record.namespace,jdbcType=VARCHAR},
-      env = #{record.env,jdbcType=VARCHAR}
+      env = #{record.env,jdbcType=VARCHAR},
+      user_jar_path = #{record.userJarPath,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -269,6 +280,9 @@
       <if test="env != null">
         env = #{env,jdbcType=VARCHAR},
       </if>
+      <if test="userJarPath != null">
+        user_jar_path = #{userJarPath,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>