提交 73d2dcb6 authored 作者: yangli's avatar yangli

.

上级 e0e53344
...@@ -56,6 +56,7 @@ public class DeviceInfoController { ...@@ -56,6 +56,7 @@ public class DeviceInfoController {
.map(s -> "\"" + StrUtil.removeSuffix(s, ":\\") + "盘\":\"" + .map(s -> "\"" + StrUtil.removeSuffix(s, ":\\") + "盘\":\"" +
StrUtil.removeSuffix(store.getModel(), " (标准磁盘驱动器)") + "\"") StrUtil.removeSuffix(store.getModel(), " (标准磁盘驱动器)") + "\"")
.collect(Collectors.joining(","))) .collect(Collectors.joining(",")))
.filter(StrUtil::isNotBlank)
.collect(Collectors.joining(",", "{", "}"))); .collect(Collectors.joining(",", "{", "}")));
diskCap = JSONUtil.parseObj(Arrays.stream(OshiUtil.getHardware().getDiskStores()) diskCap = JSONUtil.parseObj(Arrays.stream(OshiUtil.getHardware().getDiskStores())
.map(HWDiskStore::getPartitions) .map(HWDiskStore::getPartitions)
...@@ -120,6 +121,7 @@ public class DeviceInfoController { ...@@ -120,6 +121,7 @@ public class DeviceInfoController {
.map(s -> "\"" + StrUtil.removeSuffix(s, ":\\") + "盘\":\"" + .map(s -> "\"" + StrUtil.removeSuffix(s, ":\\") + "盘\":\"" +
StrUtil.removeSuffix(store.getModel(), " (标准磁盘驱动器)") + "\"") StrUtil.removeSuffix(store.getModel(), " (标准磁盘驱动器)") + "\"")
.collect(Collectors.joining(","))) .collect(Collectors.joining(",")))
.filter(StrUtil::isNotBlank)
.collect(Collectors.joining(",", "{", "}"))); .collect(Collectors.joining(",", "{", "}")));
System.out.println("硬盘容量"); System.out.println("硬盘容量");
System.out.println(Arrays.stream(OshiUtil.getHardware().getDiskStores()) System.out.println(Arrays.stream(OshiUtil.getHardware().getDiskStores())
......
...@@ -109,6 +109,7 @@ public class ApqInfoApplication { ...@@ -109,6 +109,7 @@ public class ApqInfoApplication {
.map(s -> "\"" + StrUtil.removeSuffix(s, ":\\") + "盘\":\"" + .map(s -> "\"" + StrUtil.removeSuffix(s, ":\\") + "盘\":\"" +
StrUtil.removeSuffix(store.getModel(), " (标准磁盘驱动器)") + "\"") StrUtil.removeSuffix(store.getModel(), " (标准磁盘驱动器)") + "\"")
.collect(Collectors.joining(","))) .collect(Collectors.joining(",")))
.filter(StrUtil::isNotBlank)
.collect(Collectors.joining(",", "{", "}")); .collect(Collectors.joining(",", "{", "}"));
collect2 = Arrays.stream(OshiUtil.getHardware().getDiskStores()) collect2 = Arrays.stream(OshiUtil.getHardware().getDiskStores())
.map(HWDiskStore::getPartitions) .map(HWDiskStore::getPartitions)
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论