소스 검색

FIX 任务,算法,温度 完成

tjf 1 일 전
부모
커밋
c012760dd4

+ 3 - 3
ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java

@@ -156,8 +156,8 @@ public class Server {
                 long rxRate = (stats2.rxBytes - stats1.rxBytes) * 8; // 比特/秒
                 long txRate = (stats2.txBytes - stats1.txBytes) * 8; // 比特/秒
                 netWork.setNetworkName(interfaceName);
-                netWork.setNetworkUp(txRate);
-                netWork.setNetworkDown(rxRate);
+                netWork.setNetworkUp(formatRate(rxRate));
+                netWork.setNetworkDown(formatRate(txRate));
                 netWorkList.add(netWork);
                 System.out.printf("\n网络速率 (%s):\n  下行: %s\n  上行: %s\n",
                         interfaceName,
@@ -378,7 +378,7 @@ public class Server {
         Map<Integer, Double> cpuSpeeds = getCpuSpeeds();
         if (!cpuSpeeds.isEmpty()) {
             for (Integer socket : cpuSpeeds.keySet()) {
-                cpuList.get(socket).setSpeed(cpuSpeeds.get(socket));
+                cpuList.get(socket).setSpeed(Arith.round(cpuSpeeds.get(socket),2));
                 System.out.printf("CPU插槽 %d 整体速度: %.2f GHz\n", socket, cpuSpeeds.get(socket));
             }
         }

+ 6 - 7
ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Network.java

@@ -9,30 +9,29 @@ public class Network {
     /**
      * 上行
      */
-    private double networkUp;
+    private String networkUp;
     /**
      * 下行
      */
-    private double networkDown;
+    private String networkDown;
     /**
      * 名称
      */
     private String networkName;
 
-
-    public double getNetworkUp() {
+    public String getNetworkUp() {
         return networkUp;
     }
 
-    public void setNetworkUp(double networkUp) {
+    public void setNetworkUp(String networkUp) {
         this.networkUp = networkUp;
     }
 
-    public double getNetworkDown() {
+    public String getNetworkDown() {
         return networkDown;
     }
 
-    public void setNetworkDown(double networkDown) {
+    public void setNetworkDown(String networkDown) {
         this.networkDown = networkDown;
     }