From c139da0d91fa47330fcd89c7339c41e3160d8fb6 Mon Sep 17 00:00:00 2001 From: qiminbao Date: Tue, 23 Sep 2025 11:30:51 +0800 Subject: [PATCH] =?UTF-8?q?TCP=E6=95=B0=E6=8D=AE=E5=8C=85=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tongran/agent/client/netty/enpoint/AgentEndpoint.java | 6 ++++++ .../agent/client/netty/handler/AgentDecoderHandler.java | 2 +- .../agent/client/service/impl/SwitchBoardServiceImpl.java | 8 +++----- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/tongran/agent/client/netty/enpoint/AgentEndpoint.java b/src/main/java/com/tongran/agent/client/netty/enpoint/AgentEndpoint.java index 0e6c0e5..a1ebab9 100644 --- a/src/main/java/com/tongran/agent/client/netty/enpoint/AgentEndpoint.java +++ b/src/main/java/com/tongran/agent/client/netty/enpoint/AgentEndpoint.java @@ -101,6 +101,12 @@ public class AgentEndpoint { } catch (Exception e) { e.printStackTrace(); } + AssertLog.info("SWITCH_NET_OID={}",JSON.toJSONString(GlobalConfig.SWITCH_NET_OID)); + AssertLog.info("SWITCH_MODULE_OID={}",JSON.toJSONString(GlobalConfig.SWITCH_MODULE_OID)); + AssertLog.info("SWITCH_MPU_OID={}",JSON.toJSONString(GlobalConfig.SWITCH_MPU_OID)); + AssertLog.info("SWITCH_PWR_OID={}",JSON.toJSONString(GlobalConfig.SWITCH_PWR_OID)); + AssertLog.info("SWITCH_FAN_OID={}",JSON.toJSONString(GlobalConfig.SWITCH_FAN_OID)); + AssertLog.info("SWITCH_OTHER_OID={}",JSON.toJSONString(GlobalConfig.SWITCH_OTHER_OID)); long timestamp = System.currentTimeMillis(); timestamp = Math.round(timestamp / 1000.0); JSONObject json = new JSONObject(); diff --git a/src/main/java/com/tongran/agent/client/netty/handler/AgentDecoderHandler.java b/src/main/java/com/tongran/agent/client/netty/handler/AgentDecoderHandler.java index 666da65..22017b7 100644 --- a/src/main/java/com/tongran/agent/client/netty/handler/AgentDecoderHandler.java +++ b/src/main/java/com/tongran/agent/client/netty/handler/AgentDecoderHandler.java @@ -74,7 +74,7 @@ public class AgentDecoderHandler extends ChannelInboundHandlerAdapter { tmpMsgSize = 0; sb.append(arr_msg[0]); // content = arr_msg[0]; - lruCache.put(sessionManager.client(ctx), content, DateUnit.SECOND.getMillis() * 3000); + lruCache.put(sessionManager.client(ctx), sb.toString(), DateUnit.SECOND.getMillis() * 3000); } } //判定是否粘包 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 cdcc401..8bb120e 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 @@ -395,9 +395,9 @@ public class SwitchBoardServiceImpl implements SwitchBoardService { } String[] ifOIDs = oidParams.keySet().toArray(new String[0]); String[] params = oidParams.values().toArray(new String[0]); - if(!StringUtils.equals(type,"switchNetCollect") && !StringUtils.equals(type,"switchModuleCollect") - && !StringUtils.equals(type,"switchMpuCollect") && !StringUtils.equals(type,"switchPwrCollect") - && !StringUtils.equals(type,"switchFanCollect")){ + if(!StringUtils.equals(type,"switchNet") && !StringUtils.equals(type,"switchModule") + && !StringUtils.equals(type,"switchMpu") && !StringUtils.equals(type,"switchPwr") + && !StringUtils.equals(type,"switchFan")){ String os = ""; String ps = ""; for (int i = 0; i < params.length; i++) { @@ -411,8 +411,6 @@ public class SwitchBoardServiceImpl implements SwitchBoardService { } } } - Arrays.fill(ifOIDs, null); - Arrays.fill(params, null); ifOIDs = os.split(","); params = ps.split(","); }