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

fix web dispaly bugs

Browse Source
This commit is contained in:
zhangsheng 2025-03-24 17:24:55 +08:00
parent 9922533251
commit 1b1b74168d
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/parameter_defination.hpp
View File

@ -339,10 +339,11 @@ struct Param_61 {
}; };
struct Param_62 { struct Param_62 {
std::string MeasurementID; std::string MeasurementID;
std::string straxis;
std::string timeStart; std::string timeStart;
std::string timeEnd; std::string timeEnd;
int mPackageFlag; int mPackageFlag;
Param_62() : MeasurementID(""),timeStart(""),timeEnd(""),mPackageFlag(0){}; Param_62() : MeasurementID(""),straxis(""),timeStart(""),timeEnd(""),mPackageFlag(0){};
}; };
struct Param_63 { struct Param_63 {

15
jsonparse/web_cmd_parse3.cpp
View File

@ -900,9 +900,11 @@ std::string JsonData::JsonCmd_Cgi_62(Param_62 &param){
char szTableName[100] = {0x00}, whereCon[256] = {0x00}; char szTableName[100] = {0x00}, whereCon[256] = {0x00};
sprintf(szTableName, " receive_wave_status "); sprintf(szTableName, " receive_wave_status ");
sprintf(whereCon, " data_nodeno = '%s' and timeStamp < '%s' and timeStamp > '%s' ", param.MeasurementID.c_str(), param.timeEnd.c_str(), param.timeStart.c_str()); if(param.straxis == "")
sprintf(whereCon, " data_nodeno like '%%%s%%' and timeStamp < '%s' and timeStamp > '%s' ", param.MeasurementID.c_str(), param.timeEnd.c_str(), param.timeStart.c_str());
else
sprintf(whereCon, " data_nodeno = '%s-%s' and timeStamp < '%s' and timeStamp > '%s' ", param.MeasurementID.c_str(),param.straxis.c_str(), param.timeEnd.c_str(), param.timeStart.c_str());
int rows = sqlite_db_ctrl::instance().GetTableRows(szTableName, whereCon); int rows = sqlite_db_ctrl::instance().GetTableRows(szTableName, whereCon);
int packgeNo = param.mPackageFlag; int packgeNo = param.mPackageFlag;
int packgeMax = 0; int packgeMax = 0;
@ -930,7 +932,12 @@ std::string JsonData::JsonCmd_Cgi_62(Param_62 &param){
} }
memset(whereCon, 0x00, sizeof(whereCon)); memset(whereCon, 0x00, sizeof(whereCon));
sprintf(whereCon, "data_nodeno = '%s' and timeStamp < '%s' and timeStamp > '%s' order by timeStamp asc LIMIT %d OFFSET %d", param.MeasurementID.c_str(), param.timeEnd.c_str(), param.timeStart.c_str(), 550, packgeNum); if(param.straxis == "")
{
sprintf(whereCon, "data_nodeno like '%%%s%%' and timeStamp < '%s' and timeStamp > '%s' order by timeStamp asc LIMIT %d OFFSET %d", param.MeasurementID.c_str(), param.timeEnd.c_str(), param.timeStart.c_str(), 550, packgeNum);
}else{
sprintf(whereCon, "data_nodeno = %s-%s' and timeStamp < '%s' and timeStamp > '%s' order by timeStamp asc LIMIT %d OFFSET %d", param.MeasurementID.c_str(),param.straxis.c_str(), param.timeEnd.c_str(), param.timeStart.c_str(), 550, packgeNum);
}
array_t vecRes; array_t vecRes;
vecRes = sqlite_db_ctrl::instance().GetDataMultiLine(szTableName, "*", whereCon); vecRes = sqlite_db_ctrl::instance().GetDataMultiLine(szTableName, "*", whereCon);

1
localserver/web_cmd.cpp
View File

@ -434,6 +434,7 @@ std::string LocalServer::HandleCgi_cmd(std::string &pData) {
param.mPackageFlag = recvBody["package"].asInt(); param.mPackageFlag = recvBody["package"].asInt();
param.timeStart = recvBody["timeStart"].asString(); param.timeStart = recvBody["timeStart"].asString();
param.timeEnd = recvBody["timeEnd"].asString(); param.timeEnd = recvBody["timeEnd"].asString();
param.straxis = recvBody["Raxis"].asString();
param.MeasurementID = recvBody["MeasurementID"].asString(); param.MeasurementID = recvBody["MeasurementID"].asString();
std::string data = jd.JsonCmd_Cgi_62(param); std::string data = jd.JsonCmd_Cgi_62(param);
return data; return data;