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

fix bugs,Version 5.1

Browse Source
This commit is contained in:
zhangsheng 2024-12-09 10:28:22 +08:00
parent 52016d2fb8
commit 5d7f92966d
3 changed files with 3 additions and 3 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

2
common/parameter_defination.hpp
View File

@ -159,7 +159,7 @@ struct Param_41 {
int ZigbeePower; int ZigbeePower;
int ZigbeeRetry; int ZigbeeRetry;
std::string nodeWaveSend; std::string nodeWaveSend;
Param_41() : mdataNodeName(""), mdataNodeNo(""), mMeasurementID(""),mShortAddr("") ,mfeatureInterVal(0), mwaveInterVal(0), msamplingRate(0), mrange(0), Param_41() : mdataNodeName(""), mdataNodeNo(""), mMeasurementID(""),mShortAddr("") ,mfeatureInterVal(5), mwaveInterVal(120), msamplingRate(0), mrange(0),
mAccSampleTime(0), mstartBrands(""), mstopBrands(""), menvelopeBandPass(""), mviff(0), mfaultFrequency(""), nodeWaveSend{""} {}; mAccSampleTime(0), mstartBrands(""), mstopBrands(""), menvelopeBandPass(""), mviff(0), mfaultFrequency(""), nodeWaveSend{""} {};
}; };

2
jsonparse/mqtt_cmd_parse.cpp
View File

@ -715,7 +715,7 @@ void JsonData::DataNodeStatusCheck() {
} }
if (count == nSize && nodeOnline && count != 0) { if (count == nSize && nodeOnline && count != 0) {
zlog_error(zct, "ALL Node offline,count = %d", count); zlog_error(zct, "ALL Node offline,count = %d", count);
char whereCon[64]={0}; char whereCon[100]={0};
sprintf(whereCon,"DATE(timestamp, 'unixepoch') = DATE('now') ORDER BY timeStamp DESC limit 0,1"); sprintf(whereCon,"DATE(timestamp, 'unixepoch') = DATE('now') ORDER BY timeStamp DESC limit 0,1");
std::string strCount = sqlite_db_ctrl::instance().GetData(" reboot_record ", "count", whereCon); std::string strCount = sqlite_db_ctrl::instance().GetData(" reboot_record ", "count", whereCon);
if (atoi(strCount.c_str()) < 3)//当天大于三次不再重启进程 if (atoi(strCount.c_str()) < 3)//当天大于三次不再重启进程