Commit 676a0d359f6e2d636505b90f9a9c61e2a0f19b23

Authored by 宋亚南
1 parent 246d502e

限制审核云免审以及自动审核

src/main/java/com/cnlive/shenhe/api/ContentControllerApi.java
@@ -55,7 +55,8 @@ public class ContentControllerApi { @@ -55,7 +55,8 @@ public class ContentControllerApi {
55 shyContent.setContent_id(contentId); 55 shyContent.setContent_id(contentId);
56 shyContent.setContent_tag(newContentTag); 56 shyContent.setContent_tag(newContentTag);
57 //获取审核类型 57 //获取审核类型
58 - Integer shenheType = contentService.getShenheType(json.getInteger("spId"), newContentTag); 58 +// Integer shenheType = contentService.getShenheType(json.getInteger("spId"), newContentTag);
  59 + Integer shenheType = CommonConst.AUDIT_TYPE_USER;//暂时人工审核
59 List<ShyContent> contentList = contentService.findShyContent(shyContent); 60 List<ShyContent> contentList = contentService.findShyContent(shyContent);
60 if (contentList.size() > 0) { 61 if (contentList.size() > 0) {
61 ShyContent shyContent1 = contentList.get(0); 62 ShyContent shyContent1 = contentList.get(0);
src/main/java/com/cnlive/shenhe/entity/ShyVideos.java
1 package com.cnlive.shenhe.entity; 1 package com.cnlive.shenhe.entity;
2 2
  3 +import com.cnlive.shenhe.utils.CommonConst;
  4 +
3 import javax.persistence.Id; 5 import javax.persistence.Id;
4 import javax.persistence.Table; 6 import javax.persistence.Table;
5 import javax.persistence.Transient; 7 import javax.persistence.Transient;
@@ -397,7 +399,8 @@ public class ShyVideos { @@ -397,7 +399,8 @@ public class ShyVideos {
397 * @return shenhe_type - 审核类型,1:免审,2:机审,3:人工审 399 * @return shenhe_type - 审核类型,1:免审,2:机审,3:人工审
398 */ 400 */
399 public Integer getShenhe_type() { 401 public Integer getShenhe_type() {
400 - return shenhe_type; 402 +// return shenhe_type;
  403 + return CommonConst.AUDIT_TYPE_USER;//暂时人工审核
401 } 404 }
402 405
403 /** 406 /**
src/main/java/com/cnlive/shenhe/job/VideosJob.java
@@ -4,6 +4,7 @@ import com.cnlive.shenhe.entity.ShyVideos; @@ -4,6 +4,7 @@ import com.cnlive.shenhe.entity.ShyVideos;
4 import com.cnlive.shenhe.service.VideosService; 4 import com.cnlive.shenhe.service.VideosService;
5 import com.cnlive.shenhe.utils.CommonConst; 5 import com.cnlive.shenhe.utils.CommonConst;
6 import com.cnlive.shenhe.utils.CommonConstStates; 6 import com.cnlive.shenhe.utils.CommonConstStates;
  7 +import com.cnlive.shenhe.utils.CommonUtils;
7 import org.slf4j.Logger; 8 import org.slf4j.Logger;
8 import org.slf4j.LoggerFactory; 9 import org.slf4j.LoggerFactory;
9 import org.springframework.beans.factory.annotation.Autowired; 10 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,7 +39,8 @@ public class VideosJob { @@ -38,7 +39,8 @@ public class VideosJob {
38 List<ShyVideos> shyVideosList = videosService.findShyVideo(shyVideos); 39 List<ShyVideos> shyVideosList = videosService.findShyVideo(shyVideos);
39 if (shyVideosList.size() > 0) { 40 if (shyVideosList.size() > 0) {
40 for (ShyVideos video : shyVideosList) { 41 for (ShyVideos video : shyVideosList) {
41 - logger.info("当前白名单通过的videos_id:" + video.getId()); 42 + if (CommonUtils.isEmpty(video.getCategory()))continue;
  43 + logger.info("当前白名单通过的videos_id:" + video.getId()+"视频sp"+video.getSpid()+"视频source"+video.getSource());
42 video.setUpdater("白名单"); 44 video.setUpdater("白名单");
43 // 更新点播和审核的视频状态 45 // 更新点播和审核的视频状态
44 videosService.updateDianboAndShenhe(video, CommonConstStates.TONGGUO); 46 videosService.updateDianboAndShenhe(video, CommonConstStates.TONGGUO);
@@ -56,6 +58,7 @@ public class VideosJob { @@ -56,6 +58,7 @@ public class VideosJob {
56 ShyVideos shyVideos = new ShyVideos(); 58 ShyVideos shyVideos = new ShyVideos();
57 //审核类型为机审 59 //审核类型为机审
58 shyVideos.setShenhe_type(CommonConst.AUDIT_TYPE_MACHANE); 60 shyVideos.setShenhe_type(CommonConst.AUDIT_TYPE_MACHANE);
  61 +
59 //待审核状态 62 //待审核状态
60 shyVideos.setState(CommonConst.AUDIT_INTT); 63 shyVideos.setState(CommonConst.AUDIT_INTT);
61 //抽帧完成 64 //抽帧完成
@@ -63,6 +66,7 @@ public class VideosJob { @@ -63,6 +66,7 @@ public class VideosJob {
63 List<ShyVideos> shyVideosList = videosService.findShyVideo(shyVideos); 66 List<ShyVideos> shyVideosList = videosService.findShyVideo(shyVideos);
64 if (shyVideosList != null && shyVideosList.size() > 0) { 67 if (shyVideosList != null && shyVideosList.size() > 0) {
65 for (ShyVideos video : shyVideosList) { 68 for (ShyVideos video : shyVideosList) {
  69 + if (CommonUtils.isEmpty(video.getCategory()))continue;
66 logger.info("定时向易盾发送检测视频的videos_id:{}", video.getId()); 70 logger.info("定时向易盾发送检测视频的videos_id:{}", video.getId());
67 //易盾图片过滤 71 //易盾图片过滤
68 logger.info("审核云定时向易盾发送视频抽帧图片检测:{}", video.getVideo_id()); 72 logger.info("审核云定时向易盾发送视频抽帧图片检测:{}", video.getVideo_id());