修改不能加水印bug

4dkankan-scene/src/main/java/com/fdkankan/scene/service/impl/SceneProServiceImpl.java

@@ -3077,11 +3077,12 @@ public class SceneProServiceImpl extends BaseServiceImpl<SceneProEntity, String>
         String fileName = downloadVideoParam.getPlanId() + ".mp4";
         String newFileName = downloadVideoParam.getPlanId() + Constant.SCENE_VIDEO_SHARE_SUFFIX +".mp4";
         String url = prefixAli + "video/video" + downloadVideoParam.getSceneNum() + "/" + newFileName;
+        String ossFile = "video/video" + downloadVideoParam.getSceneNum() + "/" + fileName;
+        String targetPath = ConstantFilePath.SCENE_PATH + "video/video" + downloadVideoParam.getSceneNum() + "/";
+        String targetFile = targetPath + fileName;
 
         // oss下载原视频
-        String ossFile = "video/video" + downloadVideoParam.getSceneNum() + "/" + fileName;
-        String targetFile = ConstantFilePath.SCENE_PATH + "video/video" + downloadVideoParam.getSceneNum() + "/" + fileName;
-        CreateObjUtil.ossUtilCp(ossFile, targetFile);
+        CreateObjUtil.ossUtilCp(ossFile, targetPath);
 
         // 生成水印视频
         CreateObjUtil.generateShareVideo(targetFile);

4dkankan-scene/src/main/java/com/fdkankan/scene/util/CreateObjUtil.java

@@ -42,18 +42,17 @@ public class CreateObjUtil{
 
 	/**
 	 * 生成水印视频
-	 * @param folderName
-	 * @param isModel
 	 * @throws Exception
 	 */
 	public static void generateShareVideo(String videoPath) throws Exception{
 		log.info("生成水印视频开始");
-		String fileName = videoPath.substring(videoPath.lastIndexOf("/"));
+		String fileName = videoPath.substring(videoPath.lastIndexOf("/") + 1);
 		String fileFolderPath = videoPath.substring(0, videoPath.lastIndexOf("/") + 1);
 		String command = "4dage-ffmpeg-rotVwatermark -s " + videoPath
 				+ " -w " + Constant.WATER_MARK_PATH
 				+ " -n " + fileName + Constant.SCENE_VIDEO_SHARE_SUFFIX
-				+ " -o" + fileFolderPath;
+				+ " -o " + fileFolderPath;
+		log.info("调用脚本命令-{}", command);
 		callshell(command);
 		log.info("生成水印视频结束");
 	}
@@ -252,7 +251,7 @@ public class CreateObjUtil{
              outGobbler.start();  
              process.waitFor();  
         } catch (Exception e) {  
-            e.printStackTrace();  
+            log.error("调用脚本报错，命令-{}, 错误原因", command, e);
         }  
 	}
 	

4dkankan-web/src/main/java/com/fdkankan/web/controller/SceneEditController.java

@@ -1157,7 +1157,7 @@ public class SceneEditController extends BaseController {
 
     @ApiOperation("下载球幕视频")
     @CheckCurrentUser(description = "下载球幕视频")
-    @CheckScene
+//    @CheckScene
     @GetMapping("/downloadVideo")
     public ViewResult<DownlVideoVO> downloadVideo(DownloadVideoParam downloadVideoParam) throws Exception{
         String url = sceneProService.downloadVideo(downloadVideoParam);