From 10d0f9596d21f537e29b3263346758b52494b6ab Mon Sep 17 00:00:00 2001
From: zhangsheng <zhangs1125@sina.com>
Date: Mon, 19 May 2025 09:43:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=95=B0=E6=8D=AE=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E5=AF=BC=E5=87=BA=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/common_func.cpp       | 5 +++--
 jsonparse/web_cmd_parse2.cpp | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/common/common_func.cpp b/common/common_func.cpp
index 9752516..4fea216 100644
--- a/common/common_func.cpp
+++ b/common/common_func.cpp
@@ -660,7 +660,7 @@ void ImportConfig(std::string filename) {
                     '%s','%s','%s','%s','%s','%s',\
                     '%s','%s','%s','%s','%s','%s','%s','%s',\
                     '%s','%s','%s','%s','%s',\
-                    '%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s'",
+                    '%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s'",
                 vecDataNode[0].c_str(), dataNodeName, vecDataNode[2].c_str(), vecDataNode[3].c_str(), 
                 vecDataNode[4].c_str(), vecDataNode[5].c_str(), vecDataNode[6].c_str(), 
                 vecDataNode[7].c_str(), vecDataNode[8].c_str(), vecDataNode[9].c_str(), vecDataNode[10].c_str(),
@@ -673,7 +673,8 @@ void ImportConfig(std::string filename) {
                 vecDataNode[31].c_str(), vecDataNode[32].c_str(), vecDataNode[33].c_str(), vecDataNode[34].c_str(), 
                 vecDataNode[35].c_str(), vecDataNode[36].c_str(), vecDataNode[37].c_str(), vecDataNode[38].c_str(), 
                 vecDataNode[39].c_str(), vecDataNode[40].c_str(),
-                vecDataNode[41].c_str(), vecDataNode[42].c_str(), vecDataNode[43].c_str(), vecDataNode[44].c_str());
+                vecDataNode[41].c_str(), vecDataNode[42].c_str(), vecDataNode[43].c_str(), vecDataNode[44].c_str(),
+                vecDataNode[45].c_str(),vecDataNode[46].c_str());
         res = sqlite_db_ctrl::instance().InsertData(T_SENSOR_INFO(TNAME), insertSql);
         if (res != 0){
             zlog_error(zbt, "res:%d", res);
diff --git a/jsonparse/web_cmd_parse2.cpp b/jsonparse/web_cmd_parse2.cpp
index 4fd7695..adce404 100644
--- a/jsonparse/web_cmd_parse2.cpp
+++ b/jsonparse/web_cmd_parse2.cpp
@@ -168,7 +168,7 @@ std::string JsonData::JsonCmd_Cgi_54(Param_54 &param) {
             nodeArray.append(arrRes[j][0]);
             stringToHex(arrRes[j][1].c_str(), hex);
             nodeArray.append(hex);
-            for (int k = 2; k <= 44; ++k) {
+            for (int k = 2; k <= 46; ++k) {
                 nodeArray.append(arrRes[j][k]);
             }            
             jsArray.append(nodeArray);