提交 9ff7f59a authored 作者: yangli's avatar yangli

.

上级 c65a96ae
...@@ -17,6 +17,7 @@ import javax.annotation.PostConstruct; ...@@ -17,6 +17,7 @@ import javax.annotation.PostConstruct;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.SocketException; import java.net.SocketException;
import java.net.UnknownHostException; import java.net.UnknownHostException;
import java.text.DecimalFormat;
import java.util.Arrays; import java.util.Arrays;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -46,7 +47,7 @@ public class DeviceInfoController { ...@@ -46,7 +47,7 @@ public class DeviceInfoController {
.put("baseboard", OshiUtil.getSystem().getBaseboard().getManufacturer() + " " + OshiUtil.getSystem().getBaseboard().getVersion()) .put("baseboard", OshiUtil.getSystem().getBaseboard().getManufacturer() + " " + OshiUtil.getSystem().getBaseboard().getVersion())
.put("ip", InetAddress.getLocalHost().getHostAddress()) .put("ip", InetAddress.getLocalHost().getHostAddress())
.put("cpuModel", OshiUtil.getCpuInfo(0).getCpuModel()) .put("cpuModel", OshiUtil.getCpuInfo(0).getCpuModel())
.put("cpuTemp", OshiUtil.getSensors().getCpuTemperature()) .put("cpuTemp", Double.parseDouble(new DecimalFormat("#.00").format(OshiUtil.getSensors().getCpuTemperature())))
.put("memoryCap", DataSizeUtil.format(OshiUtil.getMemory().getTotal())) .put("memoryCap", DataSizeUtil.format(OshiUtil.getMemory().getTotal()))
.put("diskModel", Arrays.stream(OshiUtil.getHardware().getDiskStores()) .put("diskModel", Arrays.stream(OshiUtil.getHardware().getDiskStores())
.map(HWDiskStore::getModel) .map(HWDiskStore::getModel)
...@@ -80,7 +81,7 @@ public class DeviceInfoController { ...@@ -80,7 +81,7 @@ public class DeviceInfoController {
System.out.println("CPU型号"); System.out.println("CPU型号");
System.out.println(OshiUtil.getCpuInfo(0).getCpuModel()); System.out.println(OshiUtil.getCpuInfo(0).getCpuModel());
System.out.println("CPU温度"); System.out.println("CPU温度");
System.out.println(OshiUtil.getSensors().getCpuTemperature()); System.out.println(Double.parseDouble(new DecimalFormat("#.00").format(OshiUtil.getSensors().getCpuTemperature())));
System.out.println("内存容量"); System.out.println("内存容量");
System.out.println(DataSizeUtil.format(OshiUtil.getMemory().getTotal())); System.out.println(DataSizeUtil.format(OshiUtil.getMemory().getTotal()));
System.out.println("硬盘型号"); System.out.println("硬盘型号");
......
...@@ -95,7 +95,7 @@ public class ApqInfoApplication { ...@@ -95,7 +95,7 @@ public class ApqInfoApplication {
.put(isNeedCollection(isNoneEven, baseboard, mapParams), baseboard, OshiUtil.getSystem().getBaseboard().getManufacturer() + " " + OshiUtil.getSystem().getBaseboard().getVersion()) .put(isNeedCollection(isNoneEven, baseboard, mapParams), baseboard, OshiUtil.getSystem().getBaseboard().getManufacturer() + " " + OshiUtil.getSystem().getBaseboard().getVersion())
.put(isNeedCollection(isNoneEven, ip, mapParams), ip, InetAddress.getLocalHost().getHostAddress()) .put(isNeedCollection(isNoneEven, ip, mapParams), ip, InetAddress.getLocalHost().getHostAddress())
.put(isNeedCollection(isNoneEven, cpuModel, mapParams), cpuModel, OshiUtil.getCpuInfo(0).getCpuModel()) .put(isNeedCollection(isNoneEven, cpuModel, mapParams), cpuModel, OshiUtil.getCpuInfo(0).getCpuModel())
.put(isNeedCollection(isNoneEven, cpuTemp, mapParams), cpuTemp, OshiUtil.getSensors().getCpuTemperature()) .put(isNeedCollection(isNoneEven, cpuTemp, mapParams), cpuTemp, Double.parseDouble(new DecimalFormat("#.00").format(OshiUtil.getSensors().getCpuTemperature())))
.put(isNeedCollection(isNoneEven, cpuLoad, mapParams), cpuLoad, getCpuUsed()) .put(isNeedCollection(isNoneEven, cpuLoad, mapParams), cpuLoad, getCpuUsed())
.put(isNeedCollection(isNoneEven, memoryCap, mapParams), memoryCap, DataSizeUtil.format(OshiUtil.getMemory().getTotal())) .put(isNeedCollection(isNoneEven, memoryCap, mapParams), memoryCap, DataSizeUtil.format(OshiUtil.getMemory().getTotal()))
.put(isNeedCollection(isNoneEven, memoryAvailable, mapParams), memoryAvailable, DataSizeUtil.format(OshiUtil.getMemory().getAvailable())) .put(isNeedCollection(isNoneEven, memoryAvailable, mapParams), memoryAvailable, DataSizeUtil.format(OshiUtil.getMemory().getAvailable()))
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论