不能删除

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

@@ -3838,8 +3838,9 @@ public class SceneProServiceImpl extends BaseServiceImpl<SceneProEntity, String>
         if(strsceneInfos != null) {
             scenejson = JSONObject.parseObject(strsceneInfos);
         }
-
+        log.info("转换前-scene.json文件转换json-{}", scenejson);
         JSONObject object = putVideoDataToSceneJson(operaVideoDTO, scenejson);
+        log.info("转换后-scene.json文件转换json-{}", scenejson);
         FileUtils.writeFile(dataBuffer + "scene.json", scenejson.toString());
 
         Map<String, String> uploadMap = new HashMap<>();

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

@@ -46,11 +46,12 @@ public class CreateObjUtil{
 	 */
 	public static void generateShareVideo(String videoPath) throws Exception{
 		log.info("生成水印视频开始");
-		String fileName = videoPath.substring(videoPath.lastIndexOf("/") + 1);
+		String fileName = videoPath.substring(videoPath.lastIndexOf("/") + 1, videoPath.lastIndexOf("."));
+		String suffix = videoPath.substring(videoPath.lastIndexOf("."));
 		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
+				+ " -n " + fileName + Constant.SCENE_VIDEO_SHARE_SUFFIX + suffix
 				+ " -o " + fileFolderPath;
 		log.info("调用脚本命令-{}", command);
 		callshell(command);

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

@@ -27,11 +27,13 @@ public class VrController extends BaseController {
         return ViewResult.success(RandomUtil.generateOnlyStringLongUuid());
     }
 
-//    @ApiOperation("获取")
-//    @PostMapping("/test")
-//    public void test(@Valid @RequestBody TestDTO testDTO) {
-//        System.out.println("");
-//    }
+    @ApiOperation("获取")
+    @GetMapping("/test")
+    public void test() {
+        String d = "op/dddd/aa.mp4";
+        System.out.println(d.substring(d.lastIndexOf("/") + 1, d.lastIndexOf(".")));
+        System.out.println(d.substring(d.lastIndexOf(".")));
+    }
 
 
 }