From 64d3e9657fb45b6415b19e23f483d46a82efe939 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 06 三月 2023 13:56:42 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/helper/FileHelper.java |   53 +++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/lf/server/helper/FileHelper.java b/src/main/java/com/lf/server/helper/FileHelper.java
index 08f8e3e..426e130 100644
--- a/src/main/java/com/lf/server/helper/FileHelper.java
+++ b/src/main/java/com/lf/server/helper/FileHelper.java
@@ -16,6 +16,7 @@
 import java.security.MessageDigest;
 import java.text.DecimalFormat;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * 鏂囦欢甯姪绫�
@@ -49,7 +50,7 @@
 
         String fileName = file.getName().toLowerCase();
 
-        int idx = fileName.lastIndexOf(StaticData.POINT);
+        int idx = fileName.indexOf(StaticData.POINT);
         if (idx == -1) {
             return "";
         }
@@ -185,6 +186,24 @@
     }
 
     /**
+     * 鑾峰彇鏂囦欢澶у皬
+     */
+    public static String getSizes(double mbNumber) {
+        if (mbNumber < StaticData.D1024) {
+            return new DecimalFormat("#.##MB").format(mbNumber);
+        }
+
+        double gbNumber = mbNumber / StaticData.D1024;
+        if (gbNumber < StaticData.D1024) {
+            return new DecimalFormat("#.##GB").format(gbNumber);
+        }
+
+        double tbNumber = gbNumber / StaticData.D1024;
+
+        return new DecimalFormat("#.##TB").format(tbNumber);
+    }
+
+    /**
      * byte杞琈B
      */
     public static double sizeToMb(long size) {
@@ -253,17 +272,19 @@
      * @param file 鏂囦欢
      */
     public static void deleteFiles(File file) {
-        if (file == null || !file.exists()) {
+        if (null == file || !file.exists()) {
             return;
         }
 
         if (file.isDirectory()) {
             File[] files = file.listFiles();
-            for (File f : files) {
-                if (f.isDirectory()) {
-                    deleteFiles(f);
-                } else {
-                    f.delete();
+            if (null != files && files.length > 0) {
+                for (File f : files) {
+                    if (f.isDirectory()) {
+                        deleteFiles(f);
+                    } else {
+                        f.delete();
+                    }
                 }
             }
         }
@@ -384,18 +405,22 @@
      * 鏍规嵁璺緞鑾峰彇鏂囦欢
      */
     public static void getFilesByPath(List<File> list, String path) {
-        File f = new File(path);
-        if (f.isDirectory()) {
-            File[] files = f.listFiles();
-            for (File file : files) {
-                if (file.isDirectory()) {
+        File file = new File(path);
+        if (file.isDirectory()) {
+            File[] files = file.listFiles();
+            if (null == files) {
+                return;
+            }
+
+            for (File f : files) {
+                if (f.isDirectory()) {
                     getFilesByPath(list, f.getPath());
                 } else {
-                    list.add(file);
+                    list.add(f);
                 }
             }
         } else {
-            list.add(f);
+            list.add(file);
         }
     }
 }

--
Gitblit v1.9.3