视频时长小于60秒的抽帧时传入num字段

郑超
1 parent a3f8d16b
Showing 2 changed files with 42 additions and 30 deletions
src/main/java/com/cnlive/shenhe/api/AvsampleCallBackControllerApi.java
src/main/java/com/cnlive/shenhe/api/VideosControllerApi.java
@@ -29,43 +29,51 @@ public class AvsampleCallBackControllerApi {
  
     /**
      * 接收抽帧结果
+     *
      * @param json
      */
     @PostMapping("/callback")
     @ResponseBody
     public JSONObject callback(@RequestBody JSONObject json) {
-        logger.info("抽帧回调请求。。。。json=="+json.toJSONString());
         JSONObject result = new JSONObject();
-        result.put("code",1);
-        String taskId = json.getString("taskId");
-        if(CommonUtils.isNotEmpty(taskId)){
-            ShyVideos shyVideo = new ShyVideos();
-            shyVideo.setTask_id(taskId);
-            List<ShyVideos> shyVideosList = videosService.findshyVideo(shyVideo);
-            if(!shyVideosList.isEmpty()){
-                ShyVideos video = shyVideosList.get(0);
-                Integer code = json.getInteger("code");
-                if(code==3){
-                    video.setAvsample(CommonConst.AVSAMPLE_SUCCESS);
-                    video.setAvsample_imgs(json.getJSONArray("images").toJSONString());
-                }else{
-                    video.setAvsample(CommonConst.AVSAMPLE_FAIL);//抽帧失败
-                    video.setShenhe_type(CommonConst.AUDIT_TYPE_USER);//改为人工审核
-                    video.setMsg("抽帧失败，改为人工审核，失败消息："+json.getInteger("errorMsg"));
-                }
-                video.setAvsample_msg(json.toJSONString());
-                boolean success = videosService.updateshyVideos(video);
-                if(!success){
-                    result.put("code",-1);
+        result.put("code", 1);
+        try {
+            logger.info("抽帧回调请求。。。。json=={}", json.toJSONString());
+            String taskId = json.getString("taskId");
+            if (CommonUtils.isNotEmpty(taskId)) {
+                ShyVideos shyVideo = new ShyVideos();
+                shyVideo.setTask_id(taskId);
+                List<ShyVideos> shyVideosList = videosService.findshyVideo(shyVideo);
+                if (!shyVideosList.isEmpty()) {
+                    ShyVideos video = shyVideosList.get(0);
+                    Integer code = json.getInteger("code");
+                    if (code == 3) {
+                        video.setAvsample(CommonConst.AVSAMPLE_SUCCESS);
+                        video.setAvsample_imgs(json.getJSONArray("images").toJSONString());
+                    } else {
+                        //抽帧失败
+                        video.setAvsample(CommonConst.AVSAMPLE_FAIL);
+                        //改为人工审核
+                        video.setShenhe_type(CommonConst.AUDIT_TYPE_USER);
+                        video.setMsg("抽帧失败，改为人工审核，失败消息：" + json.getString("errorMsg"));
+                    }
+                    video.setAvsample_msg(json.toJSONString());
+                    boolean success = videosService.updateshyVideos(video);
+                    if (!success) {
+                        result.put("code", -1);
+                    }
                 }
             }
+            return result;
+        } catch (Exception e) {
+            e.printStackTrace();
         }
         return result;
     }
-    
+
     @GetMapping("/getGame")
-    public String getGame(){
-    	return "html/game.html";
+    public String getGame() {
+        return "html/game.html";
     }
-    
+
 }
@@ -223,13 +223,16 @@ public class VideosControllerApi {
  
             //非“目击者”视频
             if (!video.getCategory().equals(CommonConst.CATEGORY_WITNESS)) {
-                //默认抽帧时长
-                Integer interval = 10;
-                //抽帧时长的算法：视频时长每增加一小时，抽帧时长增加10秒
-                interval = video.getDuration() / 3600 * 10 + 10;
+                //默认抽帧时长 抽帧时长的算法：视频时长每增加一小时，抽帧时长增加10秒
+                Integer duration = video.getDuration();
+                Integer interval = duration / 3600 * 10 + 10;
                 attach.put("interval", interval);
                 attach.put("strategy", 1);
                 attach.put("duration", video.getDuration());
+                if (duration < 60) {
+                    int num = duration / 10;
+                    attach.put("num", num == 0 ? 1 : num);
+                }
             } else {
                 //“目击者”视频时间大于4秒
                 if (video.getDuration() > 4) {
@@ -295,4 +298,5 @@ public class VideosControllerApi {
         return video;
     }
  
+
 }