diff --git a/.vscode/settings.json b/.vscode/settings.json index 1f0ac91..c4d1d33 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -79,7 +79,9 @@ "any": "cpp", "future": "cpp", "typeindex": "cpp", - "variant": "cpp" + "variant": "cpp", + "xstring": "cpp", + "xlocinfo": "cpp" }, "C_Cpp.errorSquiggles": "disabled" } \ No newline at end of file diff --git a/jsonparse/mqtt_cmd_parse.cpp b/jsonparse/mqtt_cmd_parse.cpp index bdcdf73..c60946b 100644 --- a/jsonparse/mqtt_cmd_parse.cpp +++ b/jsonparse/mqtt_cmd_parse.cpp @@ -595,6 +595,17 @@ int JsonData::JsonCmd_30(){ } else { jsSensorData["battery"] = 0.99; } + char whereCon[50]={0x00}; + sprintf(whereCon,"dataNodeNo = '%s'",arrRes[j][44].c_str()); + vec_t vecRes = sqlite_db_ctrl::instance().GetDataSingleLine(T_DATASTATIC_INFO(TNAME), "temTop,temBot",whereCon); + if (vecRes.size() > 0) + { + jsSensorData["temTop"] = atof(vecRes[0].c_str()); + jsSensorData["temBot"] = atof(vecRes[1].c_str()); + }else{ + jsSensorData["temTop"] = 200.0; + jsSensorData["temBot"] = 200.0; + } jsArray.append(jsSensorData); } } else { @@ -617,7 +628,7 @@ int JsonData::JsonCmd_31(){ Json::Value jsonVal; jsonVal.clear(); Json::Value jsBody; - jsonVal[JSON_FIELD_CMD] = "31"; + jsonVal["cmd"] = "31"; jsonVal["success"] = true; jsonVal["message"] = ""; int sensorCount = 0; @@ -650,7 +661,7 @@ int JsonData::JsonCmd_32(std::string MeasurementID,int status,int type,std::str jsonVal.clear(); Json::Value jsBody; Json::FastWriter show_value_; - jsonVal["CMD"] = "32"; + jsonVal["cmd"] = "32"; jsonVal["success"] = true; jsonVal["message"] = ""; jsBody["dataNodeNo"] = MeasurementID; @@ -726,7 +737,7 @@ std::string JsonData::JsonCmd_07() { Json::Features f = Json::Features::strictMode(); Json::Reader recvReader(f); Json::Value recvSys; - jsonVal[JSON_FIELD_CMD] = "07"; + jsonVal["cmd"] = "07"; jsonVal["success"] = true; jsonVal["message"] = " "; char localtimestamp[32] = {0};