Browse Source

上传模型删除文件

lyhzzz 2 years ago
parent
commit
82af8a65e3
1 changed files with 17 additions and 9 deletions
  1. 17 9
      src/main/java/com/fdkankan/fusion/service/impl/ModelServiceImpl.java

+ 17 - 9
src/main/java/com/fdkankan/fusion/service/impl/ModelServiceImpl.java

@@ -161,6 +161,10 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
                         OBJToGLBUtil.objToGlb2(file1.getPath(), file1.getPath().replace(".obj",".glb"));
                         redisUtil.set(RedisKeyUtil.modelUpload+model.getModelId(),"65");
                         uploadToOssUtil.uploadOss(file1.getPath().replace(".obj",".glb"),glbOssPath);
+                        if(!uploadToOssUtil.existKey(glbOssPath)){
+                            setCreateStatus(model,-1);
+                            redisUtil.set(RedisKeyUtil.modelUpload+model.getModelId(),"-1");
+                        }
                     }
                     if(name.contains(".ply")){
                         model.setModelDateType("ply");
@@ -175,6 +179,10 @@ 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)){
+                            setCreateStatus(model,-1);
+                            redisUtil.set(RedisKeyUtil.modelUpload+model.getModelId(),"-1");
+                        }
                     }
 
                     model.setModelGlbUrl(queryPath + glbOssPath);
@@ -183,15 +191,15 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
                 }catch (Exception e){
                     setCreateStatus(model,-1);
                 }finally {
-//                    if(newObjFile!=null){
-//                        FileUtil.del(newObjFile);
-//                    }
-//                    if(objPathFile!=null){
-//                        FileUtil.del(objPathFile);
-//                    }
-//                    if(mntFile!=null){
-//                        FileUtil.del(mntFile.getParentFile());
-//                    }
+                    if(newObjFile!=null){
+                        FileUtil.del(newObjFile);
+                    }
+                    if(objPathFile!=null){
+                        FileUtil.del(objPathFile);
+                    }
+                    if(mntFile!=null){
+                        FileUtil.del(mntFile.getParentFile());
+                    }
                     redisUtil.set(RedisKeyUtil.modelUpload+model.getModelId(),"100");
                 }
             }