diff --git a/common/global.hpp b/common/global.hpp index 0defe3f..0cf2043 100644 --- a/common/global.hpp +++ b/common/global.hpp @@ -18,7 +18,7 @@ enum enumZigBeeTransmitStatus { //#define NR5G_MODULE -#define Q4G_MODULE +//#define Q4G_MODULE //#define WIFI_MODULE //#define NR5G_MEIGE diff --git a/jsonparse/web_cmd_parse.cpp b/jsonparse/web_cmd_parse.cpp index 7c2162f..e7a6375 100644 --- a/jsonparse/web_cmd_parse.cpp +++ b/jsonparse/web_cmd_parse.cpp @@ -291,9 +291,9 @@ std::string JsonData::JsonCmd_Cgi_10(Param_10 ¶m) { sprintf(selectCon, "%s,channelID,timeStamp", param.strStatic.c_str()); if (param.straxis == "S") { - sprintf(szTableName, "t_dataStatic_%s", param.strDataNode.c_str()); + sprintf(szTableName, "t_dataStatic_%s", param.MeasurementID.c_str()); } else { - sprintf(szTableName, "t_data_%s", param.strDataNode.c_str()); + sprintf(szTableName, "t_data_%s", param.MeasurementID.c_str()); } if (param.timeEnd == "") { sprintf(whereCon, "channelID like '%%%s%%' and %s <> ''", param.MeasurementID.c_str(), param.strStatic.c_str());