交换机采集数据优化
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user