Commit 33f8a64a5d78c28c863b5ba993b7c335d44c9ed1
Merge branch 'dev'
Showing
1 changed file
with
9 additions
and
3 deletions
src/main/java/com/cnlive/shenhe/job/VideosJob.java
| @@ -7,6 +7,8 @@ import com.cnlive.shenhe.serviceImpl.UsersServiceImpl; | @@ -7,6 +7,8 @@ import com.cnlive.shenhe.serviceImpl.UsersServiceImpl; | ||
| 7 | import com.cnlive.shenhe.serviceImpl.VideosServiceImpl; | 7 | import com.cnlive.shenhe.serviceImpl.VideosServiceImpl; |
| 8 | import com.cnlive.shenhe.utils.AuditPass; | 8 | import com.cnlive.shenhe.utils.AuditPass; |
| 9 | import com.cnlive.shenhe.utils.CommonConst; | 9 | import com.cnlive.shenhe.utils.CommonConst; |
| 10 | +import com.cnlive.shenhe.utils.CommonUtils; | ||
| 11 | + | ||
| 10 | import org.slf4j.Logger; | 12 | import org.slf4j.Logger; |
| 11 | import org.slf4j.LoggerFactory; | 13 | import org.slf4j.LoggerFactory; |
| 12 | import org.springframework.beans.factory.annotation.Autowired; | 14 | import org.springframework.beans.factory.annotation.Autowired; |
| @@ -45,6 +47,10 @@ public class VideosJob { | @@ -45,6 +47,10 @@ public class VideosJob { | ||
| 45 | List<ShyVideos> shyVideosList = videosService.findshyVideo(shyVideos); | 47 | List<ShyVideos> shyVideosList = videosService.findshyVideo(shyVideos); |
| 46 | if (shyVideosList.size() > 0) { | 48 | if (shyVideosList.size() > 0) { |
| 47 | for (ShyVideos video : shyVideosList) { | 49 | for (ShyVideos video : shyVideosList) { |
| 50 | + //如果网家家的栏目是“目击者”，跳过免审 | ||
| 51 | + if(CommonUtils.isNotEmpty(video.getCategory()) && video.getCategory().equals(CommonConst.CATEGORY_WITNESS)){ | ||
| 52 | + continue; | ||
| 53 | + } | ||
| 48 | logger.info("白名单自动通过的videos_id："+video.getId()); | 54 | logger.info("白名单自动通过的videos_id："+video.getId()); |
| 49 | video.setUpdater("白名单"); | 55 | video.setUpdater("白名单"); |
| 50 | //更新点播和审核的视频状态 | 56 | //更新点播和审核的视频状态 |
| @@ -68,9 +74,9 @@ public class VideosJob { | @@ -68,9 +74,9 @@ public class VideosJob { | ||
| 68 | List<Integer> sites = sitesService.getBusinessList(); | 74 | List<Integer> sites = sitesService.getBusinessList(); |
| 69 | if (shyVideosList.size() > 0) { | 75 | if (shyVideosList.size() > 0) { |
| 70 | for (ShyVideos video : shyVideosList) { | 76 | for (ShyVideos video : shyVideosList) { |
| 71 | - if(sites.contains(video.getSpid())){//点播免审sp里面包含视频的sp，则跳过 | ||
| 72 | - continue; | ||
| 73 | - } | 77 | +// if(sites.contains(video.getSpid())){//点播免审sp里面包含视频的sp，则跳过 |
| 78 | +// continue; | ||
| 79 | +// } | ||
| 74 | logger.info("定时发送数美检测的videos_id："+video.getId()); | 80 | logger.info("定时发送数美检测的videos_id："+video.getId()); |
| 75 | //数美图片过滤 | 81 | //数美图片过滤 |
| 76 | videosService.videoFilter(video.getId(),CommonConst.DYNAMIC_USER); | 82 | videosService.videoFilter(video.getId(),CommonConst.DYNAMIC_USER); |