提交 c65a96ae authored 作者: yangli's avatar yangli

.

上级 99da88ab
...@@ -4,6 +4,7 @@ import cn.hutool.core.io.unit.DataSizeUtil; ...@@ -4,6 +4,7 @@ import cn.hutool.core.io.unit.DataSizeUtil;
import cn.hutool.core.map.MapUtil; import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import cn.hutool.system.oshi.CpuInfo;
import cn.hutool.system.oshi.OshiUtil; import cn.hutool.system.oshi.OshiUtil;
import com.priusis.util.MacAddrUtil; import com.priusis.util.MacAddrUtil;
import com.priusis.vo.ApqInfoDataVo; import com.priusis.vo.ApqInfoDataVo;
...@@ -18,14 +19,12 @@ import org.springframework.http.ResponseEntity; ...@@ -18,14 +19,12 @@ import org.springframework.http.ResponseEntity;
import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled; import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
import oshi.SystemInfo;
import oshi.hardware.CentralProcessor;
import oshi.hardware.HWDiskStore; import oshi.hardware.HWDiskStore;
import oshi.hardware.HWPartition; import oshi.hardware.HWPartition;
import oshi.util.FormatUtil; import oshi.util.FormatUtil;
import java.math.BigDecimal;
import java.net.InetAddress; import java.net.InetAddress;
import java.text.DecimalFormat;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
...@@ -171,7 +170,7 @@ public class ApqInfoApplication { ...@@ -171,7 +170,7 @@ public class ApqInfoApplication {
} }
public static double getCpuUsed() { public static double getCpuUsed() {
SystemInfo systemInfo = new SystemInfo(); /*SystemInfo systemInfo = new SystemInfo();
CentralProcessor processor = systemInfo.getHardware().getProcessor(); CentralProcessor processor = systemInfo.getHardware().getProcessor();
long[] prevTicks = processor.getSystemCpuLoadTicks(); long[] prevTicks = processor.getSystemCpuLoadTicks();
long[] ticks = processor.getSystemCpuLoadTicks(); long[] ticks = processor.getSystemCpuLoadTicks();
...@@ -191,7 +190,11 @@ public class ApqInfoApplication { ...@@ -191,7 +190,11 @@ public class ApqInfoApplication {
//System.out.println("cpu当前等待率:" + new DecimalFormat("#.##%").format(iowait * 1.0 / totalCpu)); //System.out.println("cpu当前等待率:" + new DecimalFormat("#.##%").format(iowait * 1.0 / totalCpu));
//System.out.println("cpu当前使用率:" + new DecimalFormat("#.##%").format(1.0-(idle * 1.0 / totalCpu))); //System.out.println("cpu当前使用率:" + new DecimalFormat("#.##%").format(1.0-(idle * 1.0 / totalCpu)));
return new BigDecimal((1.0 - (idle * 1.0 / totalCpu)) * 100).setScale(2, BigDecimal.ROUND_DOWN).doubleValue(); return new BigDecimal((1.0 - (idle * 1.0 / totalCpu)) * 100).setScale(2, BigDecimal.ROUND_DOWN).doubleValue();*/
CpuInfo cpuInfo = OshiUtil.getCpuInfo(0);
return Double.parseDouble(new DecimalFormat("#.00").format(cpuInfo.getToTal() / cpuInfo.getCpuNum()));
} }
private static void printDisks(List<HWDiskStore> list) { private static void printDisks(List<HWDiskStore> list) {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论