From 0abccf5e570dce53a802bca4ce25118dd900692c Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期五, 23 二月 2024 14:07:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/utils/tools/ArdTool.java | 52 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 49 insertions(+), 3 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/utils/tools/ArdTool.java b/ard-work/src/main/java/com/ruoyi/utils/tools/ArdTool.java
index 70172c5..674b0de 100644
--- a/ard-work/src/main/java/com/ruoyi/utils/tools/ArdTool.java
+++ b/ard-work/src/main/java/com/ruoyi/utils/tools/ArdTool.java
@@ -1,10 +1,9 @@
package com.ruoyi.utils.tools;
-import com.ruoyi.common.core.redis.RedisCache;
import lombok.extern.slf4j.Slf4j;
-import javax.annotation.Resource;
import java.lang.reflect.Field;
+import java.text.DecimalFormat;
import java.time.LocalTime;
import java.util.*;
@@ -47,7 +46,7 @@
* @return
*/
public static String getKeyByMinValue(Map<String, Double> map) {
- if (map == null) return null;
+ if (map == null||map.size()==0) return null;
List<Map.Entry<String, Double>> list = new ArrayList(map.entrySet());
Collections.sort(list, (o1, o2) -> (o1.getValue().intValue() - o2.getValue().intValue()));
String min = list.get(0).getKey();
@@ -87,4 +86,51 @@
return 1;
}
}
+ /**
+ * 鏂囦欢澶у皬鏅鸿兘杞崲
+ * 浼氬皢鏂囦欢澶у皬杞崲涓烘渶澶ф弧瓒冲崟浣�
+ * @param size锛堟枃浠跺ぇ灏忥紝鍗曚綅涓築锛�
+ * @return 鏂囦欢澶у皬
+ */
+ public static String formatFileSize(Long size) {
+ String sizeName = null;
+ if (1024 * 1024 > size && size >= 1024) {
+ sizeName = String.format("%.2f", size.doubleValue() / 1024) + "KB";
+ } else if (1024 * 1024 * 1024 > size && size >= 1024 * 1024) {
+ sizeName = String.format("%.2f", size.doubleValue() / (1024 * 1024)) + "MB";
+ } else if (size >= 1024 * 1024 * 1024) {
+ sizeName = String.format("%.2f", size.doubleValue() / (1024 * 1024 * 1024)) + "GB";
+ } else {
+ sizeName = size.toString() + "B";
+ }
+ return sizeName;
+ }
+ /**
+ * 鏂囦欢澶у皬鏅鸿兘杞崲
+ * 浼氬皢鏂囦欢澶у皬杞崲涓烘渶澶ф弧瓒冲崟浣�
+ * @param size锛堟枃浠跺ぇ灏忥紝鍗曚綅涓築锛�
+ * @return 鏂囦欢澶у皬
+ */
+ public static String readableFileSize(long size) {
+ if (size <= 0) {
+ return "0";
+ }
+ final String[] units = new String[]{"B", "KB", "MB", "GB", "TB"};
+ int digitGroups = (int) (Math.log10(size) / Math.log10(1024));
+ return new DecimalFormat("#,###.##").format(size / Math.pow(1024, digitGroups)) + " " + units[digitGroups];
+ }
+
+ /**
+ * byte鏁扮粍杞瓧绗︿覆
+ * 鍒樿嫃涔�
+ * 2023/10/18 8:42:59
+ * @param byteArray
+ */
+ public static String byteArrayToString(byte[] byteArray) {
+ StringBuilder stringBuilder = new StringBuilder();
+ for (byte b : byteArray) {
+ stringBuilder.append(String.valueOf(b));
+ }
+ return stringBuilder.toString();
+ }
}
--
Gitblit v1.9.3