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

Merge branch 'refactor' of http://192.168.0.10:3000/pandx/WLG into refactor

Browse Source
This commit is contained in:
pandx 2024-11-05 14:44:13 +08:00
commit 2a7eda0060
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dbaccess/sql_db.cpp
View File

@ -1194,7 +1194,7 @@ int SqliteDB::QueryofflineData() {
char whereCon[64] = {0};
memset(whereCon, 0, 64);
sprintf(whereCon, "dataNodeNo = '%s' and TimeStamp = '%s'", arrRetData[j][0].c_str(), arrRetData[j][8].c_str());
memcpy(updateSql, "sendMsg='1'", sizeof(updateSql));
memcpy(updateSql, "sendMsg='1'", 11);
res = sqlite_db_ctrl::instance().UpdateTableData(StaticTableName, updateSql, whereCon);
if(res !=0 ){
zlog_error(zct, "res = %d", res);

2
jsonparse/mqtt_cmd_parse.cpp
View File

@ -397,7 +397,7 @@ std::string JsonData::JsonCmd_52() {
char whereCon[512] = {};
std::string strTimeStamp = "";
char selectCon[128] = {0};
memcpy(selectCon, "sendMsg = '0'", sizeof(selectCon));
memcpy(selectCon, "sendMsg = '0'", 13);
int count = sqlite_db_ctrl::instance().GetTableRows(T_DATASTATIC_INFO(TNAME), selectCon);
if (count < 1) {
return "";

2
uart/uart.cpp
View File

@ -517,7 +517,7 @@ void Uart::DealDataNodeName(const char *pData) {
std::string strTime = GetLocalTimeWithMs();
char szShortAdd[8] = {0x00};
char shortAdd[8] = {0x00};
char NodeName[64] = {0x00};
char NodeName[128] = {0x00};
sprintf(szShortAdd, "%02x%02x", pData[3] & 0xFF, pData[4] & 0xFF);
memcpy(NodeName, &pData[7], 64);
memcpy(shortAdd, &pData[3], 2);