From 87a6180e429ad780d733237d61e2cf9e4c385b65 Mon Sep 17 00:00:00 2001
From: ZhengJie <201507802@qq.com>
Date: Tue, 5 May 2020 21:58:21 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD](el-admin?=
 =?UTF-8?q?=20v2.5):=20v2.5=20beta?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

详情 https://www.ydyno.com/archives/1225.html
---
 .../system/service/impl/MonitorServiceImpl.java     | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MonitorServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MonitorServiceImpl.java
index 70e7500f..31c11f61 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MonitorServiceImpl.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MonitorServiceImpl.java
@@ -57,7 +57,7 @@ public class MonitorServiceImpl implements MonitorService {
             // 交换区信息
             resultMap.put("swap", getSwapInfo(hal.getMemory()));
             // 磁盘
-            resultMap.put("disk", getDiskInfo(hal.getDiskStores(), os));
+            resultMap.put("disk", getDiskInfo(os));
             resultMap.put("time", DateUtil.format(new Date(), "HH:mm:ss"));
         } catch (Exception e) {
             e.printStackTrace();
@@ -67,19 +67,10 @@ public class MonitorServiceImpl implements MonitorService {
 
     /**
      * 获取磁盘信息
-     * @param diskStores /
      * @return /
      */
-    private Map<String,Object> getDiskInfo(HWDiskStore[] diskStores, OperatingSystem os) {
+    private Map<String,Object> getDiskInfo(OperatingSystem os) {
         Map<String,Object> diskInfo = new LinkedHashMap<>();
-        long total = 0;
-        for (HWDiskStore disk : diskStores) {
-            boolean readwrite = disk.getReads() > 0 || disk.getWrites() > 0;
-            total = disk.getSize();
-            diskInfo.put("reads", readwrite ? FormatUtil.formatBytes(disk.getReadBytes()) : "?");
-            diskInfo.put("writes", readwrite ? FormatUtil.formatBytes(disk.getWriteBytes()) : "?");
-            break;
-        }
         FileSystem fileSystem = os.getFileSystem();
         OSFileStore[] fsArray = fileSystem.getFileStores();
         for (OSFileStore fs : fsArray){