提交bug修复，以及数美送审测试

liwei2917
1 parent 79c4e8a0
Showing 4 changed files with 23 additions and 12 deletions
src/main/java/com/cnlive/shenhe/job/VideosJob.java
src/main/java/com/cnlive/shenhe/serviceImpl/SitesServiceImpl.java
src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java
src/main/java/com/cnlive/shenhe/utils/AntiFraudUtil.java
@@ -48,9 +48,14 @@ public class VideosJob {
             if (shyVideosList.size() > 0) {
                 for (ShyVideos video : shyVideosList) {
                 	//如果网家家的栏目是“目击者”，跳过免审
-//                	if(CommonUtils.isNotEmpty(video.getCategory()) && video.getCategory().equals(CommonConst.CATEGORY_WITNESS)){
+                	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);
+                		}
 //                		continue;
-//                	}
+                	}
                 	logger.info("白名单自动通过的videos_id："+video.getId());
                 	video.setUpdater("白名单");
                 	//更新点播和审核的视频状态
@@ -62,7 +62,10 @@ public class SitesServiceImpl {
         if (CommonUtils.isNotNull(spId))
             criteria.andEqualTo("spid", spId);
         List<ShySites> shySites = shySitesMapper.selectByExample(example);
-        return shySites.get(0);
+        if(CommonUtils.isNotNull(shySites)){
+        	return shySites.get(0);
+        }
+        return new ShySites();
     }
     public ShySites findspidBySpdesc(String sp_desc) {
@@ -71,7 +74,10 @@ public class SitesServiceImpl {
         if (CommonUtils.isNotEmpty(sp_desc))
             criteria.andEqualTo("name", sp_desc);
         List<ShySites> shySites = shySitesMapper.selectByExample(example);
-        return shySites.get(0);
+        if(CommonUtils.isNotNull(shySites)){
+        	return shySites.get(0);
+        }
+        return new ShySites();
     }
     /**
      * 获取免审白名单列表（点播）
@@ -317,14 +317,14 @@ public class VideosServiceImpl {
               }catch(Exception e){
             	  type=CommonConst.REJECT;//报错就给一个拒绝状态
             	  desc="数美审核报错了";
-            	  shyVideos.setMsg(desc);
-              }
-              if(type.toLowerCase().equals(CommonConst.PASS)){//数美通过
-            	  //修改点播云视频状态
-            	  videosService.updateDianboAndShenhe(shyVideos,3);
-              }else if(type.toLowerCase().equals(CommonConst.REJECT)){//数美拒绝
-            	  videosService.updateDianboAndShenhe(shyVideos,4);
               }
+//              if(type.toLowerCase().equals(CommonConst.PASS)){//数美通过
+//            	  //修改点播云视频状态
+//            	  videosService.updateDianboAndShenhe(shyVideos,3);
+//              }else if(type.toLowerCase().equals(CommonConst.REJECT)){//数美拒绝
+//            	  shyVideos.setMsg(desc);//拒绝原因
+//            	  videosService.updateDianboAndShenhe(shyVideos,4);
+//              }
               ShyVideofilter videofilter=new ShyVideofilter();
     		  videofilter.setChannel(channel);
     		  videofilter.setDesc_msg(desc);
@@ -31,7 +31,7 @@ public class AntiFraudUtil {
         String btId = uuid.toString();
 //        System.out.println("文本："+AntiFraudUtil.filterText("0000001", "王八蛋", "DYNAMIC_USER") + "---");
-        System.out.println(AntiFraudUtil.filterArticle("000111","3g.huabian.com/api/hz0227/show/2225530.html",null));
+//        System.out.println(AntiFraudUtil.filterArticle("000111","3g.huabian.com/api/hz0227/show/2225530.html",null));
         //System.out.println("图片："+AntiFraudUtil.filterImg("0000001", jsonArray,"DYNAMIC_BUSINESS") + "---");
         //System.out.println("视频："+AntiFraudUtil.filterVideo("http://wjj.ys1.cnliveimg.com/testVideo/test1.mp4",btId,null) + "---");
         //queryVideoResult("02b649b7-3451-403e-abd0-592302cec2a0");