直播审核入库

liwei2917
1 parent 7ee64010
Showing 3 changed files with 17 additions and 24 deletions
src/main/java/com/cnlive/shenhe/api/LiveControllerApi.java
src/main/java/com/cnlive/shenhe/entity/ShyLive.java
src/main/resources/mapper/ShyLiveMapper.xml
@@ -12,6 +12,7 @@ import com.cnlive.shenhe.serviceImpl.VideosServiceImpl;
 import com.cnlive.shenhe.utils.AntiFraudUtil;
 import com.cnlive.shenhe.utils.CommonUtils;
+import java.sql.Timestamp;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -65,12 +66,12 @@ public class LiveControllerApi {
         String startTime = json.getString("startTime");//开始时间
         Date timestamp_start =null;
         if (CommonUtils.isNotEmpty(startTime)) {
-             timestamp_start = new Date(Long.valueOf(startTime));
+             timestamp_start = new Timestamp(Long.valueOf(startTime));
         }
         String endTime = json.getString("endTime");//结束时间
         Date timestamp_end =null;
         if (CommonUtils.isNotEmpty(endTime)) {
-        	 timestamp_end = new Date(Long.valueOf(endTime));
+        	 timestamp_end = new Timestamp(Long.valueOf(endTime));
         }
         ShyLive shylive1 = new ShyLive();
@@ -82,15 +83,16 @@ public class LiveControllerApi {
         if (listshyLive.size() > 0) {
         	ShyLive shyLive = listshyLive.get(0);
             //封装数据入库
+        	shylive1.setSp_id(spId);//设置spid
         	shyLive.setActivity_name(activityName);//设置直播活动名称
         	shyLive.setActivity_status(activityStatus);//设置直播活动状态
         	if(activityStatus==3){//发布直播
         		shyLive.setActivity_start_time(timestamp_start);
-        		shyLive.setAvsample_end_time(timestamp_end);
+        		shyLive.setActivity_end_time(timestamp_end);
         	}else if(activityStatus==1){//启动直播
         			shyLive.setActivity_start_time(CommonUtils.getCurrentTime());
         	}else if(activityStatus==2){//停止直播
-        			shyLive.setAvsample_end_time(CommonUtils.getCurrentTime());
+        			shyLive.setActivity_end_time(CommonUtils.getCurrentTime());
         			shyLive.setPlayback_url(playbackUrl);//回放地址
         			shyLive.setShenhe_state(3);//状态 1:未认领 2.已领未审,3:已审通过,4:已审拒绝
         	}
@@ -120,13 +122,13 @@ public class LiveControllerApi {
         	shylive1.setShenhe_state(1);//状态 1:未认领 2.已领未审,3:已审通过,4:已审拒绝
         	if(activityStatus==3){//发布直播
         		shylive1.setActivity_start_time(timestamp_start);
-        		shylive1.setAvsample_end_time(timestamp_end);
+        		shylive1.setActivity_end_time(timestamp_end);
         	}else if(activityStatus==1){//启动直播
         		shylive1.setActivity_start_time(CommonUtils.getCurrentTime());
-        		shylive1.setAvsample_end_time(timestamp_end);
+        		shylive1.setActivity_end_time(timestamp_end);
         	}else if(activityStatus==2){//停止直播
         		shylive1.setActivity_start_time(timestamp_start);
-        		shylive1.setAvsample_end_time(CommonUtils.getCurrentTime());
+        		shylive1.setActivity_end_time(CommonUtils.getCurrentTime());
         		shylive1.setPlayback_url(playbackUrl);//回放地址
         		shylive1.setShenhe_state(3);//状态 1:未认领 2.已领未审,3:已审通过,4:已审拒绝
         	}
@@ -165,15 +167,6 @@ public class LiveControllerApi {
 	}
-	 
-	 
-	 
-	 
-	 
-	 
-	 
-	 
-
     @RequestMapping(value = "callbackLiveResult", method = RequestMethod.POST)
     @ResponseBody
     public void getFilterVideoResult(@RequestBody String json) {
@@ -41,7 +41,7 @@ public class ShyLive {
     /**
      * 直播活动结束时间
      */
-    private String activity_end_time;
+    private Date activity_end_time;
     /**
      * 直播活动简介
@@ -224,18 +224,18 @@ public class ShyLive {
     }
     /**
-     * 获取直播活动状态，1:直播中，2:直播完成，3:待直播，4:直播撤销
+     * 获取直播活动状态，1:直播中，2:直播完成，3:待直播，0:直播撤销
      *
-     * @return activity_status - 直播活动状态，1:直播中，2:直播完成，3:待直播，4:直播撤销
+     * @return activity_status - 直播活动状态，1:直播中，2:直播完成，3:待直播，0:直播撤销
      */
     public Integer getActivity_status() {
         return activity_status;
     }
     /**
-     * 设置直播活动状态，1:直播中，2:直播完成，3:待直播，4:直播撤销
+     * 设置直播活动状态，1:直播中，2:直播完成，3:待直播，0:直播撤销
      *
-     * @param activity_status 直播活动状态，1:直播中，2:直播完成，3:待直播，4:直播撤销
+     * @param activity_status 直播活动状态，1:直播中，2:直播完成，3:待直播，0:直播撤销
      */
     public void setActivity_status(Integer activity_status) {
         this.activity_status = activity_status;
@@ -264,7 +264,7 @@ public class ShyLive {
      *
      * @return activity_end_time - 直播活动结束时间
      */
-    public String getActivity_end_time() {
+    public Date getActivity_end_time() {
         return activity_end_time;
     }
@@ -273,7 +273,7 @@ public class ShyLive {
      *
      * @param activity_end_time 直播活动结束时间
      */
-    public void setActivity_end_time(String activity_end_time) {
+    public void setActivity_end_time(Date activity_end_time) {
         this.activity_end_time = activity_end_time;
     }
@@ -12,7 +12,7 @@
     <result column="activity_name" jdbcType="VARCHAR" property="activity_name" />
     <result column="activity_status" jdbcType="INTEGER" property="activity_status" />
     <result column="activity_start_time" jdbcType="TIMESTAMP" property="activity_start_time" />
-    <result column="activity_end_time" jdbcType="VARCHAR" property="activity_end_time" />
+    <result column="activity_end_time" jdbcType="TIMESTAMP" property="activity_end_time" />
     <result column="activity_intro" jdbcType="VARCHAR" property="activity_intro" />
     <result column="m3u8_url" jdbcType="VARCHAR" property="m3u8_url" />
     <result column="rtmp_url" jdbcType="VARCHAR" property="rtmp_url" />