zhangsheng/WLG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add sensor tmp

Browse Source
This commit is contained in:
zhangsheng 2024-11-22 16:40:14 +08:00
parent dfc9b7fe13
commit 21f4b7177d
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.vscode/settings.json vendored
View File

@ -79,7 +79,9 @@
"any": "cpp", "any": "cpp",
"future": "cpp", "future": "cpp",
"typeindex": "cpp", "typeindex": "cpp",
"variant": "cpp" "variant": "cpp",
"xstring": "cpp",
"xlocinfo": "cpp"
}, },
"C_Cpp.errorSquiggles": "disabled" "C_Cpp.errorSquiggles": "disabled"
} }

17
jsonparse/mqtt_cmd_parse.cpp
View File

@ -595,6 +595,17 @@ int JsonData::JsonCmd_30(){
} else { } else {
jsSensorData["battery"] = 0.99; 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); jsArray.append(jsSensorData);
} }
} else { } else {
@ -617,7 +628,7 @@ int JsonData::JsonCmd_31(){
Json::Value jsonVal; Json::Value jsonVal;
jsonVal.clear(); jsonVal.clear();
Json::Value jsBody; Json::Value jsBody;
jsonVal[JSON_FIELD_CMD] = "31"; jsonVal["cmd"] = "31";
jsonVal["success"] = true; jsonVal["success"] = true;
jsonVal["message"] = ""; jsonVal["message"] = "";
int sensorCount = 0; int sensorCount = 0;
@ -650,7 +661,7 @@ int JsonData::JsonCmd_32(std::string MeasurementID,int status,int type,std::str
jsonVal.clear(); jsonVal.clear();
Json::Value jsBody; Json::Value jsBody;
Json::FastWriter show_value_; Json::FastWriter show_value_;
jsonVal["CMD"] = "32"; jsonVal["cmd"] = "32";
jsonVal["success"] = true; jsonVal["success"] = true;
jsonVal["message"] = ""; jsonVal["message"] = "";
jsBody["dataNodeNo"] = MeasurementID; jsBody["dataNodeNo"] = MeasurementID;
@ -726,7 +737,7 @@ std::string JsonData::JsonCmd_07() {
Json::Features f = Json::Features::strictMode(); Json::Features f = Json::Features::strictMode();
Json::Reader recvReader(f); Json::Reader recvReader(f);
Json::Value recvSys; Json::Value recvSys;
jsonVal[JSON_FIELD_CMD] = "07"; jsonVal["cmd"] = "07";
jsonVal["success"] = true; jsonVal["success"] = true;
jsonVal["message"] = " "; jsonVal["message"] = " ";
char localtimestamp[32] = {0}; char localtimestamp[32] = {0};