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

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

Browse Source
This commit is contained in:
pandx 2024-12-11 11:01:54 +08:00
commit e49be76362
8 changed files with 13 additions and 15 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)//当天大于三次不再重启进程

12
jsonparse/web_cmd_parse2.cpp
View File

@ -695,15 +695,15 @@ std::string JsonData::JsonCmd_Cgi_41(std::vector<Param_41> &param, int isServer)
zlog_info(zct, "dataNodeName = %s", param[i].mdataNodeName.c_str()); zlog_info(zct, "dataNodeName = %s", param[i].mdataNodeName.c_str());
int dataNodeNameLength = param[i].mdataNodeName.length(); int dataNodeNameLength = param[i].mdataNodeName.length();
if (dataNodeNameLength != 0) { if (dataNodeNameLength != 0) {
sprintf(updateSql, "dataNodeName = '%s',ZigbeePower = '%d',ZigbeeRetry = '%d',featureInterVal='%d',waveInterVal='%d',range='%d',samplingRate='%d',AccSampleTime = '%d',\ sprintf(updateSql, "dataNodeName = '%s',ZigbeePower = '%d',ZigbeeRetry = '%d',range='%d',samplingRate='%d',AccSampleTime = '%d',\
startBrands = '%s',stopBrands = '%s',envelopeBandPass = '%s',viff = '%d',faultFrequency = '%s' ,MeasurementID = '%s' ,UpdateFlag = -1", startBrands = '%s',stopBrands = '%s',envelopeBandPass = '%s',viff = '%d',faultFrequency = '%s' ,MeasurementID = '%s' ,UpdateFlag = -1",
dataNodeName, param[i].ZigbeePower, param[i].ZigbeeRetry, param[i].mfeatureInterVal, param[i].mwaveInterVal, param[i].mrange, param[i].msamplingRate, param[i].mAccSampleTime, param[i].mstartBrands.c_str(), param[i].mstopBrands.c_str(), dataNodeName, param[i].ZigbeePower, param[i].ZigbeeRetry, param[i].mrange, param[i].msamplingRate, param[i].mAccSampleTime, param[i].mstartBrands.c_str(), param[i].mstopBrands.c_str(),
param[i].menvelopeBandPass.c_str(), param[i].mviff, param[i].mfaultFrequency.c_str(), param[i].mMeasurementID.c_str()); param[i].menvelopeBandPass.c_str(), param[i].mviff, param[i].mfaultFrequency.c_str(), param[i].mMeasurementID.c_str());
} else if (dataNodeNameLength == 0) { } else if (dataNodeNameLength == 0) {
sprintf(updateSql, "ZigbeePower = '%d',ZigbeeRetry = '%d',featureInterVal='%d',waveInterVal='%d',range='%d',samplingRate='%d',AccSampleTime = '%d',\ sprintf(updateSql, "ZigbeePower = '%d',ZigbeeRetry = '%d',range='%d',samplingRate='%d',AccSampleTime = '%d',\
startBrands = '%s',stopBrands = '%s',envelopeBandPass = '%s',viff = '%d',faultFrequency = '%s',MeasurementID = '%s',NodeWaveSend = '%s',UpdateFlag = 0", startBrands = '%s',stopBrands = '%s',envelopeBandPass = '%s',viff = '%d',faultFrequency = '%s',MeasurementID = '%s',UpdateFlag = 0",
param[i].ZigbeePower, param[i].ZigbeeRetry, param[i].mfeatureInterVal, param[i].mwaveInterVal, param[i].mrange, param[i].msamplingRate, param[i].mAccSampleTime, param[i].mstartBrands.c_str(), param[i].mstopBrands.c_str(), param[i].menvelopeBandPass.c_str(), param[i].ZigbeePower, param[i].ZigbeeRetry, param[i].mrange, param[i].msamplingRate, param[i].mAccSampleTime, param[i].mstartBrands.c_str(), param[i].mstopBrands.c_str(), param[i].menvelopeBandPass.c_str(),
param[i].mviff, param[i].mfaultFrequency.c_str(), param[i].mMeasurementID.c_str(), param[i].nodeWaveSend.c_str()); param[i].mviff, param[i].mfaultFrequency.c_str(), param[i].mMeasurementID.c_str());
} }
int iRet = sqlite_db_ctrl::instance().UpdateTableData(T_SENSOR_INFO(TNAME), updateSql, whereCon); int iRet = sqlite_db_ctrl::instance().UpdateTableData(T_SENSOR_INFO(TNAME), updateSql, whereCon);
memset(whereCon, 0x00, sizeof(whereCon)); memset(whereCon, 0x00, sizeof(whereCon));

2
localserver/web_cmd.cpp
View File

@ -243,8 +243,6 @@ std::string LocalServer::HandleCgi_cmd(std::string &pData) {
std::vector<Param_41> param41; std::vector<Param_41> param41;
for (size_t i = 0; i < recvBody.size(); i++) { for (size_t i = 0; i < recvBody.size(); i++) {
param.mdataNodeNo = recvBody[i]["dataNodeNo"].asString(); param.mdataNodeNo = recvBody[i]["dataNodeNo"].asString();
param.mfeatureInterVal = recvBody[i]["featureInterVal"].asInt();
param.mwaveInterVal = recvBody[i]["waveInterVal"].asInt();
param.msamplingRate = recvBody[i]["samplingRate"].asInt(); param.msamplingRate = recvBody[i]["samplingRate"].asInt();
param.mrange = recvBody[i]["range"].asInt(); param.mrange = recvBody[i]["range"].asInt();
param.mAccSampleTime = recvBody[i]["ACCSampleTime"].asInt(); param.mAccSampleTime = recvBody[i]["ACCSampleTime"].asInt();

2
main.cpp
View File

@ -96,7 +96,7 @@ int main(int argc, char *argv[]) {
#ifdef Q4G_MODULE #ifdef Q4G_MODULE
boost::thread startCSQ(GetCSQ); boost::thread startCSQ(GetCSQ);
startCSQ.detach(); startCSQ.detach();
print_info("4G_MODULE \n"); zlog_info(zbt, "4G_MODULE");
#endif #endif
#ifdef WIFI_MODULE #ifdef WIFI_MODULE

4
threadfunc/thread_func.cpp
View File

@ -126,7 +126,7 @@ open4G:
if (ret <= 0) { if (ret <= 0) {
timeoutflag++; timeoutflag++;
if (timeoutflag > 5) { if (timeoutflag > 5) {
zlog_info("timeoutflag = %d\n", timeoutflag); zlog_info(zbt,"timeoutflag = %d\n", timeoutflag);
timeoutflag = 0; timeoutflag = 0;
const char *str2 = "+QENG: "; const char *str2 = "+QENG: ";
char csq[128] = {0}; char csq[128] = {0};
@ -135,7 +135,7 @@ open4G:
strncpy(csq, pdata + 7, sizeof(csq)); strncpy(csq, pdata + 7, sizeof(csq));
GlobalConfig::NetStatus = GetOneContent(csq, 1, ","); GlobalConfig::NetStatus = GetOneContent(csq, 1, ",");
string signal = GetOneContent(csq, 13, ","); std::string signal = GetOneContent(csq, 13, ",");
GlobalConfig::NetSignal = atoi(signal.c_str()); GlobalConfig::NetSignal = atoi(signal.c_str());
GlobalConfig::NetType = GetOneContent(csq, 2, ","); GlobalConfig::NetType = GetOneContent(csq, 2, ",");
zlog_info(zct, "NetStatus = %s,NetSignal = %d", GlobalConfig::NetStatus.c_str(), GlobalConfig::NetSignal); zlog_info(zct, "NetStatus = %s,NetSignal = %d", GlobalConfig::NetStatus.c_str(), GlobalConfig::NetSignal);

2
uart/uart_parameter_config.cpp
View File

@ -49,7 +49,7 @@ void Uart::UpdateWirelessNode(uint16_t shortAdd) {
char localtimestamp[32] = {0}; char localtimestamp[32] = {0};
GetTimeNet(localtimestamp, 1); GetTimeNet(localtimestamp, 1);
char insertSql[100] = {0}; char insertSql[100] = {0};
char wherecon[64] = {0}; char wherecon[100] = {0};
sprintf(wherecon," short_Addr = '%02x%02x' and status = 3 order by start_timestamp DESC",UINT16_HIGH(shortAdd), UINT16_LOW(shortAdd)); sprintf(wherecon," short_Addr = '%02x%02x' and status = 3 order by start_timestamp DESC",UINT16_HIGH(shortAdd), UINT16_LOW(shortAdd));
std::string spend_count = sqlite_db_ctrl::instance().GetData(" firmware_upgrade ","spend_count",wherecon); std::string spend_count = sqlite_db_ctrl::instance().GetData(" firmware_upgrade ","spend_count",wherecon);
if (atoi(spend_count.c_str()) >= 10){ if (atoi(spend_count.c_str()) >= 10){