From 44f812e243464d14f6906c11e91cc30a1202db76 Mon Sep 17 00:00:00 2001
From: qiminbao <qaz001122>
Date: Mon, 25 Aug 2025 12:08:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0TCP=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=A4=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/tongran/agentserver/scheduler/CpuScheduler.java   | 2 +-
 .../com/tongran/agentserver/scheduler/DiskScheduler.java  | 2 +-
 .../tongran/agentserver/scheduler/DockerScheduler.java    | 2 +-
 .../com/tongran/agentserver/scheduler/HeartScheduler.java | 2 +-
 .../tongran/agentserver/scheduler/MemoryScheduler.java    | 2 +-
 .../com/tongran/agentserver/scheduler/NetScheduler.java   | 2 +-
 .../com/tongran/agentserver/scheduler/PointScheduler.java | 2 +-
 .../agentserver/scheduler/SwitchBoardScheduler.java       | 6 +++---
 .../com/tongran/agentserver/scheduler/SysScheduler.java   | 2 +-
 .../com/tongran/agentserver/server/collect/vo/CpuVO.java  | 8 ++++----
 10 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/tongran/agentserver/scheduler/CpuScheduler.java b/src/main/java/com/tongran/agentserver/scheduler/CpuScheduler.java
index 1866fc9..46e294b 100644
--- a/src/main/java/com/tongran/agentserver/scheduler/CpuScheduler.java
+++ b/src/main/java/com/tongran/agentserver/scheduler/CpuScheduler.java
@@ -56,7 +56,7 @@ public class CpuScheduler {
                 String clientId = AgentUtil.getMotherboardUUID();
                 Message message = Message.builder().clientId(clientId).dataType("CPU").data(data).build();
                 // 将对象转为 JSON 字符串
-                String json = "agent-tcp:"+JSON.toJSONString(message)+"@tong-ran";
+                String json = JSON.toJSONString(message);
                 AssertLog.info("发送CPU信息包={}",json);
                 nettyTcpClient.sendMessage(json);
             }
diff --git a/src/main/java/com/tongran/agentserver/scheduler/DiskScheduler.java b/src/main/java/com/tongran/agentserver/scheduler/DiskScheduler.java
index cf25ee5..dcadbb9 100644
--- a/src/main/java/com/tongran/agentserver/scheduler/DiskScheduler.java
+++ b/src/main/java/com/tongran/agentserver/scheduler/DiskScheduler.java
@@ -59,7 +59,7 @@ public class DiskScheduler {
                 String clientId = AgentUtil.getMotherboardUUID();
                 Message message = Message.builder().clientId(clientId).dataType("DISK").data(data).build();
                 // 将对象转为 JSON 字符串
-                String json = "agent-tcp:"+JSON.toJSONString(message)+"@tong-ran";
+                String json = JSON.toJSONString(message);
                 AssertLog.info("发送磁盘信息包={}",json);
                 nettyTcpClient.sendMessage(json);
             }
diff --git a/src/main/java/com/tongran/agentserver/scheduler/DockerScheduler.java b/src/main/java/com/tongran/agentserver/scheduler/DockerScheduler.java
index f686982..2829589 100644
--- a/src/main/java/com/tongran/agentserver/scheduler/DockerScheduler.java
+++ b/src/main/java/com/tongran/agentserver/scheduler/DockerScheduler.java
@@ -59,7 +59,7 @@ public class DockerScheduler {
                 String clientId = AgentUtil.getMotherboardUUID();
                 Message message = Message.builder().clientId(clientId).dataType("DOCKER").data(data).build();
                 // 将对象转为 JSON 字符串
-                String json = "agent-tcp:"+JSON.toJSONString(message)+"@tong-ran";
+                String json = JSON.toJSONString(message);
                 AssertLog.info("发送容器信息包={}",json);
                 nettyTcpClient.sendMessage(json);
             }
diff --git a/src/main/java/com/tongran/agentserver/scheduler/HeartScheduler.java b/src/main/java/com/tongran/agentserver/scheduler/HeartScheduler.java
index a84ed50..d4ac35d 100644
--- a/src/main/java/com/tongran/agentserver/scheduler/HeartScheduler.java
+++ b/src/main/java/com/tongran/agentserver/scheduler/HeartScheduler.java
@@ -58,7 +58,7 @@ public class HeartScheduler {
             String clientId = AgentUtil.getMotherboardUUID();
             Message message = Message.builder().clientId(clientId).dataType("HEARTBEAT").data(object.toString()).build();
             // 将对象转为 JSON 字符串 标识
-            String json = "agent-tcp:"+JSON.toJSONString(message)+"@tong-ran";
+            String json = JSON.toJSONString(message);
             AssertLog.info("发送心跳包={}",json);
             nettyTcpClient.sendMessage(json);
         };
diff --git a/src/main/java/com/tongran/agentserver/scheduler/MemoryScheduler.java b/src/main/java/com/tongran/agentserver/scheduler/MemoryScheduler.java
index 40e15c4..4c088ac 100644
--- a/src/main/java/com/tongran/agentserver/scheduler/MemoryScheduler.java
+++ b/src/main/java/com/tongran/agentserver/scheduler/MemoryScheduler.java
@@ -57,7 +57,7 @@ public class MemoryScheduler {
                 String clientId = AgentUtil.getMotherboardUUID();
                 Message message = Message.builder().clientId(clientId).dataType("MEMORY").data(data).build();
                 // 将对象转为 JSON 字符串
-                String json = "agent-tcp:"+JSON.toJSONString(message)+"@tong-ran";
+                String json = JSON.toJSONString(message);
                 AssertLog.info("发送内存信息包={}",json);
                 nettyTcpClient.sendMessage(json);
             }
diff --git a/src/main/java/com/tongran/agentserver/scheduler/NetScheduler.java b/src/main/java/com/tongran/agentserver/scheduler/NetScheduler.java
index 5b2f81b..143a479 100644
--- a/src/main/java/com/tongran/agentserver/scheduler/NetScheduler.java
+++ b/src/main/java/com/tongran/agentserver/scheduler/NetScheduler.java
@@ -59,7 +59,7 @@ public class NetScheduler {
                 String clientId = AgentUtil.getMotherboardUUID();
                 Message message = Message.builder().clientId(clientId).dataType("NET").data(data).build();
                 // 将对象转为 JSON 字符串
-                String json = "agent-tcp:"+JSON.toJSONString(message)+"@tong-ran";
+                String json = JSON.toJSONString(message);
                 AssertLog.info("发送网卡信息包={}",json);
                 nettyTcpClient.sendMessage(json);
             }
diff --git a/src/main/java/com/tongran/agentserver/scheduler/PointScheduler.java b/src/main/java/com/tongran/agentserver/scheduler/PointScheduler.java
index 66a284a..65ab937 100644
--- a/src/main/java/com/tongran/agentserver/scheduler/PointScheduler.java
+++ b/src/main/java/com/tongran/agentserver/scheduler/PointScheduler.java
@@ -59,7 +59,7 @@ public class PointScheduler {
                 String clientId = AgentUtil.getMotherboardUUID();
                 Message message = Message.builder().clientId(clientId).dataType("POINT").data(data).build();
                 // 将对象转为 JSON 字符串
-                String json = "agent-tcp:"+JSON.toJSONString(message)+"@tong-ran";
+                String json = JSON.toJSONString(message);
                 AssertLog.info("发送挂载点信息包={}",json);
                 nettyTcpClient.sendMessage(json);
             }
diff --git a/src/main/java/com/tongran/agentserver/scheduler/SwitchBoardScheduler.java b/src/main/java/com/tongran/agentserver/scheduler/SwitchBoardScheduler.java
index b9fd5de..1477404 100644
--- a/src/main/java/com/tongran/agentserver/scheduler/SwitchBoardScheduler.java
+++ b/src/main/java/com/tongran/agentserver/scheduler/SwitchBoardScheduler.java
@@ -34,9 +34,9 @@ public class SwitchBoardScheduler {
 
     @PostConstruct
     public void init() {
-        // 等待12秒
+        // 等待33秒
         try {
-            Thread.sleep(12000);
+            Thread.sleep(33000);
         } catch (InterruptedException e) {
             e.printStackTrace();
         }
@@ -57,7 +57,7 @@ public class SwitchBoardScheduler {
                 String clientId = AgentUtil.getMotherboardUUID();
                 Message message = Message.builder().clientId(clientId).dataType("SWITCHBOARD").data(data).build();
                 // 将对象转为 JSON 字符串
-                String json = "agent-tcp:"+ JSON.toJSONString(message)+"@tong-ran";
+                String json =  JSON.toJSONString(message);
                 AssertLog.info("发送交换机信息包={}",json);
                 nettyTcpClient.sendMessage(json);
             }
diff --git a/src/main/java/com/tongran/agentserver/scheduler/SysScheduler.java b/src/main/java/com/tongran/agentserver/scheduler/SysScheduler.java
index c609525..9870379 100644
--- a/src/main/java/com/tongran/agentserver/scheduler/SysScheduler.java
+++ b/src/main/java/com/tongran/agentserver/scheduler/SysScheduler.java
@@ -56,7 +56,7 @@ public class SysScheduler {
                 String clientId = AgentUtil.getMotherboardUUID();
                 Message message = Message.builder().clientId(clientId).dataType("SYSTEM").data(data).build();
                 // 将对象转为 JSON 字符串
-                String json = "agent-tcp:"+JSON.toJSONString(message)+"@tong-ran";
+                String json = JSON.toJSONString(message);
                 AssertLog.info("发送系统信息包={}",json);
                 nettyTcpClient.sendMessage(json);
             }
diff --git a/src/main/java/com/tongran/agentserver/server/collect/vo/CpuVO.java b/src/main/java/com/tongran/agentserver/server/collect/vo/CpuVO.java
index 5ebd7e4..e1e639b 100644
--- a/src/main/java/com/tongran/agentserver/server/collect/vo/CpuVO.java
+++ b/src/main/java/com/tongran/agentserver/server/collect/vo/CpuVO.java
@@ -26,7 +26,7 @@ public class CpuVO implements Serializable {
     private double avg15;
 
     @Schema(description = "CPU硬件中断提供服务时间")
-    private double interrupt;
+    private long interrupt;
 
     @Schema(description = "CPU使用率%")
     private double uti;
@@ -38,19 +38,19 @@ public class CpuVO implements Serializable {
     private long normal;
 
     @Schema(description = "CPU空闲时间")
-    private double idle;
+    private long idle;
 
     @Schema(description = "CPU等待响应时间")
     private double iowait;
 
     @Schema(description = "CPU系统时间")
-    private double system;
+    private long system;
 
     @Schema(description = "CPU软件无响应时间")
     private double noresp;
 
     @Schema(description = "CPU用户进程所花费的时间")
-    private double user;
+    private long user;