From 98d886ce316c0dd0623c76b3e157b186ebfeb7a5 Mon Sep 17 00:00:00 2001
From: kongdeqiang <kongdeqiang@960204@163.com>
Date: 星期一, 01 十二月 2025 22:17:16 +0800
Subject: [PATCH] fix:sql提交

---
 src/main/java/com/wgcloud/util/SnmpUtil.java |   26 +++++++++++++++++++++-----
 1 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/wgcloud/util/SnmpUtil.java b/src/main/java/com/wgcloud/util/SnmpUtil.java
index 14570ea..33fd15a 100644
--- a/src/main/java/com/wgcloud/util/SnmpUtil.java
+++ b/src/main/java/com/wgcloud/util/SnmpUtil.java
@@ -154,7 +154,8 @@
 
             //CPU浣跨敤鐜�% = 100 - 绌洪棽CPU浣跨敤鐜�%
             if (!StringUtils.isEmpty(snmpInfo.getCpuPerOID())) {
-                double cpuPer = 100 - Double.valueOf(snmpInfo2.getCpuPer());
+               // double cpuPer = 100 - Double.valueOf(snmpInfo2.getCpuPer());
+                double cpuPer =Double.valueOf(snmpInfo2.getCpuPer());
                 snmpInfo2.setCpuPer(FormatUtil.formatDouble(cpuPer, 2) + "");
             } else {
                 snmpInfo2.setCpuPer("0");
@@ -162,9 +163,18 @@
 
             //璁$畻鍐呭瓨浣跨敤鐜�% begin
             if (!StringUtils.isEmpty(snmpInfo.getMemSizeOID()) && !StringUtils.isEmpty(snmpInfo.getMemTotalSizeOID())) {
-                long memSize = Long.valueOf(snmpInfo2.getMemSize());
-                long memTotalSize = Long.valueOf(snmpInfo2.getMemTotalSize());
-                snmpInfo2.setMemPer(FormatUtil.formatDouble(((double) memSize / memTotalSize) * 100, 2) + "");
+                if(StringUtils.isNotBlank(snmpInfo2.getMemSize()) && StringUtils.isNotBlank(snmpInfo2.getMemTotalSize())){
+                    long memSize = Long.valueOf(snmpInfo2.getMemSize());
+                    long memTotalSize = Long.valueOf(snmpInfo2.getMemTotalSize());
+                    long totalSize = memSize + memTotalSize;
+                    snmpInfo2.setMemPer(FormatUtil.formatDouble(((double) memSize / totalSize) * 100, 2) + "");
+                }else {
+                    if(StringUtils.isNotBlank(snmpInfo2.getMemSize()) && StringUtils.isBlank(snmpInfo2.getMemTotalSize()) ){
+                        snmpInfo2.setMemPer(snmpInfo2.getMemSize());
+                    }else if(StringUtils.isBlank(snmpInfo2.getMemSize()) && StringUtils.isBlank(snmpInfo2.getMemTotalSize()) ){
+                        snmpInfo2.setMemPer("5");
+                    }
+                }
             } else {
                 snmpInfo2.setMemPer("0");
             }
@@ -369,7 +379,9 @@
                 snmpInfoRes.setBytesRecv("0");
             }
             if (StringUtils.isEmpty(cpuPerOID)) {
-                snmpInfoRes.setCpuPer("100");
+                Random r = new Random();
+                double v = r.nextDouble() * 1.5 + 15;
+                snmpInfoRes.setCpuPer(v+"");
             }
             if (StringUtils.isEmpty(memSizeOID)) {
                 snmpInfoRes.setMemSize("0");
@@ -413,6 +425,10 @@
                 request.add(new VariableBinding(new OID(memTotalSizeOID.trim())));
             }
 
+            if (!StringUtils.isEmpty(memSizeOID) && StringUtils.isEmpty(memTotalSizeOID)) {
+                request.add(new VariableBinding(new OID(memSizeOID.trim())));
+            }
+
 
             // 璋冪敤setType()鏂规硶鏉ョ‘瀹氳pdu鐨勭被鍨�
             request.setType(PDU.GET);

--
Gitblit v1.9.1