From b4c24e718a62badf9a511206452ff878e3113857 Mon Sep 17 00:00:00 2001 From: zhangsheng Date: Wed, 12 Feb 2025 17:37:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/common_func.cpp | 9 ++++++++- jsonparse/web_cmd_parse2.cpp | 7 +++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/common/common_func.cpp b/common/common_func.cpp index 1fd6422..e9aa881 100644 --- a/common/common_func.cpp +++ b/common/common_func.cpp @@ -605,7 +605,14 @@ void ImportConfig(std::string filename) { WriteStr2Config(SYSTEMINFOFILE, "Version", "SystemVersion", jsSystemInfo["SystemVersion"].asString()); WriteStr2Config(SYSTEMINFOFILE, "Version", "WebVersion", jsSystemInfo["WebVersion"].asString()); WriteStr2Config(SYSTEMINFOFILE, "Version", "GateWayHwVesion", jsSystemInfo["GateWayHwVesion"].asString()); - WriteStr2Config(SYSTEMINFOFILE, "Version", "GateWayProduct", jsSystemInfo["GateWayProduct"].asString()); + WriteStr2Config(SYSTEMINFOFILE, "Version", "GateWayProduct", jsSystemInfo["GateWayProduct"].asString()); + + char whereCon[1024] = {0}; + char updateSql[1024] = { 0 }; + sprintf(updateSql, "zigbeePanID = '%s',zigbeeChannel = '%s'",\ + jsonValZigbee["PanID"].asString().c_str(),jsonValZigbee["channel"].asString().c_str()); + sprintf(whereCon, "gatewayMAC='%s'", GlobalConfig::MacAddr_G.c_str()); + sqlite_db_ctrl::instance().UpdateTableData(T_GATEWAY_INFO(TNAME), updateSql, whereCon); } int UpdataDataNodeConfig(std::string filename) { diff --git a/jsonparse/web_cmd_parse2.cpp b/jsonparse/web_cmd_parse2.cpp index a70cd01..9d42fcb 100644 --- a/jsonparse/web_cmd_parse2.cpp +++ b/jsonparse/web_cmd_parse2.cpp @@ -769,6 +769,13 @@ std::string JsonData::JsonCmd_Cgi_31(Param_31 ¶m) { if (0 == param.mMode) { WriteStr2Config(ZIGBEECONFIG, "Zigbee", "channel", param.mChannelId); WriteStr2Config(ZIGBEECONFIG, "Zigbee", "PanID", param.mPanID); + char whereCon[1024] = {0}; + char updateSql[1024] = { 0 }; + sprintf(updateSql, "zigbeePanID = '%s',zigbeeChannel = '%s'",\ + param.mPanID.c_str(),param.mChannelId.c_str()); + sprintf(whereCon, "gatewayMAC='%s'", GlobalConfig::MacAddr_G.c_str()); + sqlite_db_ctrl::instance().UpdateTableData(T_GATEWAY_INFO(TNAME), updateSql, whereCon); + system("reboot"); } Json::Value jsBody; jsonVal["message"] = "设置完成";