Merge branch 'pt' of dd.tall.wiki:ccsens_wiki/ccsenscloud into pt

mt/src/main/java/com/ccsens/mt/bean/po/CompeteProjectConfig.java

@@ -26,7 +26,7 @@ public class CompeteProjectConfig implements Serializable {
 
     private Long videoEndTime;
 
-    private Byte restrict;
+    private Byte videoRestrict;
 
     private static final long serialVersionUID = 1L;
 
@@ -118,12 +118,12 @@ public class CompeteProjectConfig implements Serializable {
         this.videoEndTime = videoEndTime;
     }
 
-    public Byte getRestrict() {
-        return restrict;
+    public Byte getVideoRestrict() {
+        return videoRestrict;
     }
 
-    public void setRestrict(Byte restrict) {
-        this.restrict = restrict;
+    public void setVideoRestrict(Byte videoRestrict) {
+        this.videoRestrict = videoRestrict;
     }
 
     @Override
@@ -143,7 +143,7 @@ public class CompeteProjectConfig implements Serializable {
         sb.append(", recStatus=").append(recStatus);
         sb.append(", videoStartTime=").append(videoStartTime);
         sb.append(", videoEndTime=").append(videoEndTime);
-        sb.append(", restrict=").append(restrict);
+        sb.append(", videoRestrict=").append(videoRestrict);
         sb.append("]");
         return sb.toString();
     }

mt/src/main/java/com/ccsens/mt/bean/po/CompeteProjectConfigExample.java

@@ -765,63 +765,63 @@ public class CompeteProjectConfigExample {
             return (Criteria) this;
         }
 
-        public Criteria andRestrictIsNull() {
-            addCriterion("restrict is null");
+        public Criteria andVideoRestrictIsNull() {
+            addCriterion("video_restrict is null");
             return (Criteria) this;
         }
 
-        public Criteria andRestrictIsNotNull() {
-            addCriterion("restrict is not null");
+        public Criteria andVideoRestrictIsNotNull() {
+            addCriterion("video_restrict is not null");
             return (Criteria) this;
         }
 
-        public Criteria andRestrictEqualTo(Byte value) {
-            addCriterion("restrict =", value, "restrict");
+        public Criteria andVideoRestrictEqualTo(Byte value) {
+            addCriterion("video_restrict =", value, "videoRestrict");
             return (Criteria) this;
         }
 
-        public Criteria andRestrictNotEqualTo(Byte value) {
-            addCriterion("restrict <>", value, "restrict");
+        public Criteria andVideoRestrictNotEqualTo(Byte value) {
+            addCriterion("video_restrict <>", value, "videoRestrict");
             return (Criteria) this;
         }
 
-        public Criteria andRestrictGreaterThan(Byte value) {
-            addCriterion("restrict >", value, "restrict");
+        public Criteria andVideoRestrictGreaterThan(Byte value) {
+            addCriterion("video_restrict >", value, "videoRestrict");
             return (Criteria) this;
         }
 
-        public Criteria andRestrictGreaterThanOrEqualTo(Byte value) {
-            addCriterion("restrict >=", value, "restrict");
+        public Criteria andVideoRestrictGreaterThanOrEqualTo(Byte value) {
+            addCriterion("video_restrict >=", value, "videoRestrict");
             return (Criteria) this;
         }
 
-        public Criteria andRestrictLessThan(Byte value) {
-            addCriterion("restrict <", value, "restrict");
+        public Criteria andVideoRestrictLessThan(Byte value) {
+            addCriterion("video_restrict <", value, "videoRestrict");
             return (Criteria) this;
         }
 
-        public Criteria andRestrictLessThanOrEqualTo(Byte value) {
-            addCriterion("restrict <=", value, "restrict");
+        public Criteria andVideoRestrictLessThanOrEqualTo(Byte value) {
+            addCriterion("video_restrict <=", value, "videoRestrict");
             return (Criteria) this;
         }
 
-        public Criteria andRestrictIn(List<Byte> values) {
-            addCriterion("restrict in", values, "restrict");
+        public Criteria andVideoRestrictIn(List<Byte> values) {
+            addCriterion("video_restrict in", values, "videoRestrict");
             return (Criteria) this;
         }
 
-        public Criteria andRestrictNotIn(List<Byte> values) {
-            addCriterion("restrict not in", values, "restrict");
+        public Criteria andVideoRestrictNotIn(List<Byte> values) {
+            addCriterion("video_restrict not in", values, "videoRestrict");
             return (Criteria) this;
         }
 
-        public Criteria andRestrictBetween(Byte value1, Byte value2) {
-            addCriterion("restrict between", value1, value2, "restrict");
+        public Criteria andVideoRestrictBetween(Byte value1, Byte value2) {
+            addCriterion("video_restrict between", value1, value2, "videoRestrict");
             return (Criteria) this;
         }
 
-        public Criteria andRestrictNotBetween(Byte value1, Byte value2) {
-            addCriterion("restrict not between", value1, value2, "restrict");
+        public Criteria andVideoRestrictNotBetween(Byte value1, Byte value2) {
+            addCriterion("video_restrict not between", value1, value2, "videoRestrict");
             return (Criteria) this;
         }
     }

mt/src/main/java/com/ccsens/mt/service/CompeteService.java

@@ -72,6 +72,7 @@ public class CompeteService implements ICompeteService {
     private CompeteProjectMapper competeProjectMapper;
     @Resource
     private CompeteProjectPlayerMapper competeProjectPlayerMapper;
+
     @Resource
     private CompeteGroupMapper competeGroupMapper;
     @Resource

mt/src/main/resources/mapper_raw/CompeteProjectConfigMapper.xml

@@ -13,7 +13,7 @@
     <result column="rec_status" jdbcType="TINYINT" property="recStatus" />
     <result column="video_start_time" jdbcType="BIGINT" property="videoStartTime" />
     <result column="video_end_time" jdbcType="BIGINT" property="videoEndTime" />
-    <result column="restrict" jdbcType="TINYINT" property="restrict" />
+    <result column="video_restrict" jdbcType="TINYINT" property="videoRestrict" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -75,7 +75,7 @@
   </sql>
   <sql id="Base_Column_List">
     id, project_id, project_duration, site_num, start_time, end_time, created_at, updated_at, 
-    rec_status, video_start_time, video_end_time, restrict
+    rec_status, video_start_time, video_end_time, video_restrict
   </sql>
   <select id="selectByExample" parameterType="com.ccsens.mt.bean.po.CompeteProjectConfigExample" resultMap="BaseResultMap">
     select
@@ -111,12 +111,12 @@
     insert into t_compete_project_config (id, project_id, project_duration, 
       site_num, start_time, end_time, 
       created_at, updated_at, rec_status, 
-      video_start_time, video_end_time, restrict
+      video_start_time, video_end_time, video_restrict
       )
     values (#{id,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT}, #{projectDuration,jdbcType=BIGINT}, 
       #{siteNum,jdbcType=INTEGER}, #{startTime,jdbcType=BIGINT}, #{endTime,jdbcType=BIGINT}, 
       #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}, 
-      #{videoStartTime,jdbcType=BIGINT}, #{videoEndTime,jdbcType=BIGINT}, #{restrict,jdbcType=TINYINT}
+      #{videoStartTime,jdbcType=BIGINT}, #{videoEndTime,jdbcType=BIGINT}, #{videoRestrict,jdbcType=TINYINT}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.ccsens.mt.bean.po.CompeteProjectConfig">
@@ -155,8 +155,8 @@
       <if test="videoEndTime != null">
         video_end_time,
       </if>
-      <if test="restrict != null">
-        restrict,
+      <if test="videoRestrict != null">
+        video_restrict,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -193,8 +193,8 @@
       <if test="videoEndTime != null">
         #{videoEndTime,jdbcType=BIGINT},
       </if>
-      <if test="restrict != null">
-        #{restrict,jdbcType=TINYINT},
+      <if test="videoRestrict != null">
+        #{videoRestrict,jdbcType=TINYINT},
       </if>
     </trim>
   </insert>
@@ -240,8 +240,8 @@
       <if test="record.videoEndTime != null">
         video_end_time = #{record.videoEndTime,jdbcType=BIGINT},
       </if>
-      <if test="record.restrict != null">
-        restrict = #{record.restrict,jdbcType=TINYINT},
+      <if test="record.videoRestrict != null">
+        video_restrict = #{record.videoRestrict,jdbcType=TINYINT},
       </if>
     </set>
     <if test="_parameter != null">
@@ -261,7 +261,7 @@
       rec_status = #{record.recStatus,jdbcType=TINYINT},
       video_start_time = #{record.videoStartTime,jdbcType=BIGINT},
       video_end_time = #{record.videoEndTime,jdbcType=BIGINT},
-      restrict = #{record.restrict,jdbcType=TINYINT}
+      video_restrict = #{record.videoRestrict,jdbcType=TINYINT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -299,8 +299,8 @@
       <if test="videoEndTime != null">
         video_end_time = #{videoEndTime,jdbcType=BIGINT},
       </if>
-      <if test="restrict != null">
-        restrict = #{restrict,jdbcType=TINYINT},
+      <if test="videoRestrict != null">
+        video_restrict = #{videoRestrict,jdbcType=TINYINT},
       </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
@@ -317,7 +317,7 @@
       rec_status = #{recStatus,jdbcType=TINYINT},
       video_start_time = #{videoStartTime,jdbcType=BIGINT},
       video_end_time = #{videoEndTime,jdbcType=BIGINT},
-      restrict = #{restrict,jdbcType=TINYINT}
+      video_restrict = #{videoRestrict,jdbcType=TINYINT}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>