.

apq-pc-client/src/main/java/com/priusis/controller/DeviceInfoController.java

@@ -2,6 +2,7 @@ package com.priusis.controller;
 
 import cn.hutool.core.io.unit.DataSizeUtil;
 import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.system.oshi.OshiUtil;
 import com.priusis.lib.R;
 import com.priusis.util.MacAddrUtil;
@@ -10,12 +11,15 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import oshi.hardware.HWDiskStore;
 
 import javax.annotation.PostConstruct;
 import java.net.InetAddress;
 import java.net.SocketException;
 import java.net.UnknownHostException;
+import java.util.Arrays;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @author yangli
@@ -44,8 +48,14 @@ public class DeviceInfoController {
                 .put("cpuModel", OshiUtil.getCpuInfo(0).getCpuModel())
                 .put("cpuTemp", OshiUtil.getSensors().getCpuTemperature())
                 .put("memoryCap", DataSizeUtil.format(OshiUtil.getMemory().getTotal()))
-                .put("diskModel", OshiUtil.getHardware().getDiskStores()[0].getModel())
-                .put("diskCap", DataSizeUtil.format(OshiUtil.getHardware().getDiskStores()[0].getSize()))
+                .put("diskModel", Arrays.stream(OshiUtil.getHardware().getDiskStores())
+                        .map(HWDiskStore::getModel)
+                        .map(model -> StrUtil.removeSuffix(model, " (标准磁盘驱动器)"))
+                        .collect(Collectors.joining(", ")))
+                .put("diskCap", DataSizeUtil.format(Arrays.stream(OshiUtil.getHardware().getDiskStores())
+                        .map(HWDiskStore::getSize)
+                        .mapToLong(Long::longValue)
+                        .sum()))
                 .build();
     }
 
@@ -74,8 +84,14 @@ public class DeviceInfoController {
         System.out.println("内存容量");
         System.out.println(DataSizeUtil.format(OshiUtil.getMemory().getTotal()));
         System.out.println("硬盘型号");
-        System.out.println(OshiUtil.getHardware().getDiskStores()[0].getModel());
+        System.out.println(Arrays.stream(OshiUtil.getHardware().getDiskStores())
+                .map(HWDiskStore::getModel)
+                .map(model -> StrUtil.removeSuffix(model, " (标准磁盘驱动器)"))
+                .collect(Collectors.joining(", ")));
         System.out.println("硬盘容量");
-        System.out.println(DataSizeUtil.format(OshiUtil.getHardware().getDiskStores()[0].getSize()));
+        System.out.println(DataSizeUtil.format(Arrays.stream(OshiUtil.getHardware().getDiskStores())
+                .map(HWDiskStore::getSize)
+                .mapToLong(Long::longValue)
+                .sum()));
     }
 }

apq-pc-info/src/main/java/com/priusis/ApqInfoApplication.java

@@ -30,6 +30,7 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 @Slf4j
 @EnableScheduling
@@ -99,8 +100,16 @@ public class ApqInfoApplication {
                     .put(isNeedCollection(isNoneEven, cpuLoad, mapParams), cpuLoad, getCpuUsed())
                     .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, diskModel, mapParams), diskModel, OshiUtil.getHardware().getDiskStores()[0].getModel())
-                    .put(isNeedCollection(isNoneEven, diskCap, mapParams), diskCap, DataSizeUtil.format(OshiUtil.getHardware().getDiskStores()[0].getSize()))
+                    .put(isNeedCollection(isNoneEven, diskModel, mapParams), diskModel,
+                            Arrays.stream(OshiUtil.getHardware().getDiskStores())
+                                    .map(HWDiskStore::getModel)
+                                    .map(model -> StrUtil.removeSuffix(model, " (标准磁盘驱动器)"))
+                                    .collect(Collectors.joining(", ")))
+                    .put(isNeedCollection(isNoneEven, diskCap, mapParams), diskCap,
+                            DataSizeUtil.format(Arrays.stream(OshiUtil.getHardware().getDiskStores())
+                                    .map(HWDiskStore::getSize)
+                                    .mapToLong(Long::longValue)
+                                    .sum()))
                     .build();
             log.info("采集数据，上报属性: mapData:{}", data);
             Map mapR = restTemplate.postForObject("http://localhost:8765/uplink/oc-client", data, Map.class);