完成运行时状态上报功能

itbaima-monitor-client/pom.xml

@@ -21,6 +21,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-quartz</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.alibaba.fastjson2</groupId>
             <artifactId>fastjson2</artifactId>
@@ -39,7 +43,7 @@
         <dependency>
             <groupId>com.github.oshi</groupId>
             <artifactId>oshi-core</artifactId>
-            <version>6.4.0</version>
+            <version>6.4.8</version>
         </dependency>
     </dependencies>
 

itbaima-monitor-client/src/main/java/com/example/entity/data/RuntimeDetail.java

@@ -0,0 +1,17 @@
+package com.example.entity.data;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+public class RuntimeDetail {
+    long timestamp;
+    double cpuUsage;
+    double memoryUsage;
+    double diskUsage;
+    double networkUpload;
+    double networkDownload;
+    double diskRead;
+    double diskWrite;
+}

itbaima-monitor-client/src/main/java/com/example/task/MonitorJobBean.java

@@ -0,0 +1,26 @@
+package com.example.task;
+
+import com.example.entity.data.RuntimeDetail;
+import com.example.utils.MonitorUtils;
+import com.example.utils.NetUtils;
+import jakarta.annotation.Resource;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+import org.springframework.scheduling.quartz.QuartzJobBean;
+import org.springframework.stereotype.Component;
+
+@Component
+public class MonitorJobBean extends QuartzJobBean {
+
+    @Resource
+    MonitorUtils monitor;
+
+    @Resource
+    NetUtils net;
+
+    @Override
+    protected void executeInternal(JobExecutionContext context) throws JobExecutionException {
+        RuntimeDetail runtimeDetail = monitor.monitorRuntimeData();
+        net.updateRuntimeDetails(runtimeDetail);
+    }
+}

itbaima-monitor-client/src/main/java/com/example/utils/MonitorUtils.java

@@ -1,16 +1,22 @@
 package com.example.utils;
 
 import com.example.entity.data.BaseDetail;
+import com.example.entity.data.RuntimeDetail;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import oshi.SystemInfo;
+import oshi.hardware.CentralProcessor;
 import oshi.hardware.HWDiskStore;
 import oshi.hardware.HardwareAbstractionLayer;
 import oshi.hardware.NetworkIF;
 import oshi.software.os.OperatingSystem;
 
+import java.io.File;
 import java.io.IOException;
 import java.net.NetworkInterface;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.Objects;
 import java.util.Properties;
 
 @Slf4j
@@ -20,36 +26,95 @@ public class MonitorUtils {
     private final SystemInfo info = new SystemInfo();
     private final Properties properties = System.getProperties();
 
+    public RuntimeDetail monitorRuntimeData() {
+        double statisticTime = 0.5;
+        try {
+            HardwareAbstractionLayer hardware = info.getHardware();
+            NetworkIF networkInterface = Objects.requireNonNull(this.findNetworkInterface(hardware));
+            CentralProcessor processor = hardware.getProcessor();
+            //开始读取各种运行时信息
+            double upload = networkInterface.getBytesSent(), download = networkInterface.getBytesRecv();
+            double read = hardware.getDiskStores().stream().mapToLong(HWDiskStore::getReadBytes).sum();
+            double write = hardware.getDiskStores().stream().mapToLong(HWDiskStore::getWriteBytes).sum();
+            long[] ticks = processor.getSystemCpuLoadTicks();
+            Thread.sleep((long) (statisticTime * 1000));
+            networkInterface = Objects.requireNonNull(this.findNetworkInterface(hardware));
+            upload = (networkInterface.getBytesSent() - upload) / statisticTime;
+            download = (networkInterface.getBytesRecv() - download) / statisticTime;
+            read = (hardware.getDiskStores().stream().mapToLong(HWDiskStore::getReadBytes).sum() - read) / statisticTime;
+            write = (hardware.getDiskStores().stream().mapToLong(HWDiskStore::getWriteBytes).sum() - write) / statisticTime;
+            double memory = (hardware.getMemory().getTotal() - hardware.getMemory().getAvailable()) / 1024.0 / 1024 / 1024;
+            double disk = Arrays.stream(File.listRoots())
+                    .mapToLong(file -> file.getTotalSpace() - file.getFreeSpace()).sum()  / 1024.0 / 1024 / 1024;
+            return new RuntimeDetail()
+                    .setCpuUsage(this.calculateCpuUsage(processor, ticks))
+                    .setMemoryUsage(memory)
+                    .setDiskUsage(disk)
+                    .setNetworkUpload(upload / 1024)
+                    .setNetworkDownload(download / 1024)
+                    .setDiskRead(read / 1024 / 1024)
+                    .setDiskWrite(write / 1024 / 1024)
+                    .setTimestamp(new Date().getTime());
+        }catch (Exception e) {
+            log.error("读取运行时数据时出现问题", e);
+        }
+        return null;
+    }
+
     public BaseDetail monitorBaseData() {
         OperatingSystem os = info.getOperatingSystem();
         HardwareAbstractionLayer hardware = info.getHardware();
         double memory = hardware.getMemory().getTotal() / 1024.0 / 1024 / 1024;
-        double diskSize = hardware.getDiskStores().stream().mapToLong(HWDiskStore::getSize).sum()  / 1024.0 / 1024 / 1024;
+        double diskSize = Arrays.stream(File.listRoots()).mapToLong(File::getTotalSpace).sum()  / 1024.0 / 1024 / 1024;
+        String ip = Objects.requireNonNull(this.findNetworkInterface(hardware)).getIPv4addr()[0];
+        return new BaseDetail()
+                .setOsBit(os.getBitness())
+                .setOsArch(properties.getProperty("os.arch"))
+                .setOsVersion(os.getVersionInfo().getVersion())
+                .setOsName(os.getFamily())
+                .setCpuName(hardware.getProcessor().getProcessorIdentifier().getName())
+                .setCpuCore(hardware.getProcessor().getLogicalProcessorCount())
+                .setMemory(memory)
+                .setDisk(diskSize)
+                .setIp(ip);
+    }
+
+    private NetworkIF findNetworkInterface(HardwareAbstractionLayer hardware) {
         try {
-            String ip = null;
             for (NetworkIF network : hardware.getNetworkIFs()) {
                 String[] iPv4addr = network.getIPv4addr();
                 NetworkInterface ni = network.queryNetworkInterface();
                 if(!ni.isLoopback() && !ni.isPointToPoint() && ni.isUp() && !ni.isVirtual()
                         && (ni.getName().startsWith("eth") || ni.getName().startsWith("en"))
                         && iPv4addr.length > 0) {
-                    ip = network.getIPv4addr()[0];
+                    return network;
-                    break;
                 }
             }
-            return new BaseDetail()
-                    .setOsBit(os.getBitness())
-                    .setOsArch(properties.getProperty("os.arch"))
-                    .setOsVersion(os.getVersionInfo().getVersion())
-                    .setOsName(os.getFamily())
-                    .setCpuName(hardware.getProcessor().getProcessorIdentifier().getName())
-                    .setCpuCore(hardware.getProcessor().getLogicalProcessorCount())
-                    .setMemory(memory)
-                    .setDisk(diskSize)
-                    .setIp(ip);
         } catch (IOException e) {
-            log.error("读取系统基本信息时出错", e);
+            log.error("读取网络接口信息时出错", e);
-            return null;
         }
+        return null;
+    }
+
+    private double calculateCpuUsage(CentralProcessor processor, long[] prevTicks) {
+        long[] ticks = processor.getSystemCpuLoadTicks();
+        long nice = ticks[CentralProcessor.TickType.NICE.getIndex()]
+                - prevTicks[CentralProcessor.TickType.NICE.getIndex()];
+        long irq = ticks[CentralProcessor.TickType.IRQ.getIndex()]
+                - prevTicks[CentralProcessor.TickType.IRQ.getIndex()];
+        long softIrq = ticks[CentralProcessor.TickType.SOFTIRQ.getIndex()]
+                - prevTicks[CentralProcessor.TickType.SOFTIRQ.getIndex()];
+        long steal = ticks[CentralProcessor.TickType.STEAL.getIndex()]
+                - prevTicks[CentralProcessor.TickType.STEAL.getIndex()];
+        long cSys = ticks[CentralProcessor.TickType.SYSTEM.getIndex()]
+                - prevTicks[CentralProcessor.TickType.SYSTEM.getIndex()];
+        long cUser = ticks[CentralProcessor.TickType.USER.getIndex()]
+                - prevTicks[CentralProcessor.TickType.USER.getIndex()];
+        long ioWait = ticks[CentralProcessor.TickType.IOWAIT.getIndex()]
+                - prevTicks[CentralProcessor.TickType.IOWAIT.getIndex()];
+        long idle = ticks[CentralProcessor.TickType.IDLE.getIndex()]
+                - prevTicks[CentralProcessor.TickType.IDLE.getIndex()];
+        long totalCpu = cUser + nice + cSys + idle + ioWait + irq + softIrq + steal;
+        return (cSys + cUser) * 1.0 / totalCpu;
     }
 }

itbaima-monitor-client/src/main/java/com/example/utils/NetUtils.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson2.JSONObject;
 import com.example.entity.ConnectionConfig;
 import com.example.entity.Response;
 import com.example.entity.data.BaseDetail;
+import com.example.entity.data.RuntimeDetail;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Lazy;
@@ -44,6 +45,13 @@ public class NetUtils {
         }
     }
 
+    public void updateRuntimeDetails(RuntimeDetail detail) {
+        Response response = this.doPost("/runtime", detail);
+        if(!response.success()) {
+            log.warn("更新运行时状态时，接收到服务端的异常响应内容: {}", response.getMessage());
+        }
+    }
+
     private Response doPost(String url, Object data) {
         try {
             String rawData = JSONObject.from(data).toJSONString();

itbaima-monitor-server/src/main/java/com/example/controller/ClientController.java

@@ -3,6 +3,7 @@ package com.example.controller;
 import com.example.entity.RestBean;
 import com.example.entity.dto.Client;
 import com.example.entity.vo.request.ClientDetailVO;
+import com.example.entity.vo.request.RuntimeDetailVO;
 import com.example.service.ClientService;
 import com.example.utils.Const;
 import jakarta.annotation.Resource;
@@ -28,4 +29,11 @@ public class ClientController {
         service.updateClientDetail(vo, client);
         return RestBean.success();
     }
+
+    @PostMapping("/runtime")
+    public RestBean<Void> updateRuntimeDetails(@RequestAttribute(Const.ATTR_CLIENT) Client client,
+                                               @RequestBody @Valid RuntimeDetailVO vo) {
+        service.updateRuntimeDetail(vo, client);
+        return RestBean.success();
+    }
 }

itbaima-monitor-server/src/main/java/com/example/entity/vo/request/RuntimeDetailVO.java

@@ -0,0 +1,24 @@
+package com.example.entity.vo.request;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+@Data
+public class RuntimeDetailVO {
+    @NotNull
+    long timestamp;
+    @NotNull
+    double cpuUsage;
+    @NotNull
+    double memoryUsage;
+    @NotNull
+    double diskUsage;
+    @NotNull
+    double networkUpload;
+    @NotNull
+    double networkDownload;
+    @NotNull
+    double diskRead;
+    @NotNull
+    double diskWrite;
+}

itbaima-monitor-server/src/main/java/com/example/service/ClientService.java

@@ -3,6 +3,7 @@ package com.example.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.example.entity.dto.Client;
 import com.example.entity.vo.request.ClientDetailVO;
+import com.example.entity.vo.request.RuntimeDetailVO;
 
 public interface ClientService extends IService<Client> {
     String registerToken();
@@ -10,4 +11,5 @@ public interface ClientService extends IService<Client> {
     Client findClient(Integer id);
     boolean verifyAndRegister(String token);
     void updateClientDetail(ClientDetailVO vo, Client client);
+    void updateRuntimeDetail(RuntimeDetailVO vo, Client client);
 }

itbaima-monitor-server/src/main/java/com/example/service/impl/ClientServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.example.entity.dto.Client;
 import com.example.entity.dto.ClientDetail;
 import com.example.entity.vo.request.ClientDetailVO;
+import com.example.entity.vo.request.RuntimeDetailVO;
 import com.example.mapper.ClientDetailMapper;
 import com.example.mapper.ClientMapper;
 import com.example.service.ClientService;
@@ -14,10 +15,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import java.security.SecureRandom;
-import java.util.Date;
+import java.util.*;
-import java.util.HashMap;
-import java.util.Objects;
-import java.util.Random;
 
 @Slf4j
 @Service
@@ -78,6 +76,13 @@ public class ClientServiceImpl extends ServiceImpl<ClientMapper, Client> impleme
         }
     }
 
+    private Map<Client, RuntimeDetailVO> test = new HashMap<>();
+
+    @Override
+    public void updateRuntimeDetail(RuntimeDetailVO vo, Client client) {
+        test.put(client, vo);
+    }
+
     private void addClientCache(Client client) {
         clientIdCache.put(client.getId(), client);
         clientTokenCache.put(client.getToken(), client);