精简 MachineInfo 中的字段

manager/src/main/java/cn/reghao/devops/manager/machine/model/po/MachineInfo.java

@@ -42,25 +42,7 @@ public class MachineInfo extends BaseEntity {
     private Long bootTime;
     @NotNull
     private String agentVersion;
-    //@NotNull
-    private Long lastCheck;
 
-    @NotNull
-    private String vendor;
-    @NotNull
-    private String modelName;
-    @NotNull
-    private Integer physicalCore;
-    @NotNull
-    private Integer logicalCore;
-
-    @NotNull
-    private Long memTotal;
-    private Long swapTotal;
-    @NotNull
-    @ElementCollection(targetClass = DiskInfo.class)
-    @LazyCollection(LazyCollectionOption.FALSE)
-    private List<DiskInfo> diskInfos;
     @NotNull
     @ElementCollection(targetClass = NetworkInfo.class)
     @LazyCollection(LazyCollectionOption.FALSE)
@@ -75,18 +57,6 @@ public class MachineInfo extends BaseEntity {
         this.byteOrder = osDetail.getByteOrder();
         this.bootTime = osDetail.getBootTime();
         this.agentVersion = machineDetail.getAppVersion().getCommitId();
-        //this.lastCheck = machineDetail.getTimestamp();
-
-        CpuDetail cpuDetail = machineDetail.getCpuDetail();
-        this.vendor = cpuDetail.getVendor();
-        this.modelName = cpuDetail.getName();
-        this.physicalCore = cpuDetail.getPhysicalCore();
-        this.logicalCore = cpuDetail.getLogicalCore();
-
-        MemoryDetail memoryDetail = machineDetail.getMemoryDetail();
-        this.memTotal = memoryDetail.getTotal();
-        this.swapTotal = memoryDetail.getSwapTotal();
-        this.diskInfos = machineDetail.getDiskDetails().stream().map(DiskInfo::new).collect(Collectors.toList());
         setNetworkInfos(machineDetail.getNetworkDetails());
     }
 

manager/src/main/java/cn/reghao/devops/manager/machine/model/vo/MachineInfoVO.java

@@ -2,13 +2,10 @@ package cn.reghao.devops.manager.machine.model.vo;
 
 import cn.reghao.devops.manager.machine.model.po.MachineInfo;
 import cn.reghao.devops.manager.machine.model.po.NetworkInfo;
-import cn.reghao.jutil.jdk.converter.ByteConverter;
-import cn.reghao.jutil.jdk.converter.ByteType;
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;
 import lombok.Data;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * @author reghao
@@ -45,14 +42,6 @@ public class MachineInfoVO {
         this.version = machineInfo.getVersion();
         this.byteOrder = machineInfo.getByteOrder();
         this.bootTime = DateTimeConverter.format(machineInfo.getBootTime()*1000);
-
-        this.vendor = machineInfo.getVendor();
-        this.modelName = machineInfo.getModelName();
-        this.physicalCore = machineInfo.getPhysicalCore();
-        this.logicalCore = machineInfo.getLogicalCore();
-        this.memTotal = new ByteConverter().convert(ByteType.Bytes, machineInfo.getMemTotal());
-        this.swapTotal = new ByteConverter().convert(ByteType.Bytes, machineInfo.getSwapTotal());
-        this.diskInfoVOs = machineInfo.getDiskInfos().stream().map(DiskInfoVO::new).collect(Collectors.toList());
         this.networkInfos = machineInfo.getNetworkInfos();
     }
 }

manager/src/main/resources/templates/machine/host/detail.html

@@ -46,61 +46,6 @@
             </tr>
             </tbody>
         </table>
-        <div class="timo-detail-title">CPU</div>
-        <table class="layui-table timo-detail-table">
-            <thead>
-            <tr>
-                <th data-field="vendor">品牌</th>
-                <th data-field="modelName">型号</th>
-                <th data-field="physicalCore">物理核</th>
-                <th data-field="logicalCore">逻辑核</th>
-            </tr>
-            </thead>
-            <tbody>
-            <tr>
-                <td th:text="${machine.vendor}"></td>
-                <td th:text="${machine.modelName}"></td>
-                <td th:text="${machine.physicalCore}"></td>
-                <td th:text="${machine.logicalCore}"></td>
-            </tr>
-            </tbody>
-        </table>
-        <div class="timo-detail-title">内存</div>
-        <table class="layui-table timo-detail-table">
-            <thead>
-            <tr>
-                <th data-field="memTotal">物理内存总量</th>
-                <th data-field="swapTotal">Swap 分区总量</th>
-            </tr>
-            </thead>
-            <tbody>
-            <tr>
-                <td th:text="${machine.memTotal}"></td>
-                <td th:text="${machine.swapTotal}"></td>
-            </tr>
-            </tbody>
-        </table>
-        <div class="timo-detail-title">磁盘</div>
-        <table class="layui-table timo-detail-table">
-            <thead>
-            <tr>
-                <th data-field="vendor">磁盘路径</th>
-                <th data-field="modelName">挂载分区</th>
-                <th data-field="physicalCore">文件系统</th>
-                <th data-field="logicalCore">磁盘总量</th>
-                <th data-field="logicalCore">inode 总量</th>
-            </tr>
-            </thead>
-            <tbody>
-            <tr th:each="item:${machine.diskInfoVOs}">
-                <td th:text="${item.diskPath}"></td>
-                <td th:text="${item.mountedOn}"></td>
-                <td th:text="${item.fsType}"></td>
-                <td th:text="${item.total}"></td>
-                <td th:text="${item.inodeTotal}"></td>
-            </tr>
-            </tbody>
-        </table>
     </div>
 <script th:replace="/common/template :: script"></script>
 </body>