Merge branch 'test' into dev

王言钊
2 parents 5058abd1 32a5b6f9
Showing 8 changed files with 57 additions and 65 deletions
pom.xml
src/main/java/com/cnlive/shenhe/job/AudioJob.java
src/main/java/com/cnlive/shenhe/job/ContentJob.java
src/main/java/com/cnlive/shenhe/job/VideosJob.java
src/main/java/com/cnlive/shenhe/serviceImpl/AudioServiceImpl.java
src/main/java/com/cnlive/shenhe/serviceImpl/ContentServiceImpl.java
src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java
src/main/java/com/cnlive/shenhe/utils/CommonConstStates.java
@@ -240,7 +240,7 @@
         <profile>
             <id>dev</id>
             <activation>
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
             </activation>
             <properties>
                 <environment>dev</environment>
@@ -250,7 +250,7 @@
         <profile>
             <id>test</id>
             <activation>
-                <activeByDefault>false</activeByDefault>
+                <activeByDefault>true</activeByDefault>
             </activation>
             <properties>
                 <environment>test</environment>
 package com.cnlive.shenhe.job;
 import com.cnlive.shenhe.entity.ShyAudio;
-import com.cnlive.shenhe.entity.ShyYidun;
 import com.cnlive.shenhe.serviceImpl.AudioServiceImpl;
 import com.cnlive.shenhe.serviceImpl.YiDunServiceImpl;
 import com.cnlive.shenhe.utils.CommonConst;
@@ -43,7 +42,7 @@ public class AudioJob {
                 logger.info("当前白名单通过的AudioId：" + audio.getAudioId());
                 shyAudio.setUploader("白名单");
                 // 更新点播音频和审核的音频状态
-                audioService.updateAudioAndShenhe(audio, 3);
+                audioService.updateAudioAndShenhe(audio, CommonConst.AUDIT_SUCCESS);
             }
         }
     }
@@ -63,15 +62,8 @@ public class AudioJob {
         List<ShyAudio> shyAudioList = audioService.findshyAudio(shyAudio);
         if (shyAudioList != null && shyAudioList.size() > 0) {
             for (ShyAudio audio : shyAudioList) {
-//                ShyYidun shyYidun = new ShyYidun();
-//                shyYidun.setContent_id(audio.getId().toString());
-//                //点播视频
-//                shyYidun.setCheck_type(4);
-//                ShyYidun shyYidun1 = yiDunServiceImpl.getidunMsgByContentId(shyYidun);
-//                if (shyYidun1 == null) {
                 logger.info("定时向易盾发送点播音频检测视频的audioId：" + audio.getAudioId());
                 audioService.audioFilter(audio);
-//                }
             }
         }
     }
@@ -40,7 +40,7 @@ public class ContentJob {
                 logger.info("当前白名单通过的content_id：" + content.getId());
                 content.setUpdater("白名单");
                 // 更新点播和审核的视频状态
-                contentService.callback(content.getId() + "", "白名单审核通过", 1, "", "白名单");
+                contentService.callback(content.getId() + "", "白名单审核通过", CommonConst.AUDIT_SUCCESS, "", "白名单");
             }
         }
     }
@@ -56,16 +56,7 @@ public class ContentJob {
         if (shyContentList != null && shyContentList.size() > 0) {
             logger.info("审核云提交网页审核到易盾数据个数:{}", shyContentList.size());
             for (ShyContent content : shyContentList) {
-                //易盾网站过滤
-//                ShyYidun shyYidun = new ShyYidun();
-//                shyYidun.setContent_id(content.getId().toString());
-//                //网页类型
-//                shyYidun.setCheck_type(3);
-//                ShyYidun shyYidun1 = yiDunServiceImpl.getidunMsgByContentId(shyYidun);
-//                logger.info("审核云ShyYidun表里不为空提交网页审核到易盾单条数据:{}", JSON.toJSONString(content));
-//                if (shyYidun1 == null) {
                 contentService.contentFilter(content);
-//                }
             }
         }
     }
@@ -28,6 +28,7 @@ public class VideosJob {
     /**
      * 白名单sp视频通过
+     * 免审、未审核
      */
     @Scheduled(fixedRate = 60 * 1000)
     public void updateVideos() {
@@ -42,13 +43,14 @@ public class VideosJob {
                 logger.info("当前白名单通过的videos_id：" + video.getId());
                 video.setUpdater("白名单");
                 // 更新点播和审核的视频状态
-                videosService.updateDianboAndShenhe(video, 3);
+                videosService.updateDianboAndShenhe(video, CommonConst.AUDIT_SUCCESS);
             }
         }
     }
     /**
      * 定时向易盾发送视频抽帧图片进行检测
+     * 机审 、未审核 、抽帧完成 进行送审
      * 每天10点到23点执行，每分钟一次
      */
     @Scheduled(cron = "0 0/1 10-23 * * ? ")
@@ -65,16 +67,8 @@ public class VideosJob {
             for (ShyVideos video : shyVideosList) {
                 logger.info("定时向易盾发送检测视频的videos_id：{}", video.getId());
                 //易盾图片过滤
-//                ShyYidun shyYidun = new ShyYidun();
-//                //点播视频
-//                shyYidun.setContent_id(video.getId().toString());
-//                //图片类型
-//                shyYidun.setCheck_type(2);
-//                ShyYidun shyYidun1 = yiDunServiceImpl.getidunMsgByContentId(shyYidun);
-//                if (shyYidun1 == null) {
                 logger.info("审核云定时向易盾发送视频抽帧图片检测：{}", video.getVideo_id());
                 videosService.videoFilter(video.getId());
-//                }
             }
         }
     }
@@ -7,10 +7,7 @@ import com.cnlive.shenhe.dto.AudioDTO;
 import com.cnlive.shenhe.entity.*;
 import com.cnlive.shenhe.mapper.ShyAudioMapper;
 import com.cnlive.shenhe.mapper.ShyUsersMapper;
-import com.cnlive.shenhe.utils.AuditPass;
-import com.cnlive.shenhe.utils.CommonConst;
-import com.cnlive.shenhe.utils.CommonUtils;
-import com.cnlive.shenhe.utils.YiDunAntiFraudUtil;
+import com.cnlive.shenhe.utils.*;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.apache.ibatis.session.RowBounds;
@@ -74,13 +71,19 @@ public class AudioServiceImpl {
         return shyAudiolist;
     }
+    /**
+     * 更新音频和审核状态
+     * @param shyAudio
+     * @param audioState 视频状态，1通过，2不通过
+     * @return
+     */
     public int updateAudioAndShenhe(ShyAudio shyAudio, int audioState) {
         //修改点播云音频状态
         JSONObject result = Pass.audioPass(shyAudio.getAudioId(), audioState, shyAudio.getAttr_tags(), shyAudio.getMsg(), shyAudio.getCallback());
         Integer code = result.getInteger("code");
         Integer shenheState = CommonConst.AUDIT_REFUSE;
         if (0 == code) {
-            if (audioState == 3) {
+            if (audioState == CommonConst.AUDIT_SUCCESS) {
                 shenheState = CommonConst.AUDIT_SUCCESS;
             }
             //修改审核云的音频状态
@@ -350,9 +353,10 @@ public class AudioServiceImpl {
     /**
      * 易盾点播音频过滤
-     *
+     * 音频送审时 给了回调地址
+     * 送审类型：1:文本 2:图片 3.网页 4:点播音频
      * @param shyAudio
-     * @return 1:文本 2:图片 3.网页 4:点播音频
+     * @return
      */
     public void audioFilter(ShyAudio shyAudio) {
         //调用易盾点播音频检测接口
@@ -368,7 +372,7 @@ public class AudioServiceImpl {
             shyYidun.setCreate_time(new Date());
             shyYidun.setTask_id(taskId);
             shyYidun.setData_id(dataId);
-            shyYidun.setCheck_type(4);
+            shyYidun.setCheck_type(CommonConstStates.DIANBOYINPIN);
             yiDunServiceImpl.addYiDunMsg(shyYidun);
         }
     }
@@ -7,10 +7,7 @@ import com.cnlive.shenhe.entity.*;
 import com.cnlive.shenhe.mapper.ShyCommentsMapper;
 import com.cnlive.shenhe.mapper.ShyContentMapper;
 import com.cnlive.shenhe.mapper.ShyUsersMapper;
-import com.cnlive.shenhe.utils.AuditPass;
-import com.cnlive.shenhe.utils.CommonConst;
-import com.cnlive.shenhe.utils.CommonUtils;
-import com.cnlive.shenhe.utils.YiDunAntiFraudUtil;
+import com.cnlive.shenhe.utils.*;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.apache.ibatis.session.RowBounds;
@@ -384,9 +381,9 @@ public class ContentServiceImpl {
     /**
      * 易盾网站过滤
-     *
+     * 送审类型：1:文本 2:图片 3.网页 4:点播音频
      * @param shyContent
-     * @return 1:文本 2:图片 3.网页 4:点播音频
+     * @return
      */
     public void contentFilter(ShyContent shyContent) {
         try {
@@ -403,7 +400,7 @@ public class ContentServiceImpl {
                 shyYidun.setUrl(contentUrl);
                 shyYidun.setTask_id(taskId);
                 shyYidun.setData_id(dataId);
-                shyYidun.setCheck_type(3);
+                shyYidun.setCheck_type(CommonConstStates.WANGYE);
                 shyYidun.setContent_id(shyContent.getId().toString());
                 shyYidun.setCreate_time(new Date());
                 logger.info("审核云保存到ShyYidun表里数据:{}", JSON.toJSONString(shyYidun));
@@ -12,10 +12,7 @@ import com.cnlive.shenhe.entity.ShyVideos;
 import com.cnlive.shenhe.entity.ShyYidun;
 import com.cnlive.shenhe.mapper.ShyUsersMapper;
 import com.cnlive.shenhe.mapper.ShyVideosMapper;
-import com.cnlive.shenhe.utils.AuditPass;
-import com.cnlive.shenhe.utils.CommonConst;
-import com.cnlive.shenhe.utils.CommonUtils;
-import com.cnlive.shenhe.utils.YiDunAntiFraudUtil;
+import com.cnlive.shenhe.utils.*;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.apache.ibatis.session.RowBounds;
@@ -28,7 +25,10 @@ import org.springframework.util.StringUtils;
 import tk.mybatis.mapper.entity.Example;
 import java.text.ParseException;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
 /**
  * @Auther: chenhao
@@ -332,9 +332,9 @@ public class VideosServiceImpl {
     /**
      * 易盾视频（图片）过滤
-     *
+     * type:1:文本 2:图片 3.网页 4:点播音频
      * @param cid 审核云中视频的id
-     * @return 1:文本 2:图片 3.网页 4:点播音频
+     * @return
      */
     public int videoFilter(Integer cid) {
         ShyVideos shyVideos = shyVideosMapper.selectByPrimaryKey(cid);
@@ -369,7 +369,7 @@ public class VideosServiceImpl {
         if (type.toLowerCase().equals(CommonConst.PASS)) {
             shyVideos.setMsg(desc);
             //修改点播云视频状态
-            videosService.updateDianboAndShenhe(shyVideos, 3);
+            videosService.updateDianboAndShenhe(shyVideos, CommonConst.AUDIT_SUCCESS);
         } else if (type.toLowerCase().equals(CommonConst.REJECT)) {
             //审核类型改为人工审核
             shyVideos.setShenhe_type(CommonConst.AUDIT_TYPE_USER);
@@ -384,7 +384,7 @@ public class VideosServiceImpl {
             shyYidun.setUrl(url);
             shyYidun.setDesc_msg(desc);
             //校验图片类型
-            shyYidun.setCheck_type(2);
+            shyYidun.setCheck_type(CommonConstStates.TUPIAN);
             shyYidun.setDuration(shyVideos.getDuration());
             shyYidun.setCreate_time(new Date());
@@ -400,7 +400,7 @@ public class VideosServiceImpl {
      * 更新点播和审核的视频状态
      *
      * @param video
-     * @param dianboState 视频状态，3通过，4不通过
+     * @param dianboState 视频状态，1通过，2不通过
      * @return
      */
     public int updateDianboAndShenhe(ShyVideos video, int dianboState) {
@@ -413,7 +413,7 @@ public class VideosServiceImpl {
         String callback = video.getCallback();
         if (callback.contains("bc.cnlive.com")) {
             if ("0".equals(errorCode)) {
-                if (dianboState == 3) {
+                if (dianboState == CommonConst.AUDIT_SUCCESS) {
                     shenheState = CommonConst.AUDIT_SUCCESS;
                 }
                 //修改审核云的视频状态
@@ -429,7 +429,7 @@ public class VideosServiceImpl {
             }
         } else {
             if (0 == code) {
-                if (dianboState == 3) {
+                if (dianboState == CommonConst.AUDIT_SUCCESS) {
                     shenheState = CommonConst.AUDIT_SUCCESS;
                 }
                 //修改审核云的视频状态
@@ -490,7 +490,7 @@ public class VideosServiceImpl {
                     //机审
                     shenheType = CommonConst.AUDIT_TYPE_MACHANE;
                 }
-                if (renGongShenHe(shyVideo)) {
+                if (manualReview(shyVideo)) {
                     //给审核变量 赋值人工审核
                     shenheType = CommonConst.AUDIT_TYPE_USER;
                 }
@@ -510,7 +510,7 @@ public class VideosServiceImpl {
      * @param shyVideo
      * @return
      */
-    public boolean renGongShenHe(ShyVideos shyVideo) {
+    public boolean manualReview(ShyVideos shyVideo) {
         String[] list = {"41", "42", "43", "44", "45", "46", "47"};
         List<String> asList = Arrays.asList(list);
         if (asList.contains(shyVideo.getSource())) {
@@ -46,8 +46,6 @@ public class CommonConstStates {
      */
     public static Integer QUANBU = 0;
-
-    //是否显示 0:不显示 1：显示
     /**
      * 是否显示 0:不显示 1：显示
      */
@@ -57,8 +55,6 @@ public class CommonConstStates {
      */
     public static Integer SHIFOU_XIANSHIYES = 1;
-
-    //商务模式：0免费  1收费
     /**
      * 商务模式：0免费  1收费
      */
@@ -68,8 +64,6 @@ public class CommonConstStates {
      */
     public static Integer SHOUFEI = 1;
-    //0表示正常 1表示下线
-
     /**
      * 0表示正常 1表示下线
      */
@@ -78,4 +72,24 @@ public class CommonConstStates {
      * 0表示正常 1表示下线
      */
     public static Integer XIAXIAN = 1;
+
+
+    /**
+     * 1:文本 2:图片 3.网页 4:点播音频
+     */
+    public static Integer DIANBOYINPIN = 4;
+    /**
+     * 1:文本 2:图片 3.网页 4:点播音频
+     */
+    public static Integer WANGYE = 3;
+    /**
+     * 1:文本 2:图片 3.网页 4:点播音频
+     */
+    public static Integer TUPIAN = 2;
+    /**
+     * 1:文本 2:图片 3.网页 4:点播音频
+     */
+    public static Integer WENBEN = 1;
+
+
 }