diff --git a/Cidn-SH b/Cidn-SH new file mode 100755 index 0000000..ca205a4 Binary files /dev/null and b/Cidn-SH differ diff --git a/dbaccess/sql_db.cpp b/dbaccess/sql_db.cpp index 8677fba..3672c62 100644 --- a/dbaccess/sql_db.cpp +++ b/dbaccess/sql_db.cpp @@ -248,6 +248,8 @@ void SqliteDB::SqliteInit(const char *pDbName) { execute_sql_file("/opt/configenv/firmware_upgrade.sql"); execute_sql_file("/opt/configenv/receive_wave_status.sql"); + + execute_sql_file("/opt/configenv/reboot_record.sql"); } void SqliteDB::Createtable(const char *ptableName) { diff --git a/debug/common/common_func.o b/debug/common/common_func.o new file mode 100644 index 0000000..47b4140 Binary files /dev/null and b/debug/common/common_func.o differ diff --git a/debug/datatransfer/data_trans.o b/debug/datatransfer/data_trans.o new file mode 100644 index 0000000..54062d2 Binary files /dev/null and b/debug/datatransfer/data_trans.o differ diff --git a/debug/dbaccess/sql_db.o b/debug/dbaccess/sql_db.o new file mode 100644 index 0000000..c1a9d59 Binary files /dev/null and b/debug/dbaccess/sql_db.o differ diff --git a/debug/jsonparse/mqtt_cmd_parse.o b/debug/jsonparse/mqtt_cmd_parse.o new file mode 100644 index 0000000..d53e872 Binary files /dev/null and b/debug/jsonparse/mqtt_cmd_parse.o differ diff --git a/debug/jsonparse/web_cmd_parse.o b/debug/jsonparse/web_cmd_parse.o new file mode 100644 index 0000000..70507a5 Binary files /dev/null and b/debug/jsonparse/web_cmd_parse.o differ diff --git a/debug/jsonparse/web_cmd_parse2.o b/debug/jsonparse/web_cmd_parse2.o new file mode 100644 index 0000000..0673b0c Binary files /dev/null and b/debug/jsonparse/web_cmd_parse2.o differ diff --git a/debug/jsonparse/web_cmd_parse3.o b/debug/jsonparse/web_cmd_parse3.o new file mode 100644 index 0000000..356a364 Binary files /dev/null and b/debug/jsonparse/web_cmd_parse3.o differ diff --git a/debug/localserver/mqtt_cmd.o b/debug/localserver/mqtt_cmd.o new file mode 100644 index 0000000..ec74a46 Binary files /dev/null and b/debug/localserver/mqtt_cmd.o differ diff --git a/debug/localserver/web_cmd.o b/debug/localserver/web_cmd.o new file mode 100644 index 0000000..f9e99a6 Binary files /dev/null and b/debug/localserver/web_cmd.o differ diff --git a/debug/main.o b/debug/main.o new file mode 100644 index 0000000..a1c83a7 Binary files /dev/null and b/debug/main.o differ diff --git a/debug/minilzo/minilzo.o b/debug/minilzo/minilzo.o new file mode 100644 index 0000000..cf01395 Binary files /dev/null and b/debug/minilzo/minilzo.o differ diff --git a/debug/mqttclient/mqtt_client.o b/debug/mqttclient/mqtt_client.o new file mode 100644 index 0000000..62defb7 Binary files /dev/null and b/debug/mqttclient/mqtt_client.o differ diff --git a/debug/platform/platform_init.o b/debug/platform/platform_init.o new file mode 100644 index 0000000..09deb15 Binary files /dev/null and b/debug/platform/platform_init.o differ diff --git a/debug/scheduler/schedule.o b/debug/scheduler/schedule.o new file mode 100644 index 0000000..df148f1 Binary files /dev/null and b/debug/scheduler/schedule.o differ diff --git a/debug/scheduler/short_addr_cfg.o b/debug/scheduler/short_addr_cfg.o new file mode 100644 index 0000000..69f1e95 Binary files /dev/null and b/debug/scheduler/short_addr_cfg.o differ diff --git a/debug/scheduler/update_cfg.o b/debug/scheduler/update_cfg.o new file mode 100644 index 0000000..d3a37ee Binary files /dev/null and b/debug/scheduler/update_cfg.o differ diff --git a/debug/scheduler/upgrade_cfg.o b/debug/scheduler/upgrade_cfg.o new file mode 100644 index 0000000..4d968c9 Binary files /dev/null and b/debug/scheduler/upgrade_cfg.o differ diff --git a/debug/threadfunc/check_thread.o b/debug/threadfunc/check_thread.o new file mode 100644 index 0000000..6706bf7 Binary files /dev/null and b/debug/threadfunc/check_thread.o differ diff --git a/debug/threadfunc/thread_func.o b/debug/threadfunc/thread_func.o new file mode 100644 index 0000000..3994f2c Binary files /dev/null and b/debug/threadfunc/thread_func.o differ diff --git a/debug/uart/uart.o b/debug/uart/uart.o new file mode 100644 index 0000000..262123c Binary files /dev/null and b/debug/uart/uart.o differ diff --git a/debug/uart/uart_cmd.o b/debug/uart/uart_cmd.o new file mode 100644 index 0000000..c9ea667 Binary files /dev/null and b/debug/uart/uart_cmd.o differ diff --git a/debug/uart/uart_feature_parse.o b/debug/uart/uart_feature_parse.o new file mode 100644 index 0000000..5b4c1aa Binary files /dev/null and b/debug/uart/uart_feature_parse.o differ diff --git a/debug/uart/uart_parameter_config.o b/debug/uart/uart_parameter_config.o new file mode 100644 index 0000000..5f205a7 Binary files /dev/null and b/debug/uart/uart_parameter_config.o differ diff --git a/debug/utility/aes.o b/debug/utility/aes.o new file mode 100644 index 0000000..6bc0976 Binary files /dev/null and b/debug/utility/aes.o differ diff --git a/debug/utility/calculation.o b/debug/utility/calculation.o new file mode 100644 index 0000000..da175fa Binary files /dev/null and b/debug/utility/calculation.o differ diff --git a/debug/utility/md5.o b/debug/utility/md5.o new file mode 100644 index 0000000..d24bfaf Binary files /dev/null and b/debug/utility/md5.o differ diff --git a/debug/utility/search_dev.o b/debug/utility/search_dev.o new file mode 100644 index 0000000..a6ab926 Binary files /dev/null and b/debug/utility/search_dev.o differ diff --git a/debug/utility/secure.o b/debug/utility/secure.o new file mode 100644 index 0000000..3233366 Binary files /dev/null and b/debug/utility/secure.o differ diff --git a/debug/utility/serial.o b/debug/utility/serial.o new file mode 100644 index 0000000..5ea45a9 Binary files /dev/null and b/debug/utility/serial.o differ diff --git a/debug/utility/tcp_cgi.o b/debug/utility/tcp_cgi.o new file mode 100644 index 0000000..3f616b2 Binary files /dev/null and b/debug/utility/tcp_cgi.o differ diff --git a/debug/utility/udp_scan.o b/debug/utility/udp_scan.o new file mode 100644 index 0000000..005f3ee Binary files /dev/null and b/debug/utility/udp_scan.o differ diff --git a/debug/wifi_5g/dial.o b/debug/wifi_5g/dial.o new file mode 100644 index 0000000..198d362 Binary files /dev/null and b/debug/wifi_5g/dial.o differ diff --git a/debug/wifi_5g/wpa_client.o b/debug/wifi_5g/wpa_client.o new file mode 100644 index 0000000..c6f1312 Binary files /dev/null and b/debug/wifi_5g/wpa_client.o differ diff --git a/jsonparse/mqtt_cmd_parse.cpp b/jsonparse/mqtt_cmd_parse.cpp index 7f2c18d..820e620 100644 --- a/jsonparse/mqtt_cmd_parse.cpp +++ b/jsonparse/mqtt_cmd_parse.cpp @@ -720,9 +720,20 @@ void JsonData::DataNodeStatusCheck() { } } } - if (count == nSize && nodeOnline) { + if (count == nSize && nodeOnline && count != 0) { zlog_error(zct, "ALL Node offline,count = %d", count); - exit(0); + char whereCon[64]={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)//当天大于三次不再重启进程 + { + char insertSql[64] = {0}; + sprintf(insertSql, "'%s',%d,'%s'",localtimestamp,atoi(strCount.c_str())+1,"ALL Node offline"); + sqlite_db_ctrl::instance().InsertData(" reboot_record ", insertSql); + exit(0); + }else{ + zlog_warn(zct, "reboot now count = %d",atoi(strCount.c_str())); + } } } } diff --git a/uart/uart_feature_parse.cpp b/uart/uart_feature_parse.cpp index 2015f35..97dfe67 100644 --- a/uart/uart_feature_parse.cpp +++ b/uart/uart_feature_parse.cpp @@ -770,14 +770,16 @@ void Uart::DealWave() { wave_trans_ = false; return; } - char localtimestamp[32] = {0}; - GetTimeNet(localtimestamp, 1); - char insertSql[100] = {0x00}; - char whereCon[50] = {0x00}; - sprintf(whereCon, "MeasurementID='%s'",strMeasurementID.c_str()); - memset(whereCon, 0x00, sizeof(whereCon)); - sprintf(insertSql, "'%s','%02x%02x','%s',0,'1','%s' ", strMeasurementID.c_str(),(wave_shortAddr >> 8) & 0xFF,wave_shortAddr & 0xFF,localtimestamp,""); - sqlite_db_ctrl::instance().InsertData(" receive_wave_status ", insertSql); + if (m_waveCountX > 0 || m_waveCountY > 0 || m_waveCountZ > 0){ + char localtimestamp[32] = {0}; + GetTimeNet(localtimestamp, 1); + char insertSql[100] = {0x00}; + char whereCon[50] = {0x00}; + sprintf(whereCon, "MeasurementID='%s'",strMeasurementID.c_str()); + memset(whereCon, 0x00, sizeof(whereCon)); + sprintf(insertSql, "'%s','%02x%02x','%s',0,'1','%s' ", strMeasurementID.c_str(),(wave_shortAddr >> 8) & 0xFF,wave_shortAddr & 0xFF,localtimestamp,""); + sqlite_db_ctrl::instance().InsertData(" receive_wave_status ", insertSql); + } std::string ran = ""; int n = 0;