From 6447418eb184db719a4f426a7bc0ee556df7dd37 Mon Sep 17 00:00:00 2001
From: xyiege <xyiege@gmail.com>
Date: Sun, 16 Oct 2022 19:33:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E8=B5=84=E6=BA=90=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E8=AE=A1=E7=AE=97=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/chjyj/szwh/utils/SzFileUtils.java | 11 +++++----
 src/test/java/cn/chjyj/szwh/NewTest.java      | 23 +++++++++++++++++++
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/src/main/java/cn/chjyj/szwh/utils/SzFileUtils.java b/src/main/java/cn/chjyj/szwh/utils/SzFileUtils.java
index 9b9dc91..3cf53dc 100644
--- a/src/main/java/cn/chjyj/szwh/utils/SzFileUtils.java
+++ b/src/main/java/cn/chjyj/szwh/utils/SzFileUtils.java
@@ -45,7 +45,8 @@ public class SzFileUtils {
      */
     public static String fileSizeFormat(Long tfilesize){
         String out="0b";
-        long fileSize = tfilesize - 1;
+        //long fileSize = tfilesize - 1;
+        float fileSize = tfilesize.floatValue();
         //TB
         if(fileSize>1099511627776l) {
             float f= fileSize/1099511627776l;
@@ -59,16 +60,16 @@ public class SzFileUtils {
         //MB
         if(fileSize>1048576){
             float f = fileSize/1048576;
-            out = String.format("%.2f",f);
+            out = String.format("%.2f",f)+"MB";
         }
         //KB
         if(fileSize>1024){
             float f = fileSize/1024;
-            out = String.format("%.2f",f);
+            out = String.format("%.2f",f)+"KB";
         }
         //b
-        if(fileSize>0){
-            out = fileSize+"b";
+        if(fileSize<1024l){
+            out = fileSize+"B";
         }
         return out;
     }
diff --git a/src/test/java/cn/chjyj/szwh/NewTest.java b/src/test/java/cn/chjyj/szwh/NewTest.java
index e9c92a8..6a6d492 100644
--- a/src/test/java/cn/chjyj/szwh/NewTest.java
+++ b/src/test/java/cn/chjyj/szwh/NewTest.java
@@ -2,6 +2,8 @@ package cn.chjyj.szwh;
 
 import cn.chjyj.szwh.mapper.FestivalsMapper;
 import cn.chjyj.szwh.utils.DateUtils;
+import cn.chjyj.szwh.utils.SzFileUtils;
+import com.alibaba.fastjson2.JSONObject;
 import org.apache.commons.lang3.StringUtils;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -112,4 +114,25 @@ public class NewTest {
             ex.printStackTrace();
         }
     }
+
+    /**
+     * 计算资源文件大小
+     */
+    @Test
+    public void calFileSize(){
+        String originStr ="{\"register\":\"测试服南波二十五\",\"serviceType\":\"全景\",\"isliCode\":\"010003-000000000000011123999999-1\",\n" +
+                "\"identifier\":\"010003-000000000000011123999999-1\",\"serviceCode\":\"010003\",\"titleName\":\"0bj-1013-04\",\n" +
+                "\"releaseTime\":\"2022-10-13 20:11:22\",\"md5Val\":\"fce769143cf8cc634f37e66eab07b39c\",\"copyrightOwner\":\"\n" +
+                "测试服南波二十六\",\"identifiers\":\"\",\"copyrightDurationEnd\":\"\",\n" +
+                "\"copyrightOwnerShip\":\"测试服南波二十六\",\"description\":\"全景三维描述\",\"copyrightDurationStart\":\"\",\n" +
+                "\"label\":\"标签\",\"metadataFileFormat\":\"obj\",\"systemIdentity\":\"3e2c0a92a88e48ef888083a2ae6692fd\",\n" +
+                "\"typed\":\"三维全景\",\"carrier\":\"光盘\",\"otherIdentifiers\":\"测试服南波二十六\",\"metadataFileSize\":\"1581\",\n" +
+                "\"contributors\":\"测试服南波二十六\",\"registrant\":\"测试服南波二十六\",\"copyrightRegNo\":\"2022\",\"registerDate\":\"2022-10-13 19:34:32\"}";
+        JSONObject json = JSONObject.parseObject(originStr);
+        // 标的信息
+        Long filesize =json.getLongValue("metadataFileSize");
+        // 格式化文件大小
+        String formatFileSize = SzFileUtils.fileSizeFormat(filesize);
+        System.out.println("资源文件大小："+formatFileSize);
+    }
 }