oss环境路径

src/main/java/com/fdkankan/fusion/common/FilePath.java

@@ -3,7 +3,7 @@ package com.fdkankan.fusion.common;
 public class FilePath {
 
     public final static String LOCAL_BASE_PATH = "/home/tomcat/jar-fusion-8808/";
-    public final static String MNT_BASE_PATH = "/mnt/";
+    public final static String MNT_BASE_PATH = "/mnt/fusion/";
     public final static String OSS_BASE_PATH = "fusion/";
 
     public final static String OBJ_OSS_PATH = "scene_view_data/%s/data/mesh";

src/main/java/com/fdkankan/fusion/service/impl/CaseVideoServiceImpl.java

@@ -139,14 +139,14 @@ public class CaseVideoServiceImpl extends ServiceImpl<ICaseVideoMapper, CaseVide
                     if(StringUtils.isNotBlank(videoFolder.getVideoFolderCover()) &&  uploadToOssUtil.existKey(videoFolder.getVideoFolderCover().replace(queryPath,""))){
                         newCover = false;
                     }
-                    String mergeLocalName = VideoUtil.mergeVideo(filePathSetAll, FilePath.VIDEO_LOCAL_PATH,newCover);
+                    String mergeLocalName = VideoUtil.mergeVideo(filePathSetAll, String.format(FilePath.VIDEO_LOCAL_PATH,environment),newCover);
                     redisUtil.set(RedisKeyUtil.mergerVideoKey + videoFolder.getVideoFolderId(), "30");
                     if (mergeLocalName == null) {
                         updateCaseVideoStatus(videoFolder.getVideoFolderId(), -1);
                         redisUtil.set(RedisKeyUtil.mergerVideoKey + videoFolder.getVideoFolderId(), "-1");
                         return;
                     }
-                    String mergeLocalPath = FilePath.VIDEO_LOCAL_PATH + "/" + mergeLocalName;
+                    String mergeLocalPath = String.format(FilePath.VIDEO_LOCAL_PATH,environment) + "/" + mergeLocalName;
                     String ossKey = String.format(FilePath.VIDEO_OSS_PATH,environment, videoFolder.getVideoFolderId()) + "/" + mergeLocalName;
                     uploadToOssUtil.uploadOss(mergeLocalPath, ossKey);
                     if (!uploadToOssUtil.existKey(ossKey)) {
@@ -155,7 +155,7 @@ public class CaseVideoServiceImpl extends ServiceImpl<ICaseVideoMapper, CaseVide
                         return;
                     }
                     if(newCover){
-                        String mergeLocalPathImg = FilePath.VIDEO_LOCAL_PATH + "/" + mergeLocalName.replace(".mp4", ".jpg");
+                        String mergeLocalPathImg = String.format(FilePath.VIDEO_LOCAL_PATH,environment) + "/" + mergeLocalName.replace(".mp4", ".jpg");
                         String ossKeyImg = String.format(FilePath.VIDEO_OSS_PATH, environment,videoFolder.getVideoFolderId()) + "/" + mergeLocalName.replace(".mp4", ".jpg");
                         uploadToOssUtil.uploadOss(mergeLocalPathImg, ossKeyImg);
                         if (!uploadToOssUtil.existKey(ossKeyImg)) {
@@ -170,7 +170,7 @@ public class CaseVideoServiceImpl extends ServiceImpl<ICaseVideoMapper, CaseVide
 
                     videoFolder.setVideoMergeUrl(queryPath + ossKey);
                     videoFolderService.updateById(videoFolder);
-                    FileUtil.del(FilePath.VIDEO_LOCAL_PATH);
+                    FileUtil.del(String.format(FilePath.VIDEO_LOCAL_PATH,environment));
                     updateCaseVideoStatus(videoFolder.getVideoFolderId(), 1);
 
                     //删除oss原资源

src/main/java/com/fdkankan/fusion/service/impl/ModelServiceImpl.java

@@ -164,6 +164,7 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
                         if(!uploadToOssUtil.existKey(glbOssPath)){
                             setCreateStatus(model,-1);
                             redisUtil.set(RedisKeyUtil.modelUpload+model.getModelId(),"-1");
+                            return;
                         }
                     }
                     if(name.contains(".ply")){
@@ -179,15 +180,17 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
                         glbOssPath = mntFile.getPath().replace("/mnt/","")+"/webcloud";
                         redisUtil.set(RedisKeyUtil.modelUpload+model.getModelId(),"65");
                         uploadToOssUtil.uploadFileOss(mntFile );
-                        if(!uploadToOssUtil.existKey(glbOssPath)){
+                        if(!uploadToOssUtil.existKey(glbOssPath+"/cloud.js")){
                             setCreateStatus(model,-1);
                             redisUtil.set(RedisKeyUtil.modelUpload+model.getModelId(),"-1");
+                            return;
                         }
                     }
 
                     model.setModelGlbUrl(queryPath + glbOssPath);
                     setCreateStatus(model,1);
                     modelService.saveOrUpdate(model);
+                    redisUtil.set(RedisKeyUtil.modelUpload+model.getModelId(),"100");
                 }catch (Exception e){
                     setCreateStatus(model,-1);
                 }finally {
@@ -200,7 +203,6 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
                     if(mntFile!=null){
                         FileUtil.del(mntFile.getParentFile());
                     }
-                    redisUtil.set(RedisKeyUtil.modelUpload+model.getModelId(),"100");
                 }
             }
         }).start();