lyhzzz 3 years ago
parent
commit
f7fff7baf2

+ 6 - 0
src/main/java/com/fdkankan/fusion/common/util/FileWriterUtil.java

@@ -74,4 +74,10 @@ public class FileWriterUtil {
         return null;
     }
 
+    public static String setFileSize(long length) {
+        if(length >= 1024 * 1024 ){
+            return length / 1024 / 1024 +"mb";
+        }
+        return length / 1024 +"kb";
+    }
 }

+ 1 - 1
src/main/java/com/fdkankan/fusion/entity/Model.java

@@ -48,7 +48,7 @@ public class Model implements Serializable {
      * 大小
      */
     @TableField("model_size")
-    private Long modelSize;
+    private String modelSize;
     /**
      * 0看看,1看见,2深时,3用户上传三维模型
      */

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

@@ -3,6 +3,7 @@ package com.fdkankan.fusion.service.impl;
 import cn.hutool.core.io.FileUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fdkankan.fusion.common.FilePath;
+import com.fdkankan.fusion.common.util.FileWriterUtil;
 import com.fdkankan.fusion.common.util.OBJToGLBUtil;
 import com.fdkankan.fusion.common.util.UploadToOssUtil;
 import com.fdkankan.fusion.entity.CaseNumEntity;
@@ -123,7 +124,7 @@ public class CaseNumServiceImpl extends ServiceImpl<ICaseNumMapper, CaseNumEntit
             OBJToGLBUtil.objToGlb(objPath,glbPath );
             File file = new File(glbPath);
             if(file!=null){
-                model.setModelSize(file.length());
+                model.setModelSize(FileWriterUtil.setFileSize(file.length()));
             }
             uploadToOssUtil.uploadOss(glbPath,glbOssPath);
             FileUtil.del(objPath);

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

@@ -70,7 +70,7 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
         if(file.isEmpty()){
             throw new BusinessException(ResultCode.UPLOAD_FILE_NO_EXIST);
         }
-        if(file.getSize()>10 * 1024 * 1024 * 100){
+        if(file.getSize()>10 * 1024 * 1024 * 1024){
             System.out.println(file.getSize());
             throw new BusinessException(ResultCode.UPLOAD_FILE_TO_LONG);
         }
@@ -90,7 +90,7 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
 
         Model model = new Model();
         model.setModelTitle(modelName);
-        model.setModelSize(file.getSize());
+        model.setModelSize(FileWriterUtil.setFileSize(file.getSize()));
         model.setUserName(username);
         this.save(model);
         File newObjFile = null;