|
@@ -292,9 +292,9 @@ public class RestUtil {
|
|
|
{
|
|
|
subsystem_connect_status_array.add(itemObject.toJSON(2));
|
|
|
Object connectName = itemObject.get("名称").value_prim.value;
|
|
|
- String connectStatus = itemObject.get("连接状态").value_prim.value.toString();
|
|
|
+ Object connectStatus = itemObject.get("连接状态").value_prim.value;
|
|
|
sb.append("[" + connectName + "]");
|
|
|
- if(connectStatus.equals("1"))
|
|
|
+ if(connectStatus!=null&&connectStatus.toString().equals("1"))
|
|
|
{
|
|
|
sb.append("[连接成功]");
|
|
|
}else
|
|
@@ -326,7 +326,7 @@ public class RestUtil {
|
|
|
} catch (Exception e) {
|
|
|
log.error(e.getMessage(), e);
|
|
|
}
|
|
|
- return JSONArray.toJSONString(subsystem_connect_status_array);
|
|
|
+ return JSONArray.toJSONString(subsystem_connect_status_array,SerializerFeature.WriteMapNullValue);
|
|
|
}
|
|
|
|
|
|
//获取子系统配置
|