From b15e559eae82db811b31f1e3c47e3be027f20e27 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 08 一月 2024 16:18:28 +0800
Subject: [PATCH] Merge branch '2.6.9' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/utils/SystemInfoUtils.java | 82 ++++++++++++++++++++++++++++++++++------
1 files changed, 69 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/utils/SystemInfoUtils.java b/src/main/java/com/genersoft/iot/vmp/utils/SystemInfoUtils.java
old mode 100644
new mode 100755
index 2d588fa..ec2f3b2
--- a/src/main/java/com/genersoft/iot/vmp/utils/SystemInfoUtils.java
+++ b/src/main/java/com/genersoft/iot/vmp/utils/SystemInfoUtils.java
@@ -1,14 +1,17 @@
package com.genersoft.iot.vmp.utils;
+import com.genersoft.iot.vmp.media.zlm.ZLMHttpHookListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.util.ObjectUtils;
import oshi.SystemInfo;
-import oshi.hardware.CentralProcessor;
-import oshi.hardware.GlobalMemory;
-import oshi.hardware.HardwareAbstractionLayer;
-import oshi.hardware.NetworkIF;
+import oshi.hardware.*;
import oshi.software.os.OperatingSystem;
import oshi.util.FormatUtil;
+import java.io.File;
import java.text.DecimalFormat;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -20,6 +23,8 @@
* 鍘熸枃鍑哄閾炬帴锛歨ttps://blog.csdn.net/xiaozhangnomoney/article/details/107769147
*/
public class SystemInfoUtils {
+
+ private final static Logger logger = LoggerFactory.getLogger(SystemInfoUtils.class);
/**
* 鑾峰彇cpu淇℃伅
@@ -63,19 +68,43 @@
* 鑾峰彇缃戠粶涓婁紶鍜屼笅杞�
* @return
*/
- public static Map<String,String> getNetworkInterfaces() {
+ public static Map<String,Double> getNetworkInterfaces() {
SystemInfo si = new SystemInfo();
HardwareAbstractionLayer hal = si.getHardware();
- List<NetworkIF> networkIFs = hal.getNetworkIFs();
- int i= networkIFs.size() -1;
- NetworkIF net= networkIFs.get(i);
+ List<NetworkIF> beforeRecvNetworkIFs = hal.getNetworkIFs();
+ NetworkIF beforeBet= beforeRecvNetworkIFs.get(beforeRecvNetworkIFs.size() - 1);
+ long beforeRecv = beforeBet.getBytesRecv();
+ long beforeSend = beforeBet.getBytesSent();
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException e) {
+ logger.error("[绾跨▼浼戠湢澶辫触] : {}", e.getMessage());
+ }
+ List<NetworkIF> afterNetworkIFs = hal.getNetworkIFs();
+ NetworkIF afterNet = afterNetworkIFs.get(afterNetworkIFs.size() - 1);
- String in = FormatUtil.formatBytes(net.getBytesRecv());
- String out = FormatUtil.formatBytes(net.getBytesSent());
- HashMap<String, String> map = new HashMap<>();
- map.put("in",in);
- map.put("out",out);
+ HashMap<String, Double> map = new HashMap<>();
+ // 閫熷害鍗曚綅: Mbps
+ map.put("in",formatUnits(afterNet.getBytesRecv()-beforeRecv, 1048576L));
+ map.put("out",formatUnits(afterNet.getBytesSent()-beforeSend, 1048576L));
return map;
+ }
+
+ /**
+ * 鑾峰彇甯﹀鎬诲��
+ * @return
+ */
+ public static long getNetworkTotal() {
+ SystemInfo si = new SystemInfo();
+ HardwareAbstractionLayer hal = si.getHardware();
+ List<NetworkIF> recvNetworkIFs = hal.getNetworkIFs();
+ NetworkIF networkIF= recvNetworkIFs.get(recvNetworkIFs.size() - 1);
+
+ return networkIF.getSpeed()/1048576L/8L;
+ }
+
+ public static double formatUnits(long value, long prefix) {
+ return (double)value / (double)prefix;
}
/**
@@ -89,4 +118,31 @@
int processCount = os.getProcessCount();
return processCount;
}
+
+ public static List<Map<String, Object>> getDiskInfo() {
+ List<Map<String, Object>> result = new ArrayList<>();
+
+ String osName = System.getProperty("os.name");
+ List<String> pathArray = new ArrayList<>();
+ if (osName.startsWith("Mac OS")) {
+ // 鑻规灉
+ pathArray.add("/");
+ } else if (osName.startsWith("Windows")) {
+ // windows
+ pathArray.add("C:");
+ } else {
+ pathArray.add("/");
+ pathArray.add("/home");
+ }
+ for (String path : pathArray) {
+ Map<String, Object> infoMap = new HashMap<>();
+ infoMap.put("path", path);
+ File partitionFile = new File(path);
+ // 鍗曚綅锛� GB
+ infoMap.put("use", (partitionFile.getTotalSpace() - partitionFile.getFreeSpace())/1024/1024/1024D);
+ infoMap.put("free", partitionFile.getFreeSpace()/1024/1024/1024D);
+ result.add(infoMap);
+ }
+ return result;
+ }
}
--
Gitblit v1.8.0