lyhzzz před 2 měsíci
rodič
revize
b3b56e750c

+ 1 - 1
src/main/java/com/fdkankan/fusion/service/impl/CommonUploadServiceImpl.java

@@ -64,6 +64,7 @@ public class CommonUploadServiceImpl extends ServiceImpl<ICommonUploadMapper, Co
         }
         File  tempFile = null;
 
+        FileWriterUtil.checkSpace(file.getSize(),1.1);
         try {
             String uuid = UUID.randomUUID().toString().replace("-","");
             String name = file.getOriginalFilename();
@@ -81,7 +82,6 @@ public class CommonUploadServiceImpl extends ServiceImpl<ICommonUploadMapper, Co
             }
             //localToOssUtil.uploadOss(tempFile.getPath(), ossPath);
             //String url = this.ossUrlPrefix + ossPath;
-            FileWriterUtil.checkSpace(file.getSize(),1.1);
             String url = CacheUtil.mapping + ossPath;
 
             FileTypeEnum fileTypeEnum = FileTypeEnum.getByType(extName.replace(".", ""));

+ 1 - 1
src/main/java/com/fdkankan/fusion/service/impl/SceneCommonService.java

@@ -162,7 +162,7 @@ public class SceneCommonService implements ISceneCommonService {
                 vo.setStatus(scene.getStatus() );
             }else {
                 //生成OBJ状态,-1失败 0,未生成 1完成,2计算中 3,排队中 4,暂停
-                if(vo.getIsLaser() && scene.getBuildObjStatus() != null){
+                if(SceneTypeUtil.isLaserMesh(vo.getType()) && scene.getBuildObjStatus() != null){
                     switch (scene.getBuildObjStatus()){
                         case -1: vo.setStatus(1); break;
                         case 0: vo.setStatus(3); break;