From 95eafb0901a64d447452d065459db9819dda40a0 Mon Sep 17 00:00:00 2001 From: qiminbao Date: Mon, 22 Sep 2025 22:18:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E6=8D=A2=E6=9C=BA=E9=87=87=E9=9B=86?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/service/impl/AgentServiceImpl.java | 2 +- .../service/impl/SwitchBoardServiceImpl.java | 27 ++++++++++++------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/tongran/agent/client/service/impl/AgentServiceImpl.java b/src/main/java/com/tongran/agent/client/service/impl/AgentServiceImpl.java index ee569c6..0468141 100644 --- a/src/main/java/com/tongran/agent/client/service/impl/AgentServiceImpl.java +++ b/src/main/java/com/tongran/agent/client/service/impl/AgentServiceImpl.java @@ -443,7 +443,7 @@ public class AgentServiceImpl implements AgentService { } } break; - case "dockerCollect": //风扇采集 + case "switchFanCollect": //风扇采集 if(GlobalConfig.switchFanCollect != collect || GlobalConfig.switchFanInterval != interval){ flag = true; GlobalConfig.switchFanCollect = collect; diff --git a/src/main/java/com/tongran/agent/client/service/impl/SwitchBoardServiceImpl.java b/src/main/java/com/tongran/agent/client/service/impl/SwitchBoardServiceImpl.java index f9d04df..51583c3 100644 --- a/src/main/java/com/tongran/agent/client/service/impl/SwitchBoardServiceImpl.java +++ b/src/main/java/com/tongran/agent/client/service/impl/SwitchBoardServiceImpl.java @@ -4,7 +4,7 @@ import com.alibaba.fastjson2.JSONObject; import com.tongran.agent.client.core.config.GlobalConfig; import com.tongran.agent.client.core.vo.SwitchBoardVO; import com.tongran.agent.client.service.SwitchBoardService; -import org.apache.commons.lang3.StringUtils; +import com.tongran.agent.client.utils.AssertLog; import org.snmp4j.*; import org.snmp4j.event.ResponseEvent; import org.snmp4j.mp.SnmpConstants; @@ -413,18 +413,25 @@ public class SwitchBoardServiceImpl implements SwitchBoardService { pdu.setType(PDU.GET); event = snmp.send(pdu, target); +// System.out.printf("%-5s %-15s %-10s %-15s %-8s %-12s %-12s%n", +// "Index", "Name", "Type", "Speed", "Status", "InBytes", "OutBytes"); +// if (event != null && event.getResponse() != null) { +// VariableBinding[] vbs = event.getResponse().getVariableBindings().toArray(new VariableBinding[0]); +// String ifName = vbs[0].getVariable().toString(); +// String ifType = getInterfaceType(vbs[1].getVariable().toInt()); +// String speed = formatSpeed(vbs[2].getVariable().toInt()); +// String status = getOperStatus(vbs[3].getVariable().toInt()); +// long inBytes = vbs[4].getVariable().toLong(); +// long outBytes = vbs[5].getVariable().toLong(); +// System.out.printf("%-15s %-10s %-15s %-8s %-12d %-12d%n", +// ifName, ifType, speed, status, inBytes, outBytes); +// } + if (event != null && event.getResponse() != null) { VariableBinding[] vbs = event.getResponse().getVariableBindings().toArray(new VariableBinding[0]); for (int m = 0; m < params.length; m++) { - if(StringUtils.isNotBlank(type)){ - if(StringUtils.equals(params[m], type)){ - json.put(params[m],vbs[m].getVariable().toString()); - System.out.println(params[m]+"："+vbs[m].getVariable().toString()); - } - }else{ - json.put(params[m],vbs[m].getVariable().toString()); - System.out.println(params[m]+"："+vbs[m].getVariable().toString()); - } + AssertLog.info("参数名：{}，值={}", params[m],vbs[m]); + json.put(params[m],vbs[m].getVariable().toString()); } } }