周伟鹏 / cnlive_shenhe · Commits

Commit 1765fb08292d8b6e0dfd3e6d7c9408b92e2b2a67

Authored by liwei2917
1 parent 79c4e8a0

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

Inline Side-by-side
Showing 4 changed files with 23 additions and 12 deletions
src/main/java/com/cnlive/shenhe/job/VideosJob.java
  View file @1765fb0
... ... @@ -48,9 +48,14 @@ public class VideosJob {
48 48 if (shyVideosList.size() > 0) {
49 49 for (ShyVideos video : shyVideosList) {
50 50 //如果网家家的栏目是“目击者”，跳过免审
51   -// if(CommonUtils.isNotEmpty(video.getCategory()) && video.getCategory().equals(CommonConst.CATEGORY_WITNESS)){
  51 + if(CommonUtils.isNotEmpty(video.getCategory()) && video.getCategory().equals(CommonConst.CATEGORY_WITNESS)){
  52 + if(video.getAvsample().equals(CommonConst.AVSAMPLE_SUCCESS)){
  53 + logger.info("发送数美检测的videos_id："+video.getId());
  54 + //数美图片过滤
  55 + videosService.videoFilter(video.getId(),CommonConst.DYNAMIC_USER);
  56 + }
52 57 // continue;
53   -// }
  58 + }
54 59 logger.info("白名单自动通过的videos_id："+video.getId());
55 60 video.setUpdater("白名单");
56 61 //更新点播和审核的视频状态
... ...
src/main/java/com/cnlive/shenhe/serviceImpl/SitesServiceImpl.java
  View file @1765fb0
... ... @@ -62,7 +62,10 @@ public class SitesServiceImpl {
62 62 if (CommonUtils.isNotNull(spId))
63 63 criteria.andEqualTo("spid", spId);
64 64 List<ShySites> shySites = shySitesMapper.selectByExample(example);
65   - return shySites.get(0);
  65 + if(CommonUtils.isNotNull(shySites)){
  66 + return shySites.get(0);
  67 + }
  68 + return new ShySites();
66 69 }
67 70  
68 71 public ShySites findspidBySpdesc(String sp_desc) {
... ... @@ -71,7 +74,10 @@ public class SitesServiceImpl {
71 74 if (CommonUtils.isNotEmpty(sp_desc))
72 75 criteria.andEqualTo("name", sp_desc);
73 76 List<ShySites> shySites = shySitesMapper.selectByExample(example);
74   - return shySites.get(0);
  77 + if(CommonUtils.isNotNull(shySites)){
  78 + return shySites.get(0);
  79 + }
  80 + return new ShySites();
75 81 }
76 82 /**
77 83 * 获取免审白名单列表（点播）
... ...
src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java
  View file @1765fb0
... ... @@ -317,14 +317,14 @@ public class VideosServiceImpl {
317 317 }catch(Exception e){
318 318 type=CommonConst.REJECT;//报错就给一个拒绝状态
319 319 desc="数美审核报错了";
320   - shyVideos.setMsg(desc);
321   - }
322   - if(type.toLowerCase().equals(CommonConst.PASS)){//数美通过
323   - //修改点播云视频状态
324   - videosService.updateDianboAndShenhe(shyVideos,3);
325   - }else if(type.toLowerCase().equals(CommonConst.REJECT)){//数美拒绝
326   - videosService.updateDianboAndShenhe(shyVideos,4);
327 320 }
  321 +// if(type.toLowerCase().equals(CommonConst.PASS)){//数美通过
  322 +// //修改点播云视频状态
  323 +// videosService.updateDianboAndShenhe(shyVideos,3);
  324 +// }else if(type.toLowerCase().equals(CommonConst.REJECT)){//数美拒绝
  325 +// shyVideos.setMsg(desc);//拒绝原因
  326 +// videosService.updateDianboAndShenhe(shyVideos,4);
  327 +// }
328 328 ShyVideofilter videofilter=new ShyVideofilter();
329 329 videofilter.setChannel(channel);
330 330 videofilter.setDesc_msg(desc);
... ...
src/main/java/com/cnlive/shenhe/utils/AntiFraudUtil.java
  View file @1765fb0
... ... @@ -31,7 +31,7 @@ public class AntiFraudUtil {
31 31 String btId = uuid.toString();
32 32  
33 33 // System.out.println("文本："+AntiFraudUtil.filterText("0000001", "王八蛋", "DYNAMIC_USER") + "---");
34   - System.out.println(AntiFraudUtil.filterArticle("000111","3g.huabian.com/api/hz0227/show/2225530.html",null));
  34 +// System.out.println(AntiFraudUtil.filterArticle("000111","3g.huabian.com/api/hz0227/show/2225530.html",null));
35 35 //System.out.println("图片："+AntiFraudUtil.filterImg("0000001", jsonArray,"DYNAMIC_BUSINESS") + "---");
36 36 //System.out.println("视频："+AntiFraudUtil.filterVideo("http://wjj.ys1.cnliveimg.com/testVideo/test1.mp4",btId,null) + "---");
37 37 //queryVideoResult("02b649b7-3451-403e-abd0-592302cec2a0");
... ...