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

add code

Browse Source
This commit is contained in:
zhangsheng 2025-05-12 17:29:14 +08:00
parent 83c3700694
commit daff0f7435
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
jsonparse/web_cmd_parse3.cpp
View File

@ -1093,7 +1093,7 @@ std::string JsonData::JsonCmd_Cgi_65(Param_65 &param){
jsonVal[JSON_FIELD_CMD] = "65"; jsonVal[JSON_FIELD_CMD] = "65";
jsonVal["success"] = true; jsonVal["success"] = true;
jsonVal["message"] = " "; jsonVal["message"] = " ";
array_t vetRes = sqlite_db_ctrl::instance().GetDataMultiLineTransaction(T_SENSOR_INFO(TNAME), " dataNodeName,MeasurementID ", NULL); array_t vetRes = sqlite_db_ctrl::instance().GetDataMultiLineTransaction(T_SENSOR_INFO(TNAME), " dataNodeName,MeasurementID,RSSI ", NULL);
size_t nSize = vetRes.size(); size_t nSize = vetRes.size();
std::string MeasurementID = ""; std::string MeasurementID = "";
char szTableName[100] = {0x00}, whereCon[256] = {0x00}; char szTableName[100] = {0x00}, whereCon[256] = {0x00};
@ -1142,7 +1142,7 @@ std::string JsonData::JsonCmd_Cgi_65(Param_65 &param){
"COUNT(*) FILTER (WHERE data_nodeno = '%s-Z') AS recive_z " "COUNT(*) FILTER (WHERE data_nodeno = '%s-Z') AS recive_z "
"FROM ( " "FROM ( "
"SELECT * FROM receive_wave_status " "SELECT * FROM receive_wave_status "
"WHERE timeStamp BETWEEN '%s' AND '%s');",MeasurementID.c_str(),MeasurementID.c_str(),MeasurementID.c_str(),param.timeStart.c_str(),param.timeEnd.c_str()); "WHERE error_code = 1 and timeStamp BETWEEN '%s' AND '%s');",MeasurementID.c_str(),MeasurementID.c_str(),MeasurementID.c_str(),param.timeStart.c_str(),param.timeEnd.c_str());
vec_t vecResult2 = sqlite_db_ctrl::instance().GetDataSingleLine(count_sql); vec_t vecResult2 = sqlite_db_ctrl::instance().GetDataSingleLine(count_sql);
if (vecResult2.size() > 0) if (vecResult2.size() > 0)
{ {
@ -1183,6 +1183,13 @@ std::string JsonData::JsonCmd_Cgi_65(Param_65 &param){
iTem.append((float(send_z)/(interval/waveInterVal))); iTem.append((float(send_z)/(interval/waveInterVal)));
iTem.append(send_z); iTem.append(send_z);
} }
std::vector<std::string> vRssi;
boost::split(vRssi, vetRes[i][2], boost::is_any_of(","), boost::token_compress_on);
if (vRssi.size() > 0 ){
iTem.append(vRssi[0]);
iTem.append(vRssi[1]);
}
jsBody.append(iTem); jsBody.append(iTem);
} }

4
uart/uart.cpp
View File

@ -561,7 +561,7 @@ int Uart::DealFeatureValue(const char *pData,uint16_t ushortAdd){
std::string nowTimetamp = std::string(localtimestamp); std::string nowTimetamp = std::string(localtimestamp);
long now_time = atol(nowTimetamp.c_str()); long now_time = atol(nowTimetamp.c_str());
if(ushortAdd == last_short_addr && (now_time - last_time) < 5){ if(ushortAdd == last_short_addr && (now_time - last_time) < 5){
zlog_info(zct, "DealFeatureValue short_addr_last = %02x%02x,timestamp_last = %ld,nowTime = %ld",UINT16_HIGH(ushortAdd), UINT16_LOW(ushortAdd),last_time,now_time); zlog_warn(zct, "DealFeatureValue short_addr_last = %02x%02x,timestamp_last = %ld,nowTime = %ld",UINT16_HIGH(ushortAdd), UINT16_LOW(ushortAdd),last_time,now_time);
int iRet = DealDataNodeFeature(pData, 0); int iRet = DealDataNodeFeature(pData, 0);
if (iRet != 0) if (iRet != 0)
{ {
@ -593,7 +593,7 @@ void Uart::DealRecvData(const char *pData) {
std::string nowTimetamp = std::string(localtimestamp); std::string nowTimetamp = std::string(localtimestamp);
long now_time = atol(nowTimetamp.c_str()); long now_time = atol(nowTimetamp.c_str());
if(ushortAdd == last_short_addr && (now_time - last_time) < 5){ if(ushortAdd == last_short_addr && (now_time - last_time) < 5){
zlog_warn(zct, "DealFeatureValue short_addr_last = %02x%02x,timestamp_last = %ld,nowTime = %ld",UINT16_HIGH(ushortAdd), UINT16_LOW(ushortAdd),last_time,now_time); zlog_warn(zct, "WAVE_COMPRESS | UPGRADE_ASK short_addr_last = %02x%02x,timestamp_last = %ld,nowTime = %ld",UINT16_HIGH(ushortAdd), UINT16_LOW(ushortAdd),last_time,now_time);
return ; return ;
} }
GetTimeNet(localtimestamp, 1); GetTimeNet(localtimestamp, 1);