From c3ec574d56646553acca20bd1e445cb850ad0a09 Mon Sep 17 00:00:00 2001
From: zhangsheng <zhangs1125@sina.com>
Date: Thu, 19 Dec 2024 13:12:36 +0800
Subject: [PATCH] fix bugs,version 5.2

---
 common/global.hpp           | 2 +-
 jsonparse/web_cmd_parse.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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 &param) {
         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());