mlx

api-common/src/main/java/api/common/pojo/po/home/SystemServerPO.java

@@ -15,15 +15,15 @@ public class SystemServerPO extends CommonPO {
     String serverId;
     String serverAddress;
     String serverType;
-    Integer memoryUsage;
-    Integer memoryAvailable;
-    Integer memoryTotal;
-    Integer diskUsage;
-    Double diskAvailable;
-    Integer diskTotal;
-    Integer cpuUsage;
-    Integer cpuTotal;   // cpu 核数
-    Integer gpuUsage;
+    Double memoryUsage;
+    Long memoryAvailable;
+    Long memoryTotal;
+    Double diskUsage;
+    Long diskAvailable;
+    Long diskTotal;
+    Double cpuUsage;
+    Long cpuTotal;   // cpu 线程数
+    Double gpuUsage;
     Integer gpuTotal;   // gpu 内存数
     Integer taskNumber;
 

simulation-resource-monitor/src/main/java/com/css/simulation/resource/monitor/mappper/SystemServerMapper.java

@@ -0,0 +1,46 @@
+package com.css.simulation.resource.monitor.mappper;
+
+import api.common.pojo.po.home.SystemServerPO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+
+/**
+ * create table if not exists simulation.system_server
+ * (
+ * 	id varchar(32) null,
+ * 	server_id varchar(64) null,
+ * 	server_address varchar(32) null,
+ * 	server_type varchar(32) null,
+ * 	cpu_useage varchar(32) null,
+ * 	memory_useage varchar(32) null,
+ * 	memory_available varchar(32) null comment '剩余内存，单位GB',
+ * 	disk_usage varchar(32) null,
+ * 	disk_abailable varchar(32) null comment '剩余磁盘，单位GB',
+ * 	task_number varchar(32) null comment '执行任务数量'
+ * )
+ * comment '服务器表';
+ */
+@Mapper
+public interface SystemServerMapper {
+
+
+    @Select("select id,\n" +
+            "       server_id,\n" +
+            "       server_address,\n" +
+            "       server_type,\n" +
+            "       cpu_usage,\n" +
+            "       memory_usage,\n" +
+            "       memory_available,\n" +
+            "       disk_usage,\n" +
+            "       disk_available,\n" +
+            "       task_number,\n" +
+            "       weight,\n" +
+            "       gpu_usage\n" +
+            "from system_server\n" +
+            "where is_deleted = '0'")
+    List<SystemServerPO> insert();
+
+}

simulation-resource-monitor/src/main/java/com/css/simulation/resource/monitor/scheduler/MyScheduler.java

@@ -47,16 +47,17 @@ public class MyScheduler {
                         .serverId(SshUtil.hostname(session))
                         .serverAddress(ip)
                         .serverType(type)
-                        .memoryUsage((int) SshUtil.memoryUsage(session))
-                        .memoryAvailable((int) SshUtil.memoryAvailable(session))
-                        .memoryTotal((int) SshUtil.memoryTotal(session))
-                        .diskUsage((int) SshUtil.diskUsage(session))
+                        .memoryUsage(SshUtil.memoryUsage(session))
+                        .memoryAvailable(SshUtil.memoryAvailable(session))
+                        .memoryTotal( SshUtil.memoryTotal(session))
+                        .diskUsage( SshUtil.diskUsage(session))
                         .diskAvailable(SshUtil.diskAvailable(session))
-//                        .diskTotal(SshUtil.diskTotal)
-                        .cpuUsage((int) SshUtil.cpuUsage(session))
+                        .diskTotal(SshUtil.diskTotal(session))
+                        .cpuUsage(SshUtil.cpuUsage(session))
+                        .cpuTotal(SshUtil.cpuTotal(session))
+                        .gpuUsage(SshUtil.gpuUsage(session))
+                        .gpuTotal(SshUtil.gpuTotal(session))
 //                        .taskNumber()
-//                        .weight()
-//                        .gpuUsage("gpu".equals(type)?SshUtil.gpu(session).stream().mapto :0)
                         .build();
             } catch (Exception e) {
                 e.printStackTrace();