lyhzzz il y a 2 ans
Parent
commit
5b64ba7773

+ 0 - 3
src/main/java/com/fdkankan/fusion/controller/CaseVideoController.java

@@ -51,9 +51,6 @@ public class CaseVideoController {
     @GetMapping("/uploadAddVideoProgress")
     public ResultData uploadAddVideoProgress(@RequestParam(required = false) Integer folderId) throws Exception {
         String code = caseVideoService.uploadAddVideoProgress(folderId);
-        if("-1".equals(code)){
-            return ResultData.error("上传失败");
-        }
         return ResultData.ok(Integer.valueOf(code));
     }
 

+ 0 - 3
src/main/java/com/fdkankan/fusion/controller/ModelController.java

@@ -47,9 +47,6 @@ public class ModelController extends BaseController{
     @GetMapping("/uploadObjProgress")
     public ResultData uploadAddVideoProgress(@RequestParam(required = false) Integer modelId) throws Exception {
         String code = modelService.uploadObjProgress(modelId);
-        if("-1".equals(code)){
-            return ResultData.error("上传失败");
-        }
         return ResultData.ok(Integer.valueOf(code));
     }
 

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

@@ -103,19 +103,23 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
         }
         objPathFile = new File(objPath );
         if(!objPathFile.isDirectory()){
+            redisUtil.set(RedisKeyUtil.modelUpload+model.getModelId(),"-1");
             throw new BusinessException(ResultCode.UPLOAD_FILE_TYPE_ERROR);
         }
         List<File> fileList = new ArrayList<>();
         FileWriterUtil.getCanRunList(fileList,objPathFile);
 
         if(fileList.size() != 1){
+            redisUtil.set(RedisKeyUtil.modelUpload+model.getModelId(),"-1");
             throw new BusinessException(ResultCode.UPLOAD_FILE_TYPE_ERROR);
         }
         File file1 = fileList.get(0);
         if(file1 == null){
+            redisUtil.set(RedisKeyUtil.modelUpload+model.getModelId(),"-1");
             throw new BusinessException(ResultCode.UPLOAD_FILE_TYPE_ERROR);
         }
         if(com.fdkankan.fusion.common.util.StringUtils.isChinese(file1.getName())){
+            redisUtil.set(RedisKeyUtil.modelUpload+model.getModelId(),"-1");
             throw new BusinessException(ResultCode.UPLOAD_FILE_CHINA_NAME);
         }
         redisUtil.set(RedisKeyUtil.modelUpload+model.getModelId(),"20");
@@ -296,6 +300,6 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
         if(redisUtil.hasKey(redisKey)){
             return redisUtil.get(redisKey);
         }
-        return "-1";
+        return "0";
     }
 }