|
@@ -2832,11 +2832,12 @@ char* over_all_breaker_chn_info_to_json(_OverBreakerChnInfo* _over_all_breaker_b
|
|
|
|
|
|
|
|
|
|
|
|
|
// 添加基本键值对
|
|
// 添加基本键值对
|
|
|
- cJSON* sdata_filed = cJSON_CreateObject();
|
|
|
|
|
|
|
+ cJSON* sdata_filed = NULL;
|
|
|
// 创建数据
|
|
// 创建数据
|
|
|
cJSON *data_root_array = cJSON_CreateArray();
|
|
cJSON *data_root_array = cJSON_CreateArray();
|
|
|
if (nWSType)
|
|
if (nWSType)
|
|
|
{
|
|
{
|
|
|
|
|
+ sdata_filed = cJSON_CreateObject();
|
|
|
cJSON_AddNumberToObject(sdata_filed, "code", 200);
|
|
cJSON_AddNumberToObject(sdata_filed, "code", 200);
|
|
|
}
|
|
}
|
|
|
else
|
|
else
|
|
@@ -2896,11 +2897,12 @@ char* over_all_breaker_switch_info_to_json(_OverBreakerSwitchInfo* _over_all_bre
|
|
|
|
|
|
|
|
|
|
|
|
|
// 添加基本键值对
|
|
// 添加基本键值对
|
|
|
- cJSON* sdata_filed = cJSON_CreateObject();
|
|
|
|
|
|
|
+ cJSON* sdata_filed = NULL;
|
|
|
// 创建数据
|
|
// 创建数据
|
|
|
cJSON *data_root_array = cJSON_CreateArray();
|
|
cJSON *data_root_array = cJSON_CreateArray();
|
|
|
if (nWSType)
|
|
if (nWSType)
|
|
|
{
|
|
{
|
|
|
|
|
+ sdata_filed = cJSON_CreateObject();
|
|
|
cJSON_AddNumberToObject(sdata_filed, "code", 200);
|
|
cJSON_AddNumberToObject(sdata_filed, "code", 200);
|
|
|
}
|
|
}
|
|
|
else
|
|
else
|
|
@@ -2977,11 +2979,12 @@ char* over_all_sensor_info_to_json(_OverSensorBackInfo* _over_all_sensor_back_in
|
|
|
|
|
|
|
|
|
|
|
|
|
// 添加基本键值对
|
|
// 添加基本键值对
|
|
|
- cJSON* sdata_filed = cJSON_CreateObject();
|
|
|
|
|
|
|
+ cJSON* sdata_filed = NULL;
|
|
|
// 创建数据
|
|
// 创建数据
|
|
|
cJSON *data_root_array = cJSON_CreateArray();
|
|
cJSON *data_root_array = cJSON_CreateArray();
|
|
|
if (nWSType)
|
|
if (nWSType)
|
|
|
{
|
|
{
|
|
|
|
|
+ sdata_filed = cJSON_CreateObject();
|
|
|
cJSON_AddNumberToObject(sdata_filed, "code", 200);
|
|
cJSON_AddNumberToObject(sdata_filed, "code", 200);
|
|
|
}
|
|
}
|
|
|
else
|
|
else
|
|
@@ -4881,9 +4884,10 @@ char* service_ds_all_ack_to_json(char* pDate,char* strName,char* strchID,GlobalP
|
|
|
// 创建 JSON 对象
|
|
// 创建 JSON 对象
|
|
|
cJSON* root = cJSON_CreateObject();
|
|
cJSON* root = cJSON_CreateObject();
|
|
|
|
|
|
|
|
- cJSON* sdata_filed = cJSON_CreateObject();
|
|
|
|
|
|
|
+ cJSON* sdata_filed = NULL;
|
|
|
if (nWSType)
|
|
if (nWSType)
|
|
|
{
|
|
{
|
|
|
|
|
+ sdata_filed = cJSON_CreateObject();
|
|
|
cJSON_AddNumberToObject(sdata_filed, "code", 200);
|
|
cJSON_AddNumberToObject(sdata_filed, "code", 200);
|
|
|
}
|
|
}
|
|
|
else
|
|
else
|
|
@@ -6041,9 +6045,10 @@ char* service_mqtt_ack_to_json(mqtt_info_t* info,int nWSType)
|
|
|
// 创建 JSON 对象
|
|
// 创建 JSON 对象
|
|
|
cJSON* root = cJSON_CreateObject();
|
|
cJSON* root = cJSON_CreateObject();
|
|
|
|
|
|
|
|
- cJSON* sdata_filed = cJSON_CreateObject();
|
|
|
|
|
|
|
+ cJSON* sdata_filed = NULL;
|
|
|
if (nWSType)
|
|
if (nWSType)
|
|
|
{
|
|
{
|
|
|
|
|
+ sdata_filed = cJSON_CreateObject();
|
|
|
cJSON_AddNumberToObject(sdata_filed, "code", 200);
|
|
cJSON_AddNumberToObject(sdata_filed, "code", 200);
|
|
|
}
|
|
}
|
|
|
else
|
|
else
|