modify mqtt

This commit is contained in:
zhangsheng 2024-11-28 09:30:23 +08:00
parent 66f020f79c
commit 7832f4535f

View File

@ -235,6 +235,9 @@ std::string JsonData::JsonCmd_26(Param_26 &param) {
for (int j = 0; j < iResult; j++) { for (int j = 0; j < iResult; j++) {
Json::Value jsSensorData; Json::Value jsSensorData;
jsSensorData["dataNodeNo"] = arrRes[j][44]; jsSensorData["dataNodeNo"] = arrRes[j][44];
char NodeName[100]={0};
stringToHex(arrRes[j][1].c_str(),NodeName);
jsSensorData["dataNodeNameHex"] = NodeName;
jsSensorData["dataNodeName"] = arrRes[j][1]; jsSensorData["dataNodeName"] = arrRes[j][1];
jsSensorData["initFlag"] = atoi(arrRes[j][2].c_str()); jsSensorData["initFlag"] = atoi(arrRes[j][2].c_str());
jsSensorData["accFlag"] = atoi(arrRes[j][3].c_str()); jsSensorData["accFlag"] = atoi(arrRes[j][3].c_str());
@ -532,7 +535,9 @@ int JsonData::JsonCmd_30(){
for (int j = 0; j < iResult; j++) { for (int j = 0; j < iResult; j++) {
Json::Value jsSensorData; Json::Value jsSensorData;
jsSensorData["dataNodeNo"] = arrRes[j][44]; jsSensorData["dataNodeNo"] = arrRes[j][44];
jsSensorData["dataNodeName"] = arrRes[j][1]; char NodeName[100]={0};
stringToHex(arrRes[j][1].c_str(),NodeName);
jsSensorData["dataNodeName"] = NodeName;
jsSensorData["acc"] = atoi(arrRes[j][3].c_str()); jsSensorData["acc"] = atoi(arrRes[j][3].c_str());
jsSensorData["zigbee"] = atoi(arrRes[j][4].c_str()); jsSensorData["zigbee"] = atoi(arrRes[j][4].c_str());
jsSensorData["temTop"] = atoi(arrRes[j][5].c_str()); jsSensorData["temTop"] = atoi(arrRes[j][5].c_str());