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

fix bugs

Browse Source
This commit is contained in:
zhangsheng 2025-01-24 20:48:37 +08:00
parent b88551f4d2
commit ddd642b0e5
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/global.hpp
View File

@ -18,7 +18,7 @@ enum enumZigBeeTransmitStatus {
//#define NR5G_MODULE //#define NR5G_MODULE
#define Q4G_MODULE //#define Q4G_MODULE
//#define WIFI_MODULE //#define WIFI_MODULE
//#define NR5G_MEIGE //#define NR5G_MEIGE

15
jsonparse/cmt_parse.cpp
View File

@ -145,7 +145,7 @@ void JsonData::CmtCmd_81(char* recv_body,int& count,char* send_data,int& send_le
sprintf(whereCon," and channelID = '%s-Z'",arrRes[j][44].c_str()); sprintf(whereCon," and channelID = '%s-Z'",arrRes[j][44].c_str());
strsql = std::string(sql) + std::string(whereCon); strsql = std::string(sql) + std::string(whereCon);
int waveZ_Count = sqlite_db_ctrl::instance().GetTableRows(szTableName,strsql.c_str()); int waveZ_Count = sqlite_db_ctrl::instance().GetTableRows(szTableName,strsql.c_str());
zlog_info(zct,"wave x = %d,wave y = %d,wave z = %d",waveZ_Count,waveY_Count,waveZ_Count);
memset(whereCon,0,sizeof(whereCon)); memset(whereCon,0,sizeof(whereCon));
memset(szTableName,0,sizeof(szTableName)); memset(szTableName,0,sizeof(szTableName));
sprintf(szTableName, " t_dataStatic_%s ",arrRes[j][44].c_str()); sprintf(szTableName, " t_dataStatic_%s ",arrRes[j][44].c_str());
@ -154,11 +154,9 @@ void JsonData::CmtCmd_81(char* recv_body,int& count,char* send_data,int& send_le
int static_Count = sqlite_db_ctrl::instance().GetTableRows(szTableName,strsql.c_str()); int static_Count = sqlite_db_ctrl::instance().GetTableRows(szTableName,strsql.c_str());
scheduler::instance().GetScheduleConfig(featureInterVal,waveInterVal,featureInterTime,waveInterTime,maxSensorNum); scheduler::instance().GetScheduleConfig(featureInterVal,waveInterVal,featureInterTime,waveInterTime,maxSensorNum);
zlog_info(zct,"wavex = %d,featureInterVal = %d,waveInterVal = %d",waveX_Count,featureInterVal,waveInterVal);
int day_count = 86400 / waveInterVal; int day_count = 86400 / waveInterVal;
sensor_info[j].wave_x_reporting_rate = float( waveX_Count/ day_count) * 100; sensor_info[j].wave_x_reporting_rate = (float( waveX_Count)/(86400/waveInterVal)) * 100;
printf("day_count = %d,wave_x_reporting_rate = %d\n",day_count,sensor_info[j].wave_x_reporting_rate );
sensor_info[j].wave_y_reporting_rate = (float(waveY_Count)/(86400/waveInterVal)) * 100; sensor_info[j].wave_y_reporting_rate = (float(waveY_Count)/(86400/waveInterVal)) * 100;
sensor_info[j].wave_z_reporting_rate = (float(waveZ_Count)/(86400/waveInterVal)) * 100; sensor_info[j].wave_z_reporting_rate = (float(waveZ_Count)/(86400/waveInterVal)) * 100;
sensor_info[j].eigen_value_reporting_rate = (float(static_Count)/(86400/featureInterVal)) * 100; sensor_info[j].eigen_value_reporting_rate = (float(static_Count)/(86400/featureInterVal)) * 100;
@ -324,6 +322,7 @@ void JsonData::CmtCmd_84(char* filename,char* file_md5,char* send_data,int& sen
std::vector<DataNodeInfo> vecDataNode; std::vector<DataNodeInfo> vecDataNode;
UploadConfigRes upload_condfig_res; UploadConfigRes upload_condfig_res;
upload_condfig_res.code = 0; upload_condfig_res.code = 0;
upload_condfig_res.version = 1;
sprintf(upload_condfig_res.message ,"%s",""); sprintf(upload_condfig_res.message ,"%s","");
send_length = sizeof(UploadConfigRes); send_length = sizeof(UploadConfigRes);
char file_path[64]={0}; char file_path[64]={0};
@ -431,6 +430,7 @@ void JsonData::CmtCmd_86(char* recv_body,int& count,char* filename,char* file_m
UpgradeSensorRes upgrade_sensor_res; UpgradeSensorRes upgrade_sensor_res;
upgrade_sensor_res.code = 0; upgrade_sensor_res.code = 0;
upgrade_sensor_res.version = 1;
sprintf(upgrade_sensor_res.message ,"%s",""); sprintf(upgrade_sensor_res.message ,"%s","");
send_length = sizeof(UpgradeSensorRes); send_length = sizeof(UpgradeSensorRes);
char cmd[128]={0}; char cmd[128]={0};
@ -517,7 +517,7 @@ void JsonData::CmtCmd_86(char* recv_body,int& count,char* filename,char* file_m
} }
sprintf(insertSql, " '%s','%s','','','','','%d.%d','%s',1,'%s'",vecResult[3].c_str(),localtimestamp,sf_ver_m,sf_ver_s,vecResult[1].c_str(),filename); sprintf(insertSql, " '%s','%s','','','','','%d.%d','%s',1,'%s'",vecResult[3].c_str(),localtimestamp,sf_ver_m,sf_ver_s,vecResult[1].c_str(),filename);
sqlite_db_ctrl::instance().InsertData(" firmware_upgrade ", insertSql); sqlite_db_ctrl::instance().InsertData(" firmware_upgrade ", insertSql);
//0 默认状态，1 升级中，2 升级成功,3 升级失败 //0 默认状态，1 升级中，2 升级成功,3 升级失败,4 停止升级
memset(wherecon,0,sizeof(wherecon)); memset(wherecon,0,sizeof(wherecon));
memset(updateSql,0,sizeof(updateSql)); memset(updateSql,0,sizeof(updateSql));
sprintf(wherecon," zigbeeShortAddr = '%s'",vecResult[3].c_str()); sprintf(wherecon," zigbeeShortAddr = '%s'",vecResult[3].c_str());
@ -595,10 +595,11 @@ void JsonData::CmtCmd_88(char* recv_body,int& count,char* send_data,int& send_l
} }
} }
sprintf(updateSql, " upgradeStatus = %d ", 4); sprintf(updateSql, " upgradeStatus = %d ", 4);
sprintf(wherecon,"short_addr IN (%s)",short_addr_); sprintf(wherecon,"zigbeeShortAddr IN (%s)",short_addr_);
sqlite_db_ctrl::instance().UpdateTableData(" firmware_upgrade ", updateSql,wherecon); sqlite_db_ctrl::instance().UpdateTableData(T_SENSOR_INFO(TNAME), updateSql,wherecon);
UpgradeStopRes upgrade_stop_res; UpgradeStopRes upgrade_stop_res;
upgrade_stop_res.code = 0; upgrade_stop_res.code = 0;
upgrade_stop_res.version = 1;
sprintf(upgrade_stop_res.message ,"%s",""); sprintf(upgrade_stop_res.message ,"%s","");
memcpy(send_data,(char*)&upgrade_stop_res,sizeof(UpgradeStopRes)); memcpy(send_data,(char*)&upgrade_stop_res,sizeof(UpgradeStopRes));
send_length = sizeof(UpgradeStopRes); send_length = sizeof(UpgradeStopRes);

5
localserver/cmt_server.hpp
View File

@ -147,6 +147,7 @@ struct UploadConfigReq{
char md5[33]; char md5[33];
}; };
struct UploadConfigRes{ struct UploadConfigRes{
int version;
int code; int code;
char message[64]; char message[64];
}; };
@ -157,6 +158,7 @@ struct UpgradeGwReq{
}; };
struct UpgradeGwRes{ struct UpgradeGwRes{
int version;
int code; int code;
char message[64]; char message[64];
}; };
@ -167,6 +169,7 @@ struct UpgradeSensorReq{
char upgrade_short_addr[0]; char upgrade_short_addr[0];
}; };
struct UpgradeSensorRes{ struct UpgradeSensorRes{
int version;
int code; int code;
char message[64]; char message[64];
}; };
@ -194,12 +197,12 @@ struct GetEigenvalueRes{
int Time; int Time;
}; };
//停止更新传感器 cmd 88 //停止更新传感器 cmd 88
struct UpgradeStopReq{ struct UpgradeStopReq{
int short_addr; int short_addr;
}; };
struct UpgradeStopRes{ struct UpgradeStopRes{
int version;
int code; int code;
char message[64]; char message[64];
}; };