1

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

@@ -8,6 +8,7 @@ import com.fdkankan.fusion.common.ResultCode;
 import com.fdkankan.fusion.common.ResultData;
 import com.fdkankan.fusion.common.ResultCode;
 import com.fdkankan.fusion.common.util.MD5Checksum;
+import com.fdkankan.fusion.common.util.UploadToOssUtil;
 import com.fdkankan.fusion.entity.Model;
 import com.fdkankan.fusion.exception.BusinessException;
 import com.fdkankan.fusion.request.ModelPram;
@@ -106,6 +107,10 @@ public class ModelController extends BaseController{
 
     @Value("${spring.profiles.active}")
     private String environment;
+    @Autowired
+    UploadToOssUtil uploadToOssUtil;
+    @Value("${upload.query-path}")
+    private String queryPath;
     @GetMapping("/downMD5")
     public void downMD5(@RequestParam(required = false) Integer modelId,
                         HttpServletResponse res, HttpServletRequest req) throws IOException {
@@ -118,8 +123,9 @@ public class ModelController extends BaseController{
             if(StringUtils.isBlank(model.getFileNewName())){
                 throw new BusinessException(ResultCode.FILE_NOT_EXIST);
             }
+            String sceneObjPath = model.getFileNewName().replace(queryPath,"");
 
-            FileInfoVo fileInfo = MD5Checksum.getFileInfo(model.getFileNewName());
+            FileInfoVo fileInfo = uploadToOssUtil.getFileInfo(sceneObjPath);
             if(fileInfo == null){
                 throw new BusinessException(ResultCode.FILE_NOT_EXIST);
             }

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

@@ -116,7 +116,7 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
         if(!newObjFile.getParentFile().exists()){
             newObjFile.getParentFile().mkdirs();
         }
-        model.setFileNewName(objPath +"/" + fileName2);
+
         file.transferTo(newObjFile);
         threadService.uploadModelObj(fileName2,objPath,newObjFile,model);
         return model;

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

@@ -145,7 +145,7 @@ public class ThreadService {
                 ShellUtil.yunUpload(objPathFile.getPath(),objPathFile.getPath().replace(FilePath.LOCAL_BASE_PATH,"fusion/"));
                 model.setModelGlbUrl((JSONArray.toJSONString(Arrays.asList(queryPath +  objPathFile.getPath().replace(FilePath.LOCAL_BASE_PATH,"fusion/") ))));
             }
-
+            model.setFileNewName(queryPath + objPathFile.getPath().replace(FilePath.LOCAL_BASE_PATH,"fusion/")  + fileName);
             setCreateStatus(model,1);
             modelService.saveOrUpdate(model);
             redisUtil.set(RedisKeyUtil.modelUpload+model.getModelId(),"100");