屏蔽白名单回调有问题的数据

周伟鹏
1 parent 43d81996
Showing 6 changed files with 16 additions and 5 deletions
src/main/java/com/cnlive/shenhe/api/AvsampleCallBackControllerApi.java
src/main/java/com/cnlive/shenhe/api/VideosControllerApi.java
src/main/java/com/cnlive/shenhe/job/CommentsJob.java
src/main/java/com/cnlive/shenhe/job/VideosJob.java
src/main/java/com/cnlive/shenhe/utils/CommonConst.java
src/main/resources/application.properties
 package com.cnlive.shenhe.api;
 import com.alibaba.fastjson.JSONObject;
+import com.cnlive.shenhe.bean.ErrorEnum;
+import com.cnlive.shenhe.bean.ResponseBean;
 import com.cnlive.shenhe.entity.ShyVideos;
 import com.cnlive.shenhe.serviceImpl.VideosServiceImpl;
 import com.cnlive.shenhe.utils.CommonConst;
@@ -34,7 +36,7 @@ public class AvsampleCallBackControllerApi {
      * @param json
      */
     @PostMapping("/callback")
-    public void callback(@RequestBody JSONObject json) {
+    public ResponseBean callback(@RequestBody JSONObject json) {
         logger.info("抽帧回调请求。。。。json=="+json.toJSONString());
         String taskId = json.getString("taskId");
         if(CommonUtils.isNotEmpty(taskId)){
@@ -54,6 +56,8 @@ public class AvsampleCallBackControllerApi {
                 videosService.updateshyVideos(video);
             }
+            return new ResponseBean();
         }
+        return new ResponseBean(ErrorEnum.ERROR);
     }
 }
@@ -165,7 +165,7 @@ public class VideosControllerApi {
                 params.put("dstBucket", qn_bucket);
             }
             String dstDir = desdir + "/" + spid + "/" + CommonUtils.getCurrentDate("yyyy/MM/dd");
-            String formats = video_url.substring(video_url.indexOf(".") + 1);
+            String formats = path.substring(path.indexOf(".") + 1);
             params.put("path", path);
             params.put("dstDir", dstDir);
             params.put("type", "avsample");
@@ -185,6 +185,7 @@ public class VideosControllerApi {
             httpUtil.setParamMap(dataMap);
             Map<String, String> resultMap = httpUtil.post(url);
             JSONObject result = JSON.parseObject(resultMap.get("result"));
+            logger.info("请求抽帧结果：result:{}",result);
             Integer code = result.getInteger("code");
             if (code == 0) {
                 video.setAvsample(CommonConst.AVSAMPLE_ING);
@@ -72,6 +72,7 @@ public class CommentsJob {
                                 logger.error("评论审核回调失败，activity_id:{},errorCode:{},errorMessage:{}", comments.getActivity_id(), errorCode, result.getString("errorMessage"));
                             }
                         } else {
+                            commentsService.updateComment(comments.getId(), CommonConst.AUDIT_CALLBACK_FAIL, "白名单回调失败");
                             logger.error("评论审核回调失败，activity_id:{},errorCode:{},errorMessage:{}", comments.getActivity_id(), errorCode, result.getString("errorMessage"));
                         }
                     } catch (Exception e) {
@@ -62,11 +62,12 @@ public class VideosJob {
                         result = Pass.auditPass(video.getVideo_id(), 3, "", "", video.getCallback());
                         Integer code = result.getInteger("code");
                         if (0 == code) {
-                            int i = videosService.updateVideo(video.getId(), video.getAuditor_id(), CommonConst.AUDIT_SUCCESS, "");
+                            int i = videosService.updateVideo(video.getId(), null, CommonConst.AUDIT_SUCCESS, result.getString("msg"));
                             if (i != 1) {
                                 logger.error("点播视频更改失败,activity_id:{}", video.getVideo_id());
                             }
                         } else {
+                            videosService.updateVideo(video.getId(), null, CommonConst.AUDIT_CALLBACK_FAIL, "白名单回调失败");
                             logger.error("点播视频回调失败，activity_id:{},code:{},msg:{}", video.getVideo_id(), code, result.getString("msg"));
                         }
                     } catch (Exception e) {
@@ -23,6 +23,10 @@ public class CommonConst {
      */
     public static Integer AUDIT_REFUSE = 2;
+    /**
+     * 审核状态：白名单通过回调失败
+     */
+    public static Integer AUDIT_CALLBACK_FAIL = 3;
     /**
      * 领取状态：未领
@@ -38,8 +38,8 @@ platformValue=10011438
 #抽帧常量
 avsmple_appKey=6962df5e02d846f490d64f3a68ac89fc
-avsmple_appSecret=a34b7b6ff20c4816981465a1fd901a9f0419921382844328948373eee63934d4
-avsmple_url=http://transcode.cnlive.com/api/request
+avsmple_appSecret=a34b7b6ff20c4816981465a1fd901a9f0419921382844328948373eee639f9d4
+avsmple_url=http://test.transcode.cnlive.com/api/request
 avsmple_callback=http://test.shen.cnlive.com/api/avsample/callback
 #抽帧存放bucket和域名