更改审核流程，增加审核类型（免审、机审、人审）

liwei2917
1 parent 1ccf4c3d
Showing 15 changed files with 376 additions and 87 deletions
src/main/java/com/cnlive/shenhe/api/VideosControllerApi.java
src/main/java/com/cnlive/shenhe/entity/ShyComments.java
src/main/java/com/cnlive/shenhe/entity/ShySites.java
src/main/java/com/cnlive/shenhe/entity/ShyUsersfree.java
src/main/java/com/cnlive/shenhe/entity/ShyVideofilter.java
src/main/java/com/cnlive/shenhe/entity/ShyVideos.java
src/main/java/com/cnlive/shenhe/job/VideosJob.java
src/main/java/com/cnlive/shenhe/mapper/ShyUsersfreeMapper.java
src/main/java/com/cnlive/shenhe/serviceImpl/SitesServiceImpl.java
src/main/java/com/cnlive/shenhe/serviceImpl/UsersfreeServiceImpl.java
src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java
src/main/java/com/cnlive/shenhe/utils/CommonConst.java
src/main/resources/mapper/ShyUsersfreeMapper.xml
src/main/resources/mapper/ShyVideofilterMapper.xml
src/main/resources/mapper/ShyVideosMapper.xml
@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.cnlive.shenhe.bean.ErrorEnum;
 import com.cnlive.shenhe.bean.ResponseBean;
 import com.cnlive.shenhe.entity.ShyVideos;
+import com.cnlive.shenhe.serviceImpl.SitesServiceImpl;
 import com.cnlive.shenhe.serviceImpl.UsersServiceImpl;
 import com.cnlive.shenhe.serviceImpl.VideosServiceImpl;
 import com.cnlive.shenhe.utils.AuditPass;
@@ -41,6 +42,8 @@ public class VideosControllerApi {
     VideosServiceImpl videosService;
     @Autowired
     UsersServiceImpl usersService;
+    @Autowired
+    SitesServiceImpl sitesService;
     @Value("${avsmple_appKey}")
     String appkey;
@@ -76,6 +79,13 @@ public class VideosControllerApi {
         if (CommonUtils.isNotNull(duration)) duration = duration / 1000;
         //获取栏目分类  
         String category=CommonUtils.isEmpty(json.getString("multiplecategory"))?"":json.getString("multiplecategory");
+        //获取视频上传人的id
+        String sid=CommonUtils.isEmpty(json.getString("videoClipsName"))?"":json.getString("videoClipsName");
+        sid=CommonUtils.isEmpty(sid)?"":sid.split("_")[2];
+        //初始化一个审核状态
+//        Integer shenheType=3;//审核类型，1:免审，2:机审，3:人工审
+//        shenheType=videosService.getShenheType(json.getInteger("spId"),category,sid);
+        
         //查询一下 存在，更新 没有，插入
         List<ShyVideos> listshyVideos = videosService.findshyVideo(shyVideos1);
         if (listshyVideos.size() > 0) {
@@ -102,6 +112,8 @@ public class VideosControllerApi {
             shyVideos.setPlat(json.getInteger("bucketType"));
             shyVideos.setDuration(duration);
             shyVideos.setCategory(category);//传入栏目分类
+            shyVideos.setVideo_user_id(sid);//传入sid
+            videosService.getShenheType(shyVideos);//获取审核类型
             boolean YorN = videosService.updateshyVideos(shyVideos);
             if (YorN == true) {
                 return new ResponseBean(ErrorEnum.SUCCESS);
@@ -134,15 +146,18 @@ public class VideosControllerApi {
         shyVideos1.setPlat(json.getInteger("bucketType"));
         shyVideos1.setDuration(duration);
         shyVideos1.setCategory(category);//传入栏目分类
+        shyVideos1.setVideo_user_id(sid);//传入sid
+        videosService.getShenheType(shyVideos1);//获取审核类型
-        
-        if(!(category).equals(CommonConst.CATEGORY_WITNESS)){//如果当前栏目分类不是“目击者”，按照原有规则
+        if(shyVideos1.getShenhe_type()==CommonConst.AUDIT_TYPE_USER){//如果审核类型是人工审核，按照原有规则
         	if (CommonUtils.isNotNull(duration) && duration > 80) {
         		shyVideos1 = avsample(shyVideos1);//视频至少可以抽8张，请求抽帧
         	}
-        }else{
-        	if (CommonUtils.isNotNull(duration) ) {//"目击者"视频，直接抽帧
+        }else if(shyVideos1.getShenhe_type()==CommonConst.AUDIT_TYPE_MACHANE){//如果审核类型是机审
+        	if (CommonUtils.isNotNull(duration) && duration < 60) {//"目击者"视频，小于60秒的抽帧
         		shyVideos1 = avsample(shyVideos1);
+        	}else{//机审超过60秒的改为人工审核
+        		shyVideos1.setShenhe_type(3);
         	}
         }
         boolean result = videosService.impotVideo(shyVideos1);
@@ -113,7 +113,6 @@ public class ShyComments {
      * 领取人id
      */
     private String receive_user_id;
-    
     /**
      * @return id
@@ -530,6 +529,4 @@ public class ShyComments {
     public void setReceive_user_id(String receive_user_id) {
         this.receive_user_id = receive_user_id;
     }
-
-    
 }
 \ No newline at end of file
@@ -26,17 +26,12 @@ public class ShySites {
     private String appid;
+    @Transient
+    private String write_business_name;
     /**
      * 免审业务,多种用,分割
      */
     private String write_business;
-    
-    /**
-     * 免审业务名称
-     */
-    @Transient
-    private String write_business_name;
-    
     /**
      * @return id
@@ -170,4 +165,5 @@ public class ShySites {
 		this.write_business_name = write_business_name;
 	}
+    
 }
 \ No newline at end of file
+package com.cnlive.shenhe.entity;
+
+import javax.persistence.*;
+
+@Table(name = "shy_usersfree")
+public class ShyUsersfree {
+    @Id
+    private Integer id;
+
+    /**
+     * 免审的用户id
+     */
+    private String user_id;
+
+    /**
+     * spid
+     */
+    private Integer sp_id;
+
+    /**
+     * 栏目分类
+     */
+    private String category;
+
+    /**
+     * 是否启用，0:未启用，1:启用
+     */
+    private Integer isEnable=1;
+
+    /**
+     * @return id
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * @param id
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取免审的用户id
+     *
+     * @return user_id - 免审的用户id
+     */
+    public String getUser_id() {
+        return user_id;
+    }
+
+    /**
+     * 设置免审的用户id
+     *
+     * @param user_id 免审的用户id
+     */
+    public void setUser_id(String user_id) {
+        this.user_id = user_id;
+    }
+
+    /**
+     * 获取spid
+     *
+     * @return sp_id - spid
+     */
+    public Integer getSp_id() {
+        return sp_id;
+    }
+
+    /**
+     * 设置spid
+     *
+     * @param sp_id spid
+     */
+    public void setSp_id(Integer sp_id) {
+        this.sp_id = sp_id;
+    }
+
+    /**
+     * 获取栏目分类
+     *
+     * @return category - 栏目分类
+     */
+    public String getCategory() {
+        return category;
+    }
+
+    /**
+     * 设置栏目分类
+     *
+     * @param category 栏目分类
+     */
+    public void setCategory(String category) {
+        this.category = category;
+    }
+
+    /**
+     * 获取是否启用，0:未启用，1:启用
+     *
+     * @return isEnable - 是否启用，0:未启用，1:启用
+     */
+    public Integer getIsEnable() {
+        return isEnable;
+    }
+
+    /**
+     * 设置是否启用，0:未启用，1:启用
+     *
+     * @param isEnable 是否启用，0:未启用，1:启用
+     */
+    public void setIsEnable(Integer isEnable) {
+        this.isEnable = isEnable;
+    }
+}
 \ No newline at end of file
 package com.cnlive.shenhe.entity;
 import java.util.Date;
-
 import javax.persistence.*;
 @Table(name = "shy_videofilter")
@@ -38,7 +37,10 @@ public class ShyVideofilter {
      * 视频时长，单位s
      */
     private Integer duration;
-    
+
+    /**
+     * 创建时间
+     */
     private Date created_at;
     /**
@@ -145,20 +147,39 @@ public class ShyVideofilter {
         this.desc_msg = desc_msg;
     }
-	public Date getCreated_at() {
-		return created_at;
-	}
+    /**
+     * 获取视频时长，单位s
+     *
+     * @return duration - 视频时长，单位s
+     */
+    public Integer getDuration() {
+        return duration;
+    }
-	public void setCreated_at(Date created_at) {
-		this.created_at = created_at;
-	}
+    /**
+     * 设置视频时长，单位s
+     *
+     * @param duration 视频时长，单位s
+     */
+    public void setDuration(Integer duration) {
+        this.duration = duration;
+    }
-	public Integer getDuration() {
-		return duration;
-	}
+    /**
+     * 获取创建时间
+     *
+     * @return created_at - 创建时间
+     */
+    public Date getCreated_at() {
+        return created_at;
+    }
-	public void setDuration(Integer duration) {
-		this.duration = duration;
-	}
-    
+    /**
+     * 设置创建时间
+     *
+     * @param created_at 创建时间
+     */
+    public void setCreated_at(Date created_at) {
+        this.created_at = created_at;
+    }
 }
 \ No newline at end of file
@@ -55,7 +55,12 @@ public class ShyVideos {
     private String msg;
     /**
-     * 状态:0.未审核,1:已审核,2.拒绝
+     * 审核类型，1:免审，2:机审，3:人工审
+     */
+    private Integer shenhe_type;
+
+    /**
+     * 审核状态:0.未审核,1:已审核,2.拒绝
      */
     private Integer state;
@@ -94,7 +99,7 @@ public class ShyVideos {
     private String receive_user_id;
     /**
-     * 是否抽帧
+     * 抽帧状态：0:未抽帧；1:抽帧中；2:抽帧成功；3:抽帧失败
      */
     private Integer avsample;
@@ -124,6 +129,11 @@ public class ShyVideos {
     private String category;
     /**
+     * 视频上传人的id
+     */
+    private String video_user_id;
+
+    /**
      * 抽帧图片地址
      */
     private String avsample_imgs;
@@ -135,7 +145,6 @@ public class ShyVideos {
     @Transient
     private String spid_desc;
-    
     /**
      * @return id
@@ -338,18 +347,36 @@ public class ShyVideos {
     }
     /**
-     * 获取状态:0.未审核,1:已审核,2.拒绝
+     * 获取审核类型，1:免审，2:机审，3:人工审
      *
-     * @return state - 状态:0.未审核,1:已审核,2.拒绝
+     * @return shenhe_type - 审核类型，1:免审，2:机审，3:人工审
+     */
+    public Integer getShenhe_type() {
+        return shenhe_type;
+    }
+
+    /**
+     * 设置审核类型，1:免审，2:机审，3:人工审
+     *
+     * @param shenhe_type 审核类型，1:免审，2:机审，3:人工审
+     */
+    public void setShenhe_type(Integer shenhe_type) {
+        this.shenhe_type = shenhe_type;
+    }
+
+    /**
+     * 获取审核状态:0.未审核,1:已审核,2.拒绝
+     *
+     * @return state - 审核状态:0.未审核,1:已审核,2.拒绝
      */
     public Integer getState() {
         return state;
     }
     /**
-     * 设置状态:0.未审核,1:已审核,2.拒绝
+     * 设置审核状态:0.未审核,1:已审核,2.拒绝
      *
-     * @param state 状态:0.未审核,1:已审核,2.拒绝
+     * @param state 审核状态:0.未审核,1:已审核,2.拒绝
      */
     public void setState(Integer state) {
         this.state = state;
@@ -492,18 +519,18 @@ public class ShyVideos {
     }
     /**
-     * 获取是否抽帧
+     * 获取抽帧状态：0:未抽帧；1:抽帧中；2:抽帧成功；3:抽帧失败
      *
-     * @return avsample - 是否抽帧
+     * @return avsample - 抽帧状态：0:未抽帧；1:抽帧中；2:抽帧成功；3:抽帧失败
      */
     public Integer getAvsample() {
         return avsample;
     }
     /**
-     * 设置是否抽帧
+     * 设置抽帧状态：0:未抽帧；1:抽帧中；2:抽帧成功；3:抽帧失败
      *
-     * @param avsample 是否抽帧
+     * @param avsample 抽帧状态：0:未抽帧；1:抽帧中；2:抽帧成功；3:抽帧失败
      */
     public void setAvsample(Integer avsample) {
         this.avsample = avsample;
@@ -600,6 +627,24 @@ public class ShyVideos {
     }
     /**
+     * 获取视频上传人的id
+     *
+     * @return video_user_id - 视频上传人的id
+     */
+    public String getVideo_user_id() {
+        return video_user_id;
+    }
+
+    /**
+     * 设置视频上传人的id
+     *
+     * @param video_user_id 视频上传人的id
+     */
+    public void setVideo_user_id(String video_user_id) {
+        this.video_user_id = video_user_id;
+    }
+
+    /**
      * 获取抽帧图片地址
      *
      * @return avsample_imgs - 抽帧图片地址
@@ -33,63 +33,42 @@ public class VideosJob {
     /**
-     * 白名单sp视频通过
-     */
-    @Scheduled(fixedRate =  60 * 1000)
-    public void updateVideos() {
-    	//获取所有点播免审sp
-        List<Integer> sites = sitesService.getBusinessList();
-        //遍历免审的spid去更改状态值
-        ShyVideos shyVideos = new ShyVideos();
-        for (int spid : sites) {
-            shyVideos.setSpid(spid);
-            shyVideos.setState(CommonConst.AUDIT_INTT);
-            List<ShyVideos> shyVideosList = videosService.findshyVideo(shyVideos);
-            if (shyVideosList.size() > 0) {
-                for (ShyVideos video : shyVideosList) {
-                	//如果网家家的栏目是“目击者”，跳过免审
-                	if(CommonUtils.isNotEmpty(video.getCategory()) && video.getCategory().equals(CommonConst.CATEGORY_WITNESS)){
-                		if(video.getAvsample().equals(CommonConst.AVSAMPLE_SUCCESS)){
-                			logger.info("发送数美检测的videos_id："+video.getId());
-                			//数美图片过滤
-                            videosService.videoFilter(video.getId(),CommonConst.DYNAMIC_USER);
-                		}else{
-                			continue;
-                		}
-                	}
-                	logger.info("白名单自动通过的videos_id："+video.getId());
-                	video.setUpdater("白名单");
-                	//更新点播和审核的视频状态
-                	videosService.updateDianboAndShenhe(video,3);
-                }
-            }
-        }
+	 * 白名单sp视频通过
+	 */
+	@Scheduled(fixedRate = 60 * 1000)
+	public void updateVideos() {
+		ShyVideos shyVideos = new ShyVideos();
+		shyVideos.setShenhe_type(CommonConst.AUDIT_TYPE_FREE);// 审核类型为免审
+		shyVideos.setState(CommonConst.AUDIT_INTT);// 审核状态为未审核
+		List<ShyVideos> shyVideosList = videosService.findshyVideo(shyVideos);
+		if (shyVideosList.size() > 0) {
+			for (ShyVideos video : shyVideosList) {
+				video.setUpdater("白名单");
+				// 更新点播和审核的视频状态
+				videosService.updateDianboAndShenhe(video, 3);
+			}
+		}
     }
     /**
      * 定时发送数美检测视频
      */
-  /** @Scheduled(cron="0 0/1 7-23 * * ? ")//每天7点到23点执行，每分钟一次
+   @Scheduled(cron="0 0/1 7-23 * * ? ")//每天7点到23点执行，每分钟一次
     public void videofilter() {
     	 ShyVideos shyVideos = new ShyVideos();
-    	 shyVideos.setCategory(CommonConst.CATEGORY_WITNESS);//目击者
+    	 shyVideos.setShenhe_type(CommonConst.AUDIT_TYPE_MACHANE);//审核类型为机审
     	 shyVideos.setState(CommonConst.AUDIT_INTT);//待审核状态
     	 shyVideos.setAvsample(CommonConst.AVSAMPLE_SUCCESS);//抽帧完成
          List<ShyVideos> shyVideosList = videosService.findshyVideo(shyVideos);
-         //获取所有点播免审sp
-//         List<Integer> sites = sitesService.getBusinessList();
          if (shyVideosList.size() > 0) {
              for (ShyVideos video : shyVideosList) {
-//            	 if(sites.contains(video.getSpid())){//点播免审sp里面包含视频的sp，则跳过
-//            		 continue;
-//            	 }
             	 logger.info("定时发送数美检测的videos_id："+video.getId());
               //数美图片过滤
               videosService.videoFilter(video.getId(),CommonConst.DYNAMIC_USER);
              }
          }
     }
-   */
+ 
     /**
      * 自动退领
+package com.cnlive.shenhe.mapper;
+
+import com.cnlive.shenhe.entity.ShyUsersfree;
+import tk.mybatis.mapper.common.Mapper;
+
+public interface ShyUsersfreeMapper extends Mapper<ShyUsersfree> {
+}
 \ No newline at end of file
@@ -83,14 +83,14 @@ public class SitesServiceImpl {
      * 获取免审白名单列表（点播）
      * @return
      */
-    public List<Integer> getBusinessList() {
+    public List<Integer> getBusinessList(Integer business_) {
         List<ShySites> sitesList = shySitesMapper.selectAll();
         List<Integer> sites = new ArrayList<Integer>();
         for (ShySites shySites : sitesList) {
             if (CommonUtils.isNotEmpty(shySites.getWrite_business())) {
                 String[] business = shySites.getWrite_business().split(",");
                 List<String> asList = Arrays.asList(business);
-                if (asList.contains(CommonConst.BUSINESS_VIDEO + "")) {
+                if (asList.contains(business_ + "")) {
                     sites.add(shySites.getSpid());
                 }
             }
+package com.cnlive.shenhe.serviceImpl;
+
+import com.cnlive.shenhe.entity.ShyUsersfree;
+import com.cnlive.shenhe.mapper.ShyUsersfreeMapper;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Auther: 李伟
+ * @Date: 2019/05/13 14:23
+ * @Description:
+ */
+@Service
+public class UsersfreeServiceImpl {
+    @Autowired
+    ShyUsersfreeMapper shyUsersfreeMapper;
+
+    public ShyUsersfree get(Integer id) {
+        return shyUsersfreeMapper.selectByPrimaryKey(id);
+    }
+
+    public ShyUsersfree select(ShyUsersfree shyUsersfree) {
+        return shyUsersfreeMapper.selectOne(shyUsersfree);
+    }
+    /**
+     * 通过spid、栏目、用户id来查看是否是免审
+     * @param sp_id
+     * @param category
+     * @param user_id
+     * @return
+     */
+    public ShyUsersfree selectUser(Integer sp_id,String category,String user_id) {
+    	ShyUsersfree shyUserfree=new ShyUsersfree();
+		shyUserfree.setSp_id(sp_id);
+		shyUserfree.setCategory(category);
+		shyUserfree.setUser_id(user_id);
+        return shyUsersfreeMapper.selectOne(shyUserfree);
+    }
+}
@@ -7,6 +7,7 @@ import com.cnlive.shenhe.bean.ErrorEnum;
 import com.cnlive.shenhe.bean.ResponseBean;
 import com.cnlive.shenhe.entity.ShySites;
 import com.cnlive.shenhe.entity.ShyUsers;
+import com.cnlive.shenhe.entity.ShyUsersfree;
 import com.cnlive.shenhe.entity.ShyVideofilter;
 import com.cnlive.shenhe.entity.ShyVideos;
 import com.cnlive.shenhe.job.VideosJob;
@@ -54,6 +55,11 @@ public class VideosServiceImpl {
     @Autowired
     VideosServiceImpl videosService;
+    @Autowired
+    SitesServiceImpl sitesService;
+    
+    @Autowired
+    UsersfreeServiceImpl usersfreeServiceImpl;
     @Autowired
     VideofilterServiceImpl videofilterServiceImpl;
@@ -318,13 +324,17 @@ public class VideosServiceImpl {
             	  type=CommonConst.REJECT;//报错就给一个拒绝状态
             	  desc="数美审核报错了";
               }
-//              if(type.toLowerCase().equals(CommonConst.PASS)){//数美通过
-//            	  //修改点播云视频状态
-//            	  videosService.updateDianboAndShenhe(shyVideos,3);
-//              }else if(type.toLowerCase().equals(CommonConst.REJECT)){//数美拒绝
-//            	  shyVideos.setMsg(desc);//拒绝原因
+              if(type.toLowerCase().equals(CommonConst.PASS)){//数美通过
+            	  desc="数美审核通过了";
+            	  shyVideos.setMsg(desc);
+            	  //修改点播云视频状态
+            	  videosService.updateDianboAndShenhe(shyVideos,3);
+              }else if(type.toLowerCase().equals(CommonConst.REJECT)){//数美拒绝
+            	  shyVideos.setShenhe_type(CommonConst.AUDIT_TYPE_USER);//审核类型改为人工审核
+            	  shyVideos.setMsg(desc);//拒绝原因
+            	  videosService.updateshyVideos(shyVideos);
 //            	  videosService.updateDianboAndShenhe(shyVideos,4);
-//              }
+              }
               ShyVideofilter videofilter=new ShyVideofilter();
     		  videofilter.setChannel(channel);
     		  videofilter.setDesc_msg(desc);
@@ -368,5 +378,40 @@ public class VideosServiceImpl {
 		return 0;
 	}
+	/**
+	 * 根据sp、栏目、用户id来判断审核类型
+	 * @param spid
+	 * @param category
+	 * @param sid
+	 * @return
+	 */
+	public void getShenheType(ShyVideos shyVideo){
+		
+		//获取点播免审sp
+        List<Integer> sites = sitesService.getBusinessList(CommonConst.BUSINESS_VIDEO);
+        //初始化一个审核状态
+        Integer shenheType=3;//审核类型，1:免审，2:机审，3:人工审
+        //如果当前sp是免审sp
+        if(sites.contains(shyVideo.getSpid())){
+        	//如果栏目是“目击者”
+        	if(CommonUtils.isNotEmpty(shyVideo.getCategory()) && shyVideo.getCategory().equals(CommonConst.CATEGORY_WITNESS)){
+        		//如果用户id存在
+        		if(CommonUtils.isNotEmpty(shyVideo.getVideo_user_id())){
+        			ShyUsersfree shyUserfree=usersfreeServiceImpl.selectUser(shyVideo.getSpid(), shyVideo.getCategory(), shyVideo.getVideo_user_id());
+        			//如果存在免审用户
+        			if(CommonUtils.isNotNull(shyUserfree)){
+        				shenheType=1;//免审
+        			}else{//用户不免审
+        				shenheType=2;//机审
+        			}
+        		}else{//如果用户id不存在
+        			shenheType=2;//机审
+        		}
+        	}else{//如果栏目不存在或者不是非免审栏目
+        		shenheType=1;//免审
+        	}
+        }
+        shyVideo.setShenhe_type(shenheType);
+	}
 }
@@ -22,6 +22,18 @@ public class CommonConst {
      * 审核状态：审核拒绝
      */
     public static Integer AUDIT_REFUSE = 2;
+    /**
+     * 审核类型：免审
+     */
+    public static Integer AUDIT_TYPE_FREE = 1;
+    /**
+     * 审核类型：机审
+     */
+    public static Integer AUDIT_TYPE_MACHANE = 2;
+    /**
+     * 审核类型：人工审
+     */
+    public static Integer AUDIT_TYPE_USER = 3;
     /**
      * 审核状态：白名单通过回调失败
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.cnlive.shenhe.mapper.ShyUsersfreeMapper">
+  <resultMap id="BaseResultMap" type="com.cnlive.shenhe.entity.ShyUsersfree">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="user_id" jdbcType="VARCHAR" property="user_id" />
+    <result column="sp_id" jdbcType="INTEGER" property="sp_id" />
+    <result column="category" jdbcType="VARCHAR" property="category" />
+    <result column="isEnable" jdbcType="INTEGER" property="isEnable" />
+  </resultMap>
+</mapper>
 \ No newline at end of file
@@ -11,6 +11,7 @@
     <result column="channel" jdbcType="VARCHAR" property="channel" />
     <result column="result_type" jdbcType="VARCHAR" property="result_type" />
     <result column="desc_msg" jdbcType="VARCHAR" property="desc_msg" />
+    <result column="duration" jdbcType="INTEGER" property="duration" />
     <result column="created_at" jdbcType="TIMESTAMP" property="created_at" />
   </resultMap>
 </mapper>
 \ No newline at end of file
@@ -17,6 +17,7 @@
     <result column="callback" jdbcType="VARCHAR" property="callback" />
     <result column="video_priority" jdbcType="VARCHAR" property="video_priority" />
     <result column="msg" jdbcType="VARCHAR" property="msg" />
+    <result column="shenhe_type" jdbcType="INTEGER" property="shenhe_type" />
     <result column="state" jdbcType="INTEGER" property="state" />
     <result column="video_upload_time" jdbcType="TIMESTAMP" property="video_upload_time" />
     <result column="video_keyword" jdbcType="VARCHAR" property="video_keyword" />
@@ -32,6 +33,7 @@
     <result column="plat" jdbcType="INTEGER" property="plat" />
     <result column="duration" jdbcType="INTEGER" property="duration" />
     <result column="category" jdbcType="VARCHAR" property="category" />
+    <result column="video_user_id" jdbcType="VARCHAR" property="video_user_id" />
     <result column="avsample_imgs" jdbcType="LONGVARCHAR" property="avsample_imgs" />
     <result column="avsample_msg" jdbcType="LONGVARCHAR" property="avsample_msg" />
   </resultMap>