From 63672a320f65ef1c34445df5569b3d411f7d77e4 Mon Sep 17 00:00:00 2001 From: qiminbao Date: Fri, 26 Sep 2025 10:20:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E6=8D=A2=E6=9C=BA=E9=87=87=E9=9B=86?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SwitchBoardServiceImpl.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) 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 2c08199..cd68315 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 @@ -396,9 +396,11 @@ public class SwitchBoardServiceImpl implements SwitchBoardService { } String[] ifOIDs = oidParams.keySet().toArray(new String[0]); String[] params = oidParams.values().toArray(new String[0]); + boolean isTrue = true; if(!StringUtils.equals(type,"switchNet") && !StringUtils.equals(type,"switchModule") && !StringUtils.equals(type,"switchMpu") && !StringUtils.equals(type,"switchPwr") && !StringUtils.equals(type,"switchFan")){ + isTrue = false; String os = ""; String ps = ""; for (int i = 0; i < params.length; i++) { @@ -461,12 +463,19 @@ public class SwitchBoardServiceImpl implements SwitchBoardService { VariableBinding[] vbs = event.getResponse().getVariableBindings().toArray(new VariableBinding[0]); for (int m = 0; m < params.length; m++) { AssertLog.info("参数名：{}，值={}", params[m],vbs[m]); - JSONObject temp = new JSONObject(); - temp.put(params[m],vbs[m].getVariable().toString()); - list.add(temp.toString()); + if(isTrue){ + json.put(params[m],vbs[m].getVariable().toString()); + }else{ + JSONObject temp = new JSONObject(); + temp.put(params[m],vbs[m].getVariable().toString()); + list.add(temp.toString()); + } } } } + if(isTrue){ + return json.toString(); + } return JSON.toJSONString(list); }