From 5d7f92966d1d16ba7df834037ec11e7041f504cb Mon Sep 17 00:00:00 2001 From: zhangsheng Date: Mon, 9 Dec 2024 10:28:22 +0800 Subject: [PATCH] fix bugs,Version 5.1 --- common/global.hpp | 2 +- common/parameter_defination.hpp | 2 +- jsonparse/mqtt_cmd_parse.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/global.hpp b/common/global.hpp index 2ff7763..ac03d9a 100644 --- a/common/global.hpp +++ b/common/global.hpp @@ -18,7 +18,7 @@ enum enumZigBeeTransmitStatus { //#define NR5G_MODULE -#define Q4G_MODULE +//#define Q4G_MODULE //#define WIFI_MODULE //#define NR5G_MEIGE diff --git a/common/parameter_defination.hpp b/common/parameter_defination.hpp index ab70834..5e3c660 100644 --- a/common/parameter_defination.hpp +++ b/common/parameter_defination.hpp @@ -159,7 +159,7 @@ struct Param_41 { int ZigbeePower; int ZigbeeRetry; 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{""} {}; }; diff --git a/jsonparse/mqtt_cmd_parse.cpp b/jsonparse/mqtt_cmd_parse.cpp index 5a1ffe4..82e2281 100644 --- a/jsonparse/mqtt_cmd_parse.cpp +++ b/jsonparse/mqtt_cmd_parse.cpp @@ -715,7 +715,7 @@ void JsonData::DataNodeStatusCheck() { } if (count == nSize && nodeOnline && count != 0) { 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"); std::string strCount = sqlite_db_ctrl::instance().GetData(" reboot_record ", "count", whereCon); if (atoi(strCount.c_str()) < 3)//当天大于三次不再重启进程