1

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

@@ -115,13 +115,16 @@ public class ModelController extends BaseController{
             if(model == null){
                 throw new BusinessException(ResultCode.MODEL_NOT_EXIST);
             }
+            if(StringUtils.isBlank(model.getFileNewName())){
+                throw new BusinessException(ResultCode.FILE_NOT_EXIST);
+            }
 
-            String objPath = String.format(FilePath.OBJ_LOCAL_PATH,environment , "modelId_"+modelId) ;
-
-            FileInfoVo fileInfo = MD5Checksum.getFileInfo(objPath + "/" + model.getModelTitle() + ".zip");
+            FileInfoVo fileInfo = MD5Checksum.getFileInfo(model.getFileNewName());
             if(fileInfo == null){
                 throw new BusinessException(ResultCode.FILE_NOT_EXIST);
             }
+            String objPath = String.format(FilePath.OBJ_LOCAL_PATH,environment ,modelId) ;
+
             File file = new File(objPath +"/"+modelId + "_hash.txt");
 
             res.setContentType("application/octet-stream");

src/main/java/com/fdkankan/fusion/entity/Model.java

@@ -88,4 +88,8 @@ public class Model implements Serializable {
 
     @TableField(exist = false)
     private String deptName;
+
+
+    @TableField("file_new_name")
+    private String fileNewName;
 }

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

@@ -105,7 +105,6 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
         model.setModelSize(FileWriterUtil.setFileSize(file.getSize()));
         model.setUserName(username);
         model.setDeptId(tmUser.getDeptId());
-        this.save(model);
         redisUtil.set(RedisKeyUtil.modelUpload+model.getModelId(),"0");
 
         String fileName2 = UUID.randomUUID().toString().replace("-","") +".zip";
@@ -117,6 +116,8 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
             newObjFile.getParentFile().mkdirs();
         }
         file.transferTo(newObjFile);
+        model.setFileNewName(objPath +"/" + fileName2);
+        this.save(model);
         threadService.uploadModelObj(fileName2,objPath,newObjFile,model);
         return model;
     }