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

add codes

Browse Source
This commit is contained in:
zhangsheng 2025-05-21 19:21:56 +08:00
parent f7e27c5638
commit 9c32e6499e
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
jsonparse/web_cmd_parse3.cpp
View File

@ -1121,9 +1121,9 @@ std::string JsonData::JsonCmd_Cgi_65(Param_65 &param){
memset(count_sql,0,sizeof(count_sql)); memset(count_sql,0,sizeof(count_sql));
snprintf(count_sql,sizeof(count_sql), snprintf(count_sql,sizeof(count_sql),
"SELECT " "SELECT "
"COUNT(*) FILTER (WHERE channelID = '%s-X' and nodeResend = 0 AS recive_feature," "COUNT(*) FILTER (WHERE channelID = '%s-X' and nodeResend = 0 ) AS recive_feature,"
"COUNT(*) FILTER (WHERE channelID = '%s-X' and sendMsg = 1 and nodeResend = 0 ) AS send_feature " "COUNT(*) FILTER (WHERE channelID = '%s-X' and sendMsg = 1 and nodeResend = 0 ) AS send_feature, "
"COUNT(*) FILTER (WHERE channelID = '%s-X' and nodeResend <> 0) AS send_feature " "COUNT(*) FILTER (WHERE channelID = '%s-X' and nodeResend <> 0) AS resend_feature "
"FROM ( " "FROM ( "
"SELECT * FROM %s " "SELECT * FROM %s "
"WHERE timeStamp BETWEEN '%s' AND '%s');",MeasurementID.c_str(),MeasurementID.c_str(),MeasurementID.c_str(),szTableName,param.timeStart.c_str(),param.timeEnd.c_str()); "WHERE timeStamp BETWEEN '%s' AND '%s');",MeasurementID.c_str(),MeasurementID.c_str(),MeasurementID.c_str(),szTableName,param.timeStart.c_str(),param.timeEnd.c_str());
@ -1141,8 +1141,8 @@ std::string JsonData::JsonCmd_Cgi_65(Param_65 &param){
"SELECT " "SELECT "
"COUNT(*) FILTER (WHERE data_nodeno = '%s-X') AS recive_x," "COUNT(*) FILTER (WHERE data_nodeno = '%s-X') AS recive_x,"
"COUNT(*) FILTER (WHERE data_nodeno = '%s-Y') AS recive_y," "COUNT(*) FILTER (WHERE data_nodeno = '%s-Y') AS recive_y,"
"COUNT(*) FILTER (WHERE data_nodeno = '%s-Z') AS recive_z " "COUNT(*) FILTER (WHERE data_nodeno = '%s-Z') AS recive_z, "
"COUNT(*) FILTER (WHERE data_nodeno = '%s-Z' and resend is not null) AS resend_z " "COUNT(*) FILTER (WHERE data_nodeno = '%s-Z' and resend is NOT NULL and resend <> '') AS resend_z "
"FROM ( " "FROM ( "
"SELECT * FROM receive_wave_status " "SELECT * FROM receive_wave_status "
"WHERE error_code = 1 and timeStamp BETWEEN '%s' AND '%s');",MeasurementID.c_str(),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(),MeasurementID.c_str(),param.timeStart.c_str(),param.timeEnd.c_str());
@ -1195,15 +1195,14 @@ std::string JsonData::JsonCmd_Cgi_65(Param_65 &param){
iTem.append(0); iTem.append(0);
iTem.append(0); iTem.append(0);
iTem.append(0); iTem.append(0);
iTem.append(resend_feature);
iTem.append(resend_z);
std::vector<std::string> vRssi; std::vector<std::string> vRssi;
boost::split(vRssi, vetRes[i][2], boost::is_any_of(","), boost::token_compress_on); boost::split(vRssi, vetRes[i][2], boost::is_any_of(","), boost::token_compress_on);
if (vRssi.size() > 0 ){ if (vRssi.size() > 0 ){
iTem.append(atof(vRssi[0].c_str())/float(255)); iTem.append(atof(vRssi[0].c_str())/float(255));
iTem.append(atof(vRssi[1].c_str())/float(255)); iTem.append(atof(vRssi[1].c_str())/float(255));
} }
iTem.append(resend_feature);
iTem.append(resend_z);
jsBody.append(iTem); jsBody.append(iTem);
} }