免审数据查询重写

宋亚南
1 parent 676a0d35
Showing 6 changed files with 18 additions and 10 deletions
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/ShyVideosMapper.java
src/main/java/com/cnlive/shenhe/service/VideosService.java
src/main/java/com/cnlive/shenhe/service/serviceImpl/VideosServiceImpl.java
src/main/resources/mapper/ShyVideosMapper.xml
@@ -399,7 +399,8 @@ public class ShyVideos {
      * @return shenhe_type - 审核类型，1:免审，2:机审，3:人工审
      */
     public Integer getShenhe_type() {
-//        return shenhe_type;
+        if (source!=null)
+            return shenhe_type;
         return CommonConst.AUDIT_TYPE_USER;//暂时人工审核
     }
@@ -31,15 +31,9 @@ public class VideosJob {
      */
     @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);
+        List<ShyVideos> shyVideosList = videosService.findMSVideo();
         if (shyVideosList.size() > 0) {
             for (ShyVideos video : shyVideosList) {
-                if (CommonUtils.isEmpty(video.getCategory()))continue;
                 logger.info("当前白名单通过的videos_id：" + video.getId()+"视频sp"+video.getSpid()+"视频source"+video.getSource());
                 video.setUpdater("白名单");
                 // 更新点播和审核的视频状态
@@ -58,7 +52,6 @@ public class VideosJob {
         ShyVideos shyVideos = new ShyVideos();
         //审核类型为机审
         shyVideos.setShenhe_type(CommonConst.AUDIT_TYPE_MACHANE);
-
         //待审核状态
         shyVideos.setState(CommonConst.AUDIT_INTT);
         //抽帧完成
@@ -66,7 +59,6 @@ public class VideosJob {
         List<ShyVideos> shyVideosList = videosService.findShyVideo(shyVideos);
         if (shyVideosList != null && shyVideosList.size() > 0) {
             for (ShyVideos video : shyVideosList) {
-                if (CommonUtils.isEmpty(video.getCategory()))continue;
                 logger.info("定时向易盾发送检测视频的videos_id：{}", video.getId());
                 //易盾图片过滤
                 logger.info("审核云定时向易盾发送视频抽帧图片检测：{}", video.getVideo_id());
@@ -4,7 +4,11 @@ import com.cnlive.shenhe.entity.ShyVideos;
 import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.Mapper;
+import java.util.List;
+
 public interface ShyVideosMapper extends Mapper<ShyVideos> {
     ShyVideos selectBySpId(@Param("id") Integer id,
                            @Param("spId") Integer spId);
+
+    List<ShyVideos> findMSVideo();
 }
 \ No newline at end of file
@@ -36,6 +36,8 @@ public interface VideosService {
      */
     List<ShyVideos> findShyVideo(ShyVideos shyVideos);
+    List<ShyVideos> findMSVideo();
+
     /**
      * 根据主键修改点播  返回布尔类型
      *
@@ -95,6 +95,11 @@ public class VideosServiceImpl implements VideosService {
         return shyVideosMapper.selectByRowBounds(shyVideos, new RowBounds(0, 100));
     }
+    @Override
+    public List<ShyVideos> findMSVideo() {
+        return shyVideosMapper.findMSVideo();
+    }
+
     /**
      * 根据主键修改点播  返回布尔类型
      *
@@ -53,4 +53,8 @@
             </if>
         </where>
     </select>
+
+    <select id="findMSVideo" resultType="com.cnlive.shenhe.entity.ShyVideos">
+        select * from shy_videos where shenhe_type=1 AND state =0
+    </select>
 </mapper>
 \ No newline at end of file