ソースを参照

Merge remote-tracking branch 'origin/master' into test

limin 7 年 前
コミット
79e9a2c30c

+ 1 - 0
src/main/java/com/goafanti/admin/controller/AdminVideoApiController.java

@@ -205,6 +205,7 @@ public class AdminVideoApiController extends CertifyApiController {
 			//删除原来远程的视频
 			deleteFtpVideo(oldVideo.getUrl());
 			
+			
 		}else{
 			video.setUrl(null);
 		}

+ 11 - 11
src/main/java/com/goafanti/common/dao/JtVideoMapper.java

@@ -12,69 +12,69 @@ public interface JtVideoMapper {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table jt_video
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	int countByExample(JtVideoExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table jt_video
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	int deleteByExample(JtVideoExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table jt_video
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	int deleteByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table jt_video
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	int insert(JtVideo record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table jt_video
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	int insertSelective(JtVideo record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table jt_video
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	List<JtVideo> selectByExample(JtVideoExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table jt_video
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	JtVideo selectByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table jt_video
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	int updateByExampleSelective(@Param("record") JtVideo record,
 			@Param("example") JtVideoExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table jt_video
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	int updateByExample(@Param("record") JtVideo record,
 			@Param("example") JtVideoExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table jt_video
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	int updateByPrimaryKeySelective(JtVideo record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table jt_video
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	int updateByPrimaryKey(JtVideo record);
 

+ 1 - 0
src/main/java/com/goafanti/common/enums/VideoFields.java

@@ -4,6 +4,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 public enum VideoFields {
+	
 	NAME("name", "视频名称"),
 	URL("url", "视频地址"),
 	TYPE("type", "视频类型"),

+ 42 - 27
src/main/java/com/goafanti/common/mapper/JtVideoMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Oct 30 20:16:39 CST 2018.
+      This element was generated on Fri Nov 02 16:14:39 CST 2018.
     -->
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="name" jdbcType="VARCHAR" property="name" />
@@ -19,12 +19,13 @@
     <result column="release_time" jdbcType="TIMESTAMP" property="releaseTime" />
     <result column="transcoding" jdbcType="INTEGER" property="transcoding" />
     <result column="md5" jdbcType="VARCHAR" property="md5" />
+    <result column="position" jdbcType="INTEGER" property="position" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Oct 30 20:16:39 CST 2018.
+      This element was generated on Fri Nov 02 16:14:39 CST 2018.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -58,7 +59,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Oct 30 20:16:39 CST 2018.
+      This element was generated on Fri Nov 02 16:14:39 CST 2018.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -92,16 +93,16 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Oct 30 20:16:39 CST 2018.
+      This element was generated on Fri Nov 02 16:14:39 CST 2018.
     -->
     id, name, url, type, owner, create_time, status, summary, cover_url, release_time, 
-    transcoding, md5
+    transcoding, md5, position
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.JtVideoExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Oct 30 20:16:39 CST 2018.
+      This element was generated on Fri Nov 02 16:14:39 CST 2018.
     -->
     select
     <if test="distinct">
@@ -120,7 +121,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Oct 30 20:16:39 CST 2018.
+      This element was generated on Fri Nov 02 16:14:39 CST 2018.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -131,7 +132,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Oct 30 20:16:39 CST 2018.
+      This element was generated on Fri Nov 02 16:14:39 CST 2018.
     -->
     delete from jt_video
     where id = #{id,jdbcType=VARCHAR}
@@ -140,7 +141,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Oct 30 20:16:39 CST 2018.
+      This element was generated on Fri Nov 02 16:14:39 CST 2018.
     -->
     delete from jt_video
     <if test="_parameter != null">
@@ -151,24 +152,24 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Oct 30 20:16:39 CST 2018.
+      This element was generated on Fri Nov 02 16:14:39 CST 2018.
     -->
     insert into jt_video (id, name, url, 
       type, owner, create_time, 
       status, summary, cover_url, 
-      release_time, transcoding, md5
-      )
+      release_time, transcoding, md5, 
+      position)
     values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{url,jdbcType=VARCHAR}, 
       #{type,jdbcType=INTEGER}, #{owner,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
       #{status,jdbcType=INTEGER}, #{summary,jdbcType=VARCHAR}, #{coverUrl,jdbcType=VARCHAR}, 
-      #{releaseTime,jdbcType=TIMESTAMP}, #{transcoding,jdbcType=INTEGER}, #{md5,jdbcType=VARCHAR}
-      )
+      #{releaseTime,jdbcType=TIMESTAMP}, #{transcoding,jdbcType=INTEGER}, #{md5,jdbcType=VARCHAR}, 
+      #{position,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.JtVideo">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Oct 30 20:16:39 CST 2018.
+      This element was generated on Fri Nov 02 16:14:39 CST 2018.
     -->
     insert into jt_video
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -208,6 +209,9 @@
       <if test="md5 != null">
         md5,
       </if>
+      <if test="position != null">
+        position,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -246,13 +250,16 @@
       <if test="md5 != null">
         #{md5,jdbcType=VARCHAR},
       </if>
+      <if test="position != null">
+        #{position,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.JtVideoExample" resultType="java.lang.Integer">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Oct 30 20:16:39 CST 2018.
+      This element was generated on Fri Nov 02 16:14:39 CST 2018.
     -->
     select count(*) from jt_video
     <if test="_parameter != null">
@@ -263,7 +270,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Oct 30 20:16:39 CST 2018.
+      This element was generated on Fri Nov 02 16:14:39 CST 2018.
     -->
     update jt_video
     <set>
@@ -303,6 +310,9 @@
       <if test="record.md5 != null">
         md5 = #{record.md5,jdbcType=VARCHAR},
       </if>
+      <if test="record.position != null">
+        position = #{record.position,jdbcType=INTEGER},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -312,7 +322,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Oct 30 20:16:39 CST 2018.
+      This element was generated on Fri Nov 02 16:14:39 CST 2018.
     -->
     update jt_video
     set id = #{record.id,jdbcType=VARCHAR},
@@ -326,7 +336,8 @@
       cover_url = #{record.coverUrl,jdbcType=VARCHAR},
       release_time = #{record.releaseTime,jdbcType=TIMESTAMP},
       transcoding = #{record.transcoding,jdbcType=INTEGER},
-      md5 = #{record.md5,jdbcType=VARCHAR}
+      md5 = #{record.md5,jdbcType=VARCHAR},
+      position = #{record.position,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -335,7 +346,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Oct 30 20:16:39 CST 2018.
+      This element was generated on Fri Nov 02 16:14:39 CST 2018.
     -->
     update jt_video
     <set>
@@ -372,6 +383,9 @@
       <if test="md5 != null">
         md5 = #{md5,jdbcType=VARCHAR},
       </if>
+      <if test="position != null">
+        position = #{position,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -379,7 +393,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Oct 30 20:16:39 CST 2018.
+      This element was generated on Fri Nov 02 16:14:39 CST 2018.
     -->
     update jt_video
     set name = #{name,jdbcType=VARCHAR},
@@ -392,15 +406,15 @@
       cover_url = #{coverUrl,jdbcType=VARCHAR},
       release_time = #{releaseTime,jdbcType=TIMESTAMP},
       transcoding = #{transcoding,jdbcType=INTEGER},
-      md5 = #{md5,jdbcType=VARCHAR}
+      md5 = #{md5,jdbcType=VARCHAR},
+      position = #{position,jdbcType=INTEGER}
     where id = #{id,jdbcType=VARCHAR}
   </update>
-  
   <!-- 查看视频列表 -->
   <select id="getVideoListBySome" parameterType="java.util.Map" resultType="com.goafanti.admin.bo.AdminVideoBo">
   	select  
   	v.id, v.name, url, type, owner, v.create_time as createTime, v.status, summary, cover_url as coverUrl, 
-  	release_time as releaseTime, transcoding, md5, a.name as ownerName  
+  	release_time as releaseTime, transcoding, md5, v.position, a.name as ownerName  
   	from jt_video v
 	left join admin a on v.owner = a.id
   	where 1=1
@@ -470,7 +484,7 @@
    <select id="selectById" parameterType="java.lang.String" resultType="com.goafanti.admin.bo.AdminVideoBo">
     select 
     v.id, v.name, url, type, owner, v.create_time as createTime, v.status, summary, cover_url as coverUrl, 
-    release_time as releaseTime, transcoding, md5, a.name as ownerName  
+    release_time as releaseTime, transcoding, md5, v.position, a.name as ownerName  
   	from jt_video v
 	left join admin a on v.owner = a.id
     where v.id = #{id,jdbcType=VARCHAR}
@@ -510,12 +524,12 @@
   <select id="getIndexVideo" parameterType="java.lang.String" resultType="com.goafanti.admin.bo.AdminVideoBo">
   select 
     id, name, url, type, owner, create_time as createTime, status, summary, cover_url as coverUrl, 
-    release_time as releaseTime, transcoding, md5
+    release_time as releaseTime, transcoding, md5, position
   	from jt_video
     where 
     transcoding = 2
     and status = 1
-    and summary = #{_parameter,jdbcType=VARCHAR}
+    and position = 1
     order by release_time desc
     limit 1
   </select>
@@ -535,4 +549,5 @@
     and id &lt;&gt; #{_parameter,jdbcType=VARCHAR}
     order by release_time desc
   </select>
+  
 </mapper>

+ 73 - 43
src/main/java/com/goafanti/common/model/JtVideo.java

@@ -12,82 +12,94 @@ public class JtVideo {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column jt_video.id
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
-	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR
+			+ "}")
 	private String id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column jt_video.name
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
-	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR
+			+ "}")
 	private String name;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column jt_video.url
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
-	@Size(min = 0, max = 64, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	@Size(min = 0, max = 64, message = "{" + ErrorConstants.PARAM_SIZE_ERROR
+			+ "}")
 	private String url;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column jt_video.type
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	@Max(value = 3, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer type;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column jt_video.owner
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
-	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR
+			+ "}")
 	private String owner;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column jt_video.create_time
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	private Date createTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column jt_video.status
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	@Max(value = 3, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer status;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column jt_video.summary
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
-	@Size(min = 0, max = 512, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	@Size(min = 0, max = 512, message = "{" + ErrorConstants.PARAM_SIZE_ERROR
+			+ "}")
 	private String summary;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column jt_video.cover_url
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
-	@Size(min = 0, max = 64, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	@Size(min = 0, max = 64, message = "{" + ErrorConstants.PARAM_SIZE_ERROR
+			+ "}")
 	private String coverUrl;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column jt_video.release_time
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	private Date releaseTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column jt_video.transcoding
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	@Max(value = 2, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer transcoding;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column jt_video.md5
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
-	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR
+			+ "}")
 	private String md5;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column jt_video.position
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
+	 */
+	private Integer position;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column jt_video.id
 	 * @return  the value of jt_video.id
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public String getId() {
 		return id;
@@ -96,7 +108,7 @@ public class JtVideo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column jt_video.id
 	 * @param id  the value for jt_video.id
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public void setId(String id) {
 		this.id = id;
@@ -105,7 +117,7 @@ public class JtVideo {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column jt_video.name
 	 * @return  the value of jt_video.name
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public String getName() {
 		return name;
@@ -114,7 +126,7 @@ public class JtVideo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column jt_video.name
 	 * @param name  the value for jt_video.name
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public void setName(String name) {
 		this.name = name;
@@ -123,7 +135,7 @@ public class JtVideo {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column jt_video.url
 	 * @return  the value of jt_video.url
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public String getUrl() {
 		return url;
@@ -132,7 +144,7 @@ public class JtVideo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column jt_video.url
 	 * @param url  the value for jt_video.url
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public void setUrl(String url) {
 		this.url = url;
@@ -141,7 +153,7 @@ public class JtVideo {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column jt_video.type
 	 * @return  the value of jt_video.type
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public Integer getType() {
 		return type;
@@ -150,7 +162,7 @@ public class JtVideo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column jt_video.type
 	 * @param type  the value for jt_video.type
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public void setType(Integer type) {
 		this.type = type;
@@ -159,7 +171,7 @@ public class JtVideo {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column jt_video.owner
 	 * @return  the value of jt_video.owner
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public String getOwner() {
 		return owner;
@@ -168,7 +180,7 @@ public class JtVideo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column jt_video.owner
 	 * @param owner  the value for jt_video.owner
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public void setOwner(String owner) {
 		this.owner = owner;
@@ -177,7 +189,7 @@ public class JtVideo {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column jt_video.create_time
 	 * @return  the value of jt_video.create_time
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -186,7 +198,7 @@ public class JtVideo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column jt_video.create_time
 	 * @param createTime  the value for jt_video.create_time
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -195,7 +207,7 @@ public class JtVideo {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column jt_video.status
 	 * @return  the value of jt_video.status
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public Integer getStatus() {
 		return status;
@@ -204,7 +216,7 @@ public class JtVideo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column jt_video.status
 	 * @param status  the value for jt_video.status
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public void setStatus(Integer status) {
 		this.status = status;
@@ -213,7 +225,7 @@ public class JtVideo {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column jt_video.summary
 	 * @return  the value of jt_video.summary
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public String getSummary() {
 		return summary;
@@ -222,7 +234,7 @@ public class JtVideo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column jt_video.summary
 	 * @param summary  the value for jt_video.summary
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public void setSummary(String summary) {
 		this.summary = summary;
@@ -231,7 +243,7 @@ public class JtVideo {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column jt_video.cover_url
 	 * @return  the value of jt_video.cover_url
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public String getCoverUrl() {
 		return coverUrl;
@@ -240,7 +252,7 @@ public class JtVideo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column jt_video.cover_url
 	 * @param coverUrl  the value for jt_video.cover_url
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public void setCoverUrl(String coverUrl) {
 		this.coverUrl = coverUrl;
@@ -249,7 +261,7 @@ public class JtVideo {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column jt_video.release_time
 	 * @return  the value of jt_video.release_time
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public Date getReleaseTime() {
 		return releaseTime;
@@ -258,7 +270,7 @@ public class JtVideo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column jt_video.release_time
 	 * @param releaseTime  the value for jt_video.release_time
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public void setReleaseTime(Date releaseTime) {
 		this.releaseTime = releaseTime;
@@ -267,7 +279,7 @@ public class JtVideo {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column jt_video.transcoding
 	 * @return  the value of jt_video.transcoding
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public Integer getTranscoding() {
 		return transcoding;
@@ -276,7 +288,7 @@ public class JtVideo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column jt_video.transcoding
 	 * @param transcoding  the value for jt_video.transcoding
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public void setTranscoding(Integer transcoding) {
 		this.transcoding = transcoding;
@@ -285,7 +297,7 @@ public class JtVideo {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column jt_video.md5
 	 * @return  the value of jt_video.md5
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public String getMd5() {
 		return md5;
@@ -294,9 +306,27 @@ public class JtVideo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column jt_video.md5
 	 * @param md5  the value for jt_video.md5
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public void setMd5(String md5) {
 		this.md5 = md5;
 	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column jt_video.position
+	 * @return  the value of jt_video.position
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
+	 */
+	public Integer getPosition() {
+		return position;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column jt_video.position
+	 * @param position  the value for jt_video.position
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
+	 */
+	public void setPosition(Integer position) {
+		this.position = position;
+	}
 }

+ 76 - 16
src/main/java/com/goafanti/common/model/JtVideoExample.java

@@ -7,23 +7,23 @@ import java.util.List;
 public class JtVideoExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table jt_video
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table jt_video
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table jt_video
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table jt_video
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public JtVideoExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -31,7 +31,7 @@ public class JtVideoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table jt_video
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -39,7 +39,7 @@ public class JtVideoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table jt_video
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -47,7 +47,7 @@ public class JtVideoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table jt_video
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -55,7 +55,7 @@ public class JtVideoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table jt_video
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -63,7 +63,7 @@ public class JtVideoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table jt_video
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -71,7 +71,7 @@ public class JtVideoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table jt_video
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -79,7 +79,7 @@ public class JtVideoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table jt_video
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -89,7 +89,7 @@ public class JtVideoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table jt_video
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -101,7 +101,7 @@ public class JtVideoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table jt_video
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -110,7 +110,7 @@ public class JtVideoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table jt_video
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -120,7 +120,7 @@ public class JtVideoExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table jt_video
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -959,11 +959,71 @@ public class JtVideoExample {
 			addCriterion("md5 not between", value1, value2, "md5");
 			return (Criteria) this;
 		}
+
+		public Criteria andPositionIsNull() {
+			addCriterion("position is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andPositionIsNotNull() {
+			addCriterion("position is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andPositionEqualTo(Integer value) {
+			addCriterion("position =", value, "position");
+			return (Criteria) this;
+		}
+
+		public Criteria andPositionNotEqualTo(Integer value) {
+			addCriterion("position <>", value, "position");
+			return (Criteria) this;
+		}
+
+		public Criteria andPositionGreaterThan(Integer value) {
+			addCriterion("position >", value, "position");
+			return (Criteria) this;
+		}
+
+		public Criteria andPositionGreaterThanOrEqualTo(Integer value) {
+			addCriterion("position >=", value, "position");
+			return (Criteria) this;
+		}
+
+		public Criteria andPositionLessThan(Integer value) {
+			addCriterion("position <", value, "position");
+			return (Criteria) this;
+		}
+
+		public Criteria andPositionLessThanOrEqualTo(Integer value) {
+			addCriterion("position <=", value, "position");
+			return (Criteria) this;
+		}
+
+		public Criteria andPositionIn(List<Integer> values) {
+			addCriterion("position in", values, "position");
+			return (Criteria) this;
+		}
+
+		public Criteria andPositionNotIn(List<Integer> values) {
+			addCriterion("position not in", values, "position");
+			return (Criteria) this;
+		}
+
+		public Criteria andPositionBetween(Integer value1, Integer value2) {
+			addCriterion("position between", value1, value2, "position");
+			return (Criteria) this;
+		}
+
+		public Criteria andPositionNotBetween(Integer value1, Integer value2) {
+			addCriterion("position not between", value1, value2, "position");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table jt_video
-	 * @mbggenerated  Tue Oct 30 20:16:39 CST 2018
+	 * @mbggenerated  Fri Nov 02 16:14:39 CST 2018
 	 */
 	public static class Criterion {
 		private String condition;

File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/service/serviceDetails.html


+ 2 - 2
src/main/webapp/WEB-INF/views/portal/video/video.html

@@ -51,7 +51,7 @@
                 <span class="totalCount">共0条数据</span>
             </nav>
 		</div>
-		<div class="videoPlay">
+		<!-- <div class="videoPlay">
 			<div class="videoTopM">
 				<span class="glyphicon glyphicon-remove"></span>	
 				<span class="videoPre">播放上一个</span>
@@ -62,7 +62,7 @@
 					</video>
 				</div>
 			</div>
-		</div>	
+		</div>	 -->
 		<!-- 下面是公共底部 -->	
 		<footer>
         <div th:replace="common::copyright"></div>