1

src/main/java/com/fdkankan/fusion/controller/ModelController.java

@@ -49,6 +49,11 @@ public class ModelController extends BaseController{
         String code = modelService.uploadObjProgress(modelId);
         return ResultData.ok(Integer.valueOf(code));
     }
+    @GetMapping("/cancelUpload")
+    public ResultData cancelUpload(@RequestParam(required = false) Integer modelId) throws Exception {
+        modelService.cancelUpload(modelId);
+        return ResultData.ok();
+    }
 
     @PostMapping("/list")
     public ResultData list(@RequestBody ModelPram param){

src/main/java/com/fdkankan/fusion/service/IModelService.java

@@ -39,4 +39,6 @@ public interface IModelService extends IService<Model> {
     Object getInfo(Integer modelId);
 
     String uploadObjProgress(Integer modelId);
+
+    void cancelUpload(Integer modelId);
 }

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

@@ -3,6 +3,7 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
+import java.util.concurrent.ThreadPoolExecutor;
 import java.util.stream.Collectors;
 
 import cn.hutool.core.io.FileUtil;
@@ -147,12 +148,12 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
 
                     String name = file1.getName();
                     if(name.contains("obj") || name.contains("OBJ")){
-                        glbOssPath = glbOssPath.replace("mesh.glb",file1.getName().replace("obj","glb"));
+                        glbOssPath = glbOssPath.replace("mesh.glb",file1.getName().replace(".obj",".glb"));
                         model.setModelDateType("obj");
                         model.setModelType("glb");
-                        OBJToGLBUtil.objToGlb(objPath,name,  file1.getPath().replace("obj","glb"));
+                        OBJToGLBUtil.objToGlb(objPath,name,  file1.getPath().replace(".obj",".glb"));
                         redisUtil.set(RedisKeyUtil.modelUpload+model.getModelId(),"65");
-                        uploadToOssUtil.uploadOss(file1.getPath(),glbOssPath);
+                        uploadToOssUtil.uploadOss(file1.getPath().replace(".obj",".glb"),glbOssPath);
                     }
                     if(name.contains(".ply")){
                         model.setModelDateType("ply");
@@ -312,4 +313,13 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
         }
         return "0";
     }
+
+    @Override
+    public void cancelUpload(Integer modelId) {
+        String redisKey = RedisKeyUtil.modelUpload+modelId;
+        if(!redisUtil.hasKey(redisKey)){
+            return;
+        }
+
+    }
 }