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-05-10 17:57:42 +08:00
parent fb1de47b00
commit f5bc21ff9f
5 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/common_func.cpp
View File

@ -323,8 +323,8 @@ int config_uart(const char *port, int speed) {
opt.c_oflag &= ~(OPOST); opt.c_oflag &= ~(OPOST);
opt.c_cflag &= ~(CSIZE | PARENB | CBAUD); opt.c_cflag &= ~(CSIZE | PARENB | CBAUD);
opt.c_cflag |= (CS8 | speed); opt.c_cflag |= (CS8 | speed);
opt.c_cc[VMIN] = 255; opt.c_cc[VMIN] = 1;
opt.c_cc[VTIME] = 5; opt.c_cc[VTIME] = 1;
if (tcsetattr(fd, TCSANOW, &opt) < 0) { if (tcsetattr(fd, TCSANOW, &opt) < 0) {
zlog_error(zbt, "tcsetattr failed"); zlog_error(zbt, "tcsetattr failed");
return -2; return -2;

2
common/global.hpp
View File

@ -19,7 +19,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

8
common/parameter_defination.hpp
View File

@ -360,4 +360,12 @@ struct Param_64 {
std::vector<FeatureEntryUploadCfg> cfg; std::vector<FeatureEntryUploadCfg> cfg;
Param_64() : mMode(0),partial(false){}; Param_64() : mMode(0),partial(false){};
}; };
struct Param_65 {
int mMode;
int mPackageFlag;
std::string timeStart;
std::string timeEnd;
Param_65() : mMode(0),mPackageFlag(0),timeStart(""),timeEnd(""){};
};
#endif // PARAMETER_DEFINATION_HPP_ #endif // PARAMETER_DEFINATION_HPP_

6
jsonparse/web_cmd_parse2.cpp
View File

@ -238,13 +238,13 @@ std::string JsonData::JsonCmd_Cgi_27(Param_27 &param) {
sqlite_db_ctrl::instance().DeleteTableData(T_BATTERY_INFO(TNAME), whereCon); sqlite_db_ctrl::instance().DeleteTableData(T_BATTERY_INFO(TNAME), whereCon);
sqlite_db_ctrl::instance().DeleteTableData(" t_battery_history ", whereCon); sqlite_db_ctrl::instance().DeleteTableData(" t_battery_history ", whereCon);
memset(whereCon,0,sizeof(whereCon)); memset(whereCon,0,sizeof(whereCon));
sprintf(whereCon, "channelID like'%s'", param.mDataNodeNo.c_str()); sprintf(whereCon, "channelID like '%%%s%%'", param.mMeasurementID.c_str());
sqlite_db_ctrl::instance().DeleteTableData(" t_data_waveSend ", whereCon); sqlite_db_ctrl::instance().DeleteTableData(" t_data_waveSend ", whereCon);
char szTableName[50] = {0x00}; char szTableName[50] = {0x00};
sprintf(szTableName, "DROP TABLE t_data_%s", param.mDataNodeNo.c_str()); sprintf(szTableName, "DROP TABLE t_data_%s", param.mMeasurementID.c_str());
sqlite_db_ctrl::instance().CreateTable(szTableName); sqlite_db_ctrl::instance().CreateTable(szTableName);
memset(szTableName, 0x00, sizeof(szTableName)); memset(szTableName, 0x00, sizeof(szTableName));
sprintf(szTableName, "DROP TABLE t_dataStatic_%s", param.mDataNodeNo.c_str()); sprintf(szTableName, "DROP TABLE t_dataStatic_%s", param.mMeasurementID.c_str());
sqlite_db_ctrl::instance().CreateTable(szTableName); sqlite_db_ctrl::instance().CreateTable(szTableName);
uint16_t short_addr; uint16_t short_addr;
char *end_ptr = NULL; char *end_ptr = NULL;

5
uart/uart_feature_parse.cpp
View File

@ -1007,7 +1007,7 @@ void Uart::WriteDatFile(int sampleRate, std::string &strMeasurementID, int iChan
Json::FastWriter WaveValue; Json::FastWriter WaveValue;
std::string WaveData = WaveValue.write(valWaveData); std::string WaveData = WaveValue.write(valWaveData);
char selectCon[128] = {0},whereCon[128] = {0}; char selectCon[128] = {0},whereCon[1024] = {0};
sprintf(selectCon, "channelID='%s' ORDER BY timeStamp ASC LIMIT 0,1", strChannelID.c_str()); sprintf(selectCon, "channelID='%s' ORDER BY timeStamp ASC LIMIT 0,1", strChannelID.c_str());
std::string strTime = sqlite_db_ctrl::instance().GetData("t_data_waveSend", "timeStamp", selectCon); std::string strTime = sqlite_db_ctrl::instance().GetData("t_data_waveSend", "timeStamp", selectCon);
long lTime = atol(nowTimetamp.c_str()) - atol(strTime.c_str()); long lTime = atol(nowTimetamp.c_str()) - atol(strTime.c_str());
@ -1080,10 +1080,9 @@ void Uart::WriteDatFile(int sampleRate, std::string &strMeasurementID, int iChan
} else { } else {
zlog_warn(zct, "send data , filename %s,size = %d\n", strFileName.c_str(), vecData.size()); zlog_warn(zct, "send data , filename %s,size = %d\n", strFileName.c_str(), vecData.size());
} }
char whereCon[1024] = {0x00};
char updateSql[1024] = {0x00}; char updateSql[1024] = {0x00};
char tmpWhere[128] = {0x00}; char tmpWhere[128] = {0x00};
memset(whereCon, 0x00, sizeof(whereCon));
sprintf(tmpWhere, "channelID = '%s' and save = 1 ", strChannelID.c_str()); sprintf(tmpWhere, "channelID = '%s' and save = 1 ", strChannelID.c_str());
int count = sqlite_db_ctrl::instance().GetTableRows("t_data_waveSend", tmpWhere); int count = sqlite_db_ctrl::instance().GetTableRows("t_data_waveSend", tmpWhere);
zlog_info(zct, "save channlID %s dat count = %d\n", strChannelID.c_str(), count); zlog_info(zct, "save channlID %s dat count = %d\n", strChannelID.c_str(), count);