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

modify log info.

Browse Source
This commit is contained in:
zhangsheng 2024-10-25 18:45:26 +08:00
parent f6829a5e71
commit 66c4c6990f
10 changed files with 157 additions and 265 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

151
common/common_func.cpp
View File

@ -100,96 +100,28 @@ int code_convert(const char *from_charset, const char *to_charset, char *inbuf,
if ((int)iconv(cd, pin, &inlen, pout, &outlen) == -1) {
zlog_error(zct, "iconv failed");
iconv_close(cd);
return -1;
return -2;
}
iconv_close(cd);
*pout = '\0';
return 0;
}
int u2g(char *inbuf, size_t inlen, char *outbuf, size_t outlen) { return code_convert("utf-8", "gb2312", inbuf, inlen, outbuf, outlen); }
int g2u(char *inbuf, size_t inlen, char *outbuf, size_t outlen) { return code_convert("gb2312", "utf-8", inbuf, inlen, outbuf, outlen); }
std::string GBKToUTF8(const std::string &strGBK) {
int length = strGBK.size() * 2 + 1;
char *temp = (char *)malloc(sizeof(char) * length);
if (temp == NULL) {
zlog_error(zct, "fail to malloc size:%d", length);
return "";
}
if (g2u((char *)strGBK.c_str(), strGBK.size(), temp, length) >= 0) {
std::string str_result;
str_result.append(temp);
free(temp);
return str_result;
} else {
free(temp);
return "";
}
}
std::string UTFtoGBK(const char *utf8) {
int length = strlen(utf8);
char *temp = (char *)malloc(sizeof(char) * length);
if (temp == NULL) {
zlog_error(zct, "fail to malloc size:%d", length);
return "";
}
if (u2g((char *)utf8, length, temp, length) >= 0) {
std::string str_result;
str_result.append(temp);
free(temp);
return str_result;
} else {
free(temp);
return "";
}
}
std::string convertEncoding(const std::string &input, const char *fromEncoding, const char *toEncoding) {
iconv_t conv = iconv_open(toEncoding, fromEncoding);
if (conv == (iconv_t)-1) {
zlog_error(zct, "iconv_open failed");
return "";
}
size_t inBytesLeft = input.size();
size_t outBytesLeft = inBytesLeft * 2; // GBK may require up to twice the space of UTF-8
char *inBuf = const_cast<char *>(input.c_str());
char *outBuf = new char[outBytesLeft];
char *outPtr = outBuf;
if (iconv(conv, &inBuf, &inBytesLeft, &outPtr, &outBytesLeft) == (size_t)-1) {
delete[] outBuf;
iconv_close(conv);
zlog_error(zct, "iconv failed");
return "";
}
std::string result(outBuf, outPtr);
delete[] outBuf;
iconv_close(conv);
return result;
}
void InitGpio(unsigned int gpioN, unsigned int inout) {
int InitGpio(unsigned int gpioN, unsigned int inout) {
int fd = 0;
char tmp[100] = {0};
//闂備胶鎳撻悘姘跺箰閸濄儲顫曢柟杈╁€峣o闂佽崵濮抽悞锕傚磿閹跺壙鍥敆閸曨偅顥濋梺鎼炲劵闂勫嫰顢曢敓锟<E69593>
fd = open("/sys/class/gpio/export", O_WRONLY);
if (-1 == fd) {
zlog_error(zbt, "open gpio export file error");
return;
return 1;
}
//闂備焦鐪归崹褰掓偪閸ヮ剦鏁嬮柣鐐垫７io
sprintf(tmp, "%d", gpioN);
if (write(fd, tmp, strlen(tmp)) < 0) {
zlog_error(zbt, "write file operation error:%s", tmp);
close(fd);
return;
return 2;
}
close(fd);
@ -239,7 +171,7 @@ void InitGpio(unsigned int gpioN, unsigned int inout) {
if (-1 == fd) {
zlog_error(zbt, "open gpio direction file error");
close(fd);
return;
return 3;
}
if (inout == 0) {
@ -247,17 +179,18 @@ void InitGpio(unsigned int gpioN, unsigned int inout) {
if (-1 == write(fd, "in", sizeof("in"))) {
zlog_error(zbt, "[%d]write operation direction error", gpioN);
close(fd);
return;
return 4;
}
} else if (inout == 1) {
zlog_info(zbt, "=====InitGpio=====out");
if (-1 == write(fd, "out", sizeof("out"))) {
zlog_error(zbt, "[%d]write operation direction error", gpioN);
close(fd);
return;
return 5;
}
}
close(fd);
return 0;
}
int gpio_set(unsigned int gpioN, char x) {
@ -314,13 +247,13 @@ int gpio_set(unsigned int gpioN, char x) {
if (-1 == write(fd, "1", sizeof("1"))) {
zlog_error(zbt, "%d write operation value error", gpioN);
close(fd);
return (-1);
return (-2);
}
} else {
if (-1 == write(fd, "0", sizeof("0"))) {
zlog_error(zbt, "%d write operation value errorn", gpioN);
close(fd);
return (-1);
return (-3);
}
}
zlog_info(zbt, "gpio%d set %d ok", gpioN, x);
@ -381,7 +314,7 @@ int gpio_read(unsigned int gpioN) {
if (-1 == read(fd, &value, sizeof(value))) {
zlog_error(zbt, "%d read gpiovalue is fail", gpioN);
close(fd);
return (-1);
return (-2);
}
close(fd);
zlog_info(zbt, "gpio%d get %d", gpioN, value);
@ -411,7 +344,7 @@ int config_uart(const char *port, int speed) {
opt.c_cc[VTIME] = 5;
if (tcsetattr(iFd, TCSANOW, &opt) < 0) {
zlog_error(zbt, "tcsetattr failed");
return -1;
return -2;
}
tcflush(iFd, TCIOFLUSH);
return iFd;
@ -494,11 +427,9 @@ tm *get_current_date() {
int iyear = 0;
int imonth = 0;
int day = 0;
// int hour = 0;
iyear = tm_info->tm_year + 1900;
imonth = tm_info->tm_mon + 1;
day = tm_info->tm_mday;
// hour = tm_info->tm_hour;
zlog_info(zct, "year = %d,month = %d,day = %d", iyear, imonth, day);
return tm_info;
}
@ -663,7 +594,6 @@ void ReadStrConfig(std::string filename) {
for (size_t i = 0; i < dataNode.size(); i++) {
std::string softVersion = dataNode[i]["softVersion"].asString();
std::string bpNo = dataNode[i]["bpNo"].asString();
zlog_info(zbt, "bpNo = %s", bpNo.c_str());
std::string wakeupTime = dataNode[i]["wakeupTime"].asString();
int viff = dataNode[i]["viff"].asInt();
std::string StaticTime = dataNode[i]["StaticTime"].asString();
@ -672,7 +602,6 @@ void ReadStrConfig(std::string filename) {
int updateValue = dataNode[i]["update"].asInt();
std::string zigbeeLongAddr = dataNode[i]["zigbeeLongAddr"].asString();
int accFlag = dataNode[i]["accFlag"].asInt();
zlog_info(zbt, "accFlag = %d", accFlag);
int temTopFlag = dataNode[i]["temTopFlag"].asInt();
std::string startBrands = dataNode[i]["startBrands"].asString();
int waveInterVal = dataNode[i]["waveInterVal"].asInt();
@ -684,7 +613,6 @@ void ReadStrConfig(std::string filename) {
int featureInterVal = dataNode[i]["featureInterVal"].asInt();
int zigbeeFlag = dataNode[i]["zigbeeFlag"].asInt();
std::string zigbeeDesAddr = dataNode[i]["zigbeeDesAddr"].asString();
zlog_info(zbt, "zigbeeDesAddr = %s", zigbeeDesAddr.c_str());
int ZigbeeRetryGap = dataNode[i]["zigbeeRetryGap"].asInt();
std::string dataNodeNo = dataNode[i]["dataNodeNo"].asString();
int initFlag = dataNode[i]["initFlag"].asInt();
@ -692,7 +620,6 @@ void ReadStrConfig(std::string filename) {
int temBotFlag = dataNode[i]["temBotFlag"].asInt();
std::string bateryV = dataNode[i]["bateryV"].asString();
int ACCSampleTime = dataNode[i]["ACCSampleTime"].asInt();
zlog_info(zbt, "ACCSampleTime = %d", ACCSampleTime);
std::string firstPowerTime = dataNode[i]["firstPowerTime"].asString();
std::string serialNo = dataNode[i]["serialNo"].asString();
std::string zigbeeAddr = dataNode[i]["zigbeeAddr"].asString();
@ -700,7 +627,6 @@ void ReadStrConfig(std::string filename) {
std::string timeStamp = dataNode[i]["timeStamp"].asString();
zigbeeChannel = dataNode[i]["zigbeeChannel"].asString();
int RSSI = dataNode[i]["RSSI"].asInt();
zlog_info(zbt, "RSSI = %d", RSSI);
std::string hardVersion = dataNode[i]["hardVersion"].asString();
std::string envelopeBandPass = dataNode[i]["envelopeBandPass"].asString();
int samplingRate = dataNode[i]["samplingRate"].asInt();
@ -721,7 +647,12 @@ void ReadStrConfig(std::string filename) {
dataNodeNo.c_str(), dataNodeName.c_str(), initFlag, accFlag, zigbeeFlag, temTopFlag, temBotFlag, EquipSta, hardVersion.c_str(), softVersion.c_str(), bpNo.c_str(), serialNo.c_str(), firstPowerTime.c_str(), atoi(wakeupTime.c_str()), atoi(StaticTime.c_str()),
waveTime, atoi(bateryV.c_str()), productNo.c_str(), configFlag, startBrands.c_str(), stopBrands.c_str(), featureInterVal, waveInterVal, samplingRate, "", rangeValue, envelopeBandPass.c_str(), faultFrequency.c_str(), zigbeePanId.c_str(),
atoi(zigbeeChannel.c_str()), zigbeeAddr.c_str(), zigbeeLongAddr.c_str(), zigbeeDesAddr.c_str(), zigbeePower, zigbeeRetry, ZigbeeRetryGap, ACCSampleTime, status, timeStamp.c_str(), viff, RSSI, updateValue);
sqlite_db_ctrl::instance().InsertData(T_SENSOR_INFO(TNAME), insertSql);
int res = sqlite_db_ctrl::instance().InsertData(T_SENSOR_INFO(TNAME), insertSql);
if (res != 0)
{
zlog_error(zbt, "res:%d", res);
}
}
is.close();
@ -731,6 +662,7 @@ void ImportConfig(std::string filename) {
Json::Value root, gateWay, dataNode;
std::fstream is;
Json::Reader reader;
int res = 0;
is.open(filename.c_str(), std::ios::in);
if (!is.is_open()) {
zlog_error(zbt, "fail to open:%s", filename.c_str());
@ -779,7 +711,10 @@ void ImportConfig(std::string filename) {
vecDataNode[35].c_str(), vecDataNode[36].c_str(), vecDataNode[37].c_str(), vecDataNode[38].c_str(),
vecDataNode[39].c_str(), vecDataNode[40].c_str(),
vecDataNode[41].c_str(), vecDataNode[42].c_str(), vecDataNode[43].c_str(), vecDataNode[44].c_str());
sqlite_db_ctrl::instance().InsertData(T_SENSOR_INFO(TNAME), insertSql);
res = sqlite_db_ctrl::instance().InsertData(T_SENSOR_INFO(TNAME), insertSql);
if (res != 0){
zlog_error(zbt, "res:%d", res);
}
}
WriteStr2Config(SERVERCONFIG, "Server", "localServerIpAddress", jsSystemSetting["ServerIpAddress"].asString());
@ -1020,24 +955,6 @@ std::string IpAddrInit() {
return strip;
}
// std::string GetWorkNic() {
// const char *WLAN0 = "wlan0";
// const char *ETH0 = "eth0";
// std::string strip;
// strip = GetGwIp_(WLAN0);
// if (strip.compare("0.0.0.0") != 0) {
// zlog_info(zbt, "[GetWorkNic] wlan0: %s", strip.c_str());
// return std::string(WLAN0);
// }
// strip = GetGwIp_(ETH0);
// if (strip.compare("0.0.0.0") != 0) {
// zlog_info(zbt, "[GetWorkNic] eth0: %s", strip.c_str());
// return std::string(ETH0);
// }
// zlog_error(zbt, "[GetWorkNic] no ip return str eth0");
// return std::string(ETH0);
// }
std::string &ClearAllSpace(std::string &str) {
size_t index = 0;
if (!str.empty()) {
@ -1254,13 +1171,10 @@ std::string GetSysStatus() {
mem_used = mem_total - mem_free;
float fMemRate = 1.0 * mem_used / mem_total;
// float fCpuRate;
char name[8];
// double cpu_idle = -1;
double cpu_sys = -1;
double cpu_user = -1;
double cpu_total = -1;
// double cpu_wait = -1;
long int user, nice, sys, idle, iowait, irq, softirq;
std::string strCpu1 = GetFileContent("/proc/stat", 1);
sscanf(strCpu1.c_str(), "%s%ld%ld%ld%ld%ld%ld%ld", name, &user, &nice, &sys, &idle, &iowait, &irq, &softirq);
@ -1271,9 +1185,6 @@ std::string GetSysStatus() {
cpu_total = (userNext + niceNext + sysNext + idleNext + iowaitNext + irqNext + softirqNext) - (user + nice + sys + idle + iowait + irq + softirq);
cpu_user = userNext - user;
cpu_sys = sysNext - sys;
// cpu_wait = iowaitNext - iowait;
// cpu_idle = idleNext - idle;
// fCpuRate = 1.0 * (cpu_total - cpu_idle) / cpu_total;
float rateUser = cpu_user * 100.0 / cpu_total;
float rateSys = cpu_sys * 100.0 / cpu_total;
if (rateUser > 95) {
@ -1390,15 +1301,6 @@ unsigned char ch2hex(char ch) {
return 0;
}
std::string tohex(const std::string &str) {
std::string ret;
static const char *hex = "0123456789ABCDEF";
for (size_t i = 0; i != str.size(); ++i) {
ret.push_back(hex[(str[i] >> 4) & 0xf]);
ret.push_back(hex[str[i] & 0xf]);
}
return ret;
}
char *solve(char *dest, const char *src) {
int i = 0;
@ -1671,15 +1573,11 @@ void IniReadValue(const char *section, const char *key, char *val, const char *f
}
int readStringValue(const char *section, const char *key, char *val, const char *file) {
// char sect[SECTION_MAX_LEN];
zlog_info(zct, "section = %s, key = %s, file = %s", section, key, file);
if (section == NULL || key == NULL || val == NULL || file == NULL) {
zlog_error(zct, "input parameter, section:%s, key:%s, val:%s, file:%s exist NULL", section, key, val, file);
return -1;
}
// memset(sect, 0, SECTION_MAX_LEN);
// sprintf(sect, "[%s]", section);
IniReadValue(section, key, val, file);
return 0;
}
@ -1695,9 +1593,6 @@ int readIntValue(const char *section, const char *key, const char *file) {
void IniWriteValue(const char *section, const char *key, char *val, const char *file) {
FILE *fp;
// int i = 0, n = 0, err = 0;
// int lineContentLen = 0;
// int position = 0;
char lineContent[LINE_CONTENT_MAX_LEN];
char strWrite[LINE_CONTENT_MAX_LEN];
bool bFoundSection = false;

4
common/common_func.hpp
View File

@ -317,12 +317,10 @@ struct ethtool_value {
unsigned int data;
};
std::string GBKToUTF8(const std::string& strGBK);
std::string UTFtoGBK(const char* utf8);
void hexToAscii(const char* hexStr, char* asciiStr);
void stringToHex(const char* str, char* hexStr);
std::string GetLocalTimeWithMs(void);
void InitGpio(unsigned int gpioN, unsigned int inout);
int InitGpio(unsigned int gpioN, unsigned int inout);
int gpio_set(unsigned int gpioN, char x);
int gpio_read(unsigned int gpioN);
int config_uart(const char* Port, int speed);

115
dbaccess/sql_db.cpp
View File

@ -716,9 +716,10 @@ int SqliteDB::CalculateBattery() {
memset(whereCon, 0x00, sizeof(whereCon));
memset(selectSql, 0x00, sizeof(selectSql));
char updateSql[1024] = {0};
int res = 0;
sprintf(selectSql, " dataNodeNo,StaticTime,WaveTime,featureInterVal,waveInterVal,samplingRate,batteryPower ");
array_t vecRes = GetDataMultiLine(T_SENSOR_INFO(TNAME), selectSql, NULL);
zlog_info(zct, "res = %d", vecRes.size());
zlog_info(zct, "Size = %d", vecRes.size());
if (vecRes.size() > 0) {
for (size_t i = 0; i < vecRes.size(); i++) {
float capacity = 0.0, startCapacity = 0.0;
@ -740,7 +741,11 @@ int SqliteDB::CalculateBattery() {
sprintf(updateSql, "batteryPower = '%f,%f' ", startCapacity, startCapacity);
UpdateTableData(T_SENSOR_INFO(TNAME), updateSql, whereCon);
res = UpdateTableData(T_SENSOR_INFO(TNAME), updateSql, whereCon);
if(res !=0 ){
zlog_error(zct, "res = %d", res);
break;
}
memset(whereCon, 0x00, sizeof(whereCon));
sprintf(whereCon, " dataNodeNo = '%s' order by timeStamp asc limit 0,1 ", vecRes[i][0].c_str());
vecResSig = sqlite_db_ctrl::instance().GetDataSingleLine(T_BATTERY_INFO(TNAME), " * ", whereCon);
@ -809,23 +814,32 @@ int SqliteDB::CalculateBattery() {
zlog_info(zct, "dataNodeNo = %s,batteryUsage = %f,batteryRemain = %f", vecRes[i][0].c_str(), atof(vecResSig[6].c_str()), remainBattery);
memset(whereCon, 0x00, sizeof(whereCon));
sprintf(whereCon, " dataNodeNo = '%s' order by timeStamp desc limit 0,1 ", vecRes[i][0].c_str());
std::string strtimeStamp = sqlite_db_ctrl::instance().GetData(T_BATTERY_INFO(TNAME), " timeStamp ", whereCon);
std::string strtimeStamp = GetData(T_BATTERY_INFO(TNAME), " timeStamp ", whereCon);
sprintf(updateSql, "batteryUsage='%f',batteryRemain='%f'", usageBattery, remainBattery);
memset(whereCon, 0x00, sizeof(whereCon));
sprintf(whereCon, "dataNodeNo ='%s' and timeStamp = '%s'", vecRes[i][0].c_str(), strtimeStamp.c_str());
sqlite_db_ctrl::instance().UpdateTableData(T_BATTERY_INFO(TNAME), updateSql, whereCon);
res = UpdateTableData(T_BATTERY_INFO(TNAME), updateSql, whereCon);
if(res !=0 ){
zlog_error(zct, "res = %d", res);
break;
}
memset(whereCon, 0x00, sizeof(whereCon));
memset(updateSql, 0x00, sizeof(updateSql));
char insertSql[1024] = {0x00}, deleteSql[1024] = {0x00};
sprintf(insertSql, "insert into t_battery_history select * from t_battery_info where timeStamp < '%s' and dataNodeNo = '%s'", strtimeStamp.c_str(), vecRes[i][0].c_str());
ExeSql(insertSql);
res = ExeSql(insertSql);
if(res !=0 ){
zlog_error(zct, "res = %d", res);
break;
}
sprintf(deleteSql, "delete from t_battery_info where timeStamp < '%s' and dataNodeNo = '%s'", strtimeStamp.c_str(), vecRes[i][0].c_str());
ExeSql(deleteSql);
res = ExeSql(deleteSql);
if(res !=0 ){
zlog_error(zct, "res = %d", res);
break;
}
sprintf(whereCon, "dataNodeNo = '%s' ", vecRes[i][0].c_str());
if (startCapacity > 0) {
sprintf(updateSql, "batteryPower = '%f,%f' ", startCapacity, remainBattery);
@ -835,11 +849,15 @@ int SqliteDB::CalculateBattery() {
UpdateTableData(T_SENSOR_INFO(TNAME), updateSql, whereCon);
std::string strData = sqlite_db_ctrl::instance().GetNodeConfigureInfor(whereCon);
data_publish(strData.c_str(), GlobalConfig::Topic_G.mPubConfig.c_str());
res = data_publish(strData.c_str(), GlobalConfig::Topic_G.mPubConfig.c_str());
if(res !=0 ){
zlog_error(zct, "data_publish res = %d", res);
break;
}
}
}
zlog_info(zct, "CalculateBattery end");
return 0;
return res;
}
int SqliteDB::CalculateDip() {
@ -853,6 +871,7 @@ int SqliteDB::CalculateDip() {
char looseValue[10] = {0x00};
char localtimestamp[32] = {0};
GetTimeNet(localtimestamp, 1);
int res = 0;
readStringValue("config", "loose", looseValue, (char *)GlobalConfig::Config_G.c_str());
vecRes = GetDataMultiLine(T_SENSOR_INFO(TNAME), " * ", NULL);
zlog_info(zct, "vecRes111 = %d", vecRes.size());
@ -864,7 +883,11 @@ int SqliteDB::CalculateDip() {
if (vParam.size() < 2) {
sprintf(updateSql, "LooseValue = '%f,0' ", atof(vParam[0].c_str()));
sprintf(whereCon, "dataNodeNo = '%s' ", vecRes[i][0].c_str());
UpdateTableData(T_SENSOR_INFO(TNAME), updateSql, whereCon);
res = UpdateTableData(T_SENSOR_INFO(TNAME), updateSql, whereCon);
if(res !=0 ){
zlog_error(zct, "res = %d", res);
break;
}
} else {
char szTablename[32] = {0x00};
memset(whereCon, 0x00, sizeof(whereCon));
@ -907,10 +930,14 @@ int SqliteDB::CalculateDip() {
}
}
UpdateTableData(T_SENSOR_INFO(TNAME), updateSql, whereCon);
res = UpdateTableData(T_SENSOR_INFO(TNAME), updateSql, whereCon);
if(res !=0 ){
zlog_error(zct, "res = %d", res);
break;
}
}
zlog_info(zct, "CalculateDip");
return 0;
return res;
}
int SqliteDB::InintGateway() {
@ -923,6 +950,7 @@ int SqliteDB::InintGateway() {
std::string strGatewayVersion = ReadStrByOpt(SYSTEMINFOFILE, "Version", "GateWayVersion");
std::string strchan = ReadStrByOpt(ZIGBEECONFIG, "Zigbee", "channel");
std::string strPanID = ReadStrByOpt(ZIGBEECONFIG, "Zigbee", "PanID");
int res = 0;
if (strPanID == "") {
strPanID = GlobalConfig::MacAddr_G.substr(8);
}
@ -932,7 +960,10 @@ int SqliteDB::InintGateway() {
localIP,systemVersion,programVersion,webVersion,serverIP,serverPort,MAC2)\
values('%s','%s','%s','%s','%s','%s','%s','%s','%s','%s');",
GlobalConfig::MacAddr_G.c_str(), strPanID.c_str(), strchan.c_str(), strIP.c_str(), strsystemVersion.c_str(), strGatewayVersion.c_str(), strwebVersion.c_str(), strServerIP.c_str(), strServerPort.c_str(), GlobalConfig::MacAddr_G2.c_str());
sqlite_db_ctrl::instance().InsertData(strSql);
res = sqlite_db_ctrl::instance().InsertData(strSql);
if(res !=0 ){
zlog_error(zct, "res = %d", res);
}
zlog_info(zct, "strSql = %s", strSql);
} else {
char whereCon[1024] = {0};
@ -940,7 +971,10 @@ int SqliteDB::InintGateway() {
sprintf(updateSql, "zigbeePanID = '%s',zigbeeChannel = '%s',localIP = '%s',systemVersion='%s',programVersion='%s',webVersion='%s',serverIP='%s',serverPort='%s'", strPanID.c_str(), strchan.c_str(), strIP.c_str(), strsystemVersion.c_str(), strGatewayVersion.c_str(),
strwebVersion.c_str(), strServerIP.c_str(), strServerPort.c_str());
sprintf(whereCon, "gatewayMAC='%s'", GlobalConfig::MacAddr_G.c_str());
sqlite_db_ctrl::instance().UpdateTableData(T_GATEWAY_INFO(TNAME), updateSql, whereCon);
res = sqlite_db_ctrl::instance().UpdateTableData(T_GATEWAY_INFO(TNAME), updateSql, whereCon);
if(res !=0 ){
zlog_error(zct, "res = %d", res);
}
}
//上传网关配置到MQTT
@ -962,8 +996,10 @@ int SqliteDB::InintGateway() {
jsBody["UserName"] = (ReadStrByOpt(SERVERCONFIG, "Server", "UserName"));
std::string dataBody = showValue.write(jsBody);
jsonVal["cmdBody"] = dataBody;
data_publish(showValue.write(jsonVal).c_str(), GlobalConfig::Topic_G.mPubConfig.c_str());
res = data_publish(showValue.write(jsonVal).c_str(), GlobalConfig::Topic_G.mPubConfig.c_str());
if(res !=0 ){
zlog_error(zct, "data_publish res = %d", res);
}
jsBody.clear();
jsonVal["cmd"] = "25";
jsBody["dnsName"] = ReadStrByOpt(NETWORKCONFIG, "Net", "dnsName");
@ -975,8 +1011,11 @@ int SqliteDB::InintGateway() {
dataBody = showValue.write(jsBody);
jsonVal["cmdBody"] = dataBody;
data_publish(showValue.write(jsonVal).c_str(), GlobalConfig::Topic_G.mPubConfig.c_str());
return 0;
res = data_publish(showValue.write(jsonVal).c_str(), GlobalConfig::Topic_G.mPubConfig.c_str());
if(res !=0 ){
zlog_error(zct, "data_publish res = %d", res);
}
return res;
}
std::string SqliteDB::GetNodeConfigureInfor(const char *whereCon) {
@ -1056,6 +1095,7 @@ std::string SqliteDB::GetNodeConfigureInfor(const char *whereCon) {
}
int SqliteDB::QueryofflineData() {
int res = 0;
array_t arrRetdataNode = GetDataMultiLine(T_SENSOR_INFO(TNAME), " dataNodeNo,MeasurementID ", NULL);
for (size_t i = 0; i < arrRetdataNode.size(); i++) {
char StaticTableName[50] = {0x00};
@ -1124,8 +1164,16 @@ int SqliteDB::QueryofflineData() {
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));
sqlite_db_ctrl::instance().UpdateTableData(StaticTableName, updateSql, whereCon);
sqlite_db_ctrl::instance().UpdateTableData(dataTableName, updateSql, whereCon);
res = sqlite_db_ctrl::instance().UpdateTableData(StaticTableName, updateSql, whereCon);
if(res !=0 ){
zlog_error(zct, "res = %d", res);
}
res = sqlite_db_ctrl::instance().UpdateTableData(dataTableName, updateSql, whereCon);
if(res !=0 ){
zlog_error(zct, "res = %d", res);
}
}else{
zlog_error(zct, "data_publish res = %d", res);
}
}
}
@ -1175,17 +1223,22 @@ int SqliteDB::QueryofflineData() {
char updateSql[1024] = {0x00};
sprintf(whereCon, "channelID='%s' and timeStamp = '%s' ", arrRetData[i][0].c_str(), arrRetData[i][2].c_str());
sprintf(updateSql, "SendMsg = 1");
sqlite_db_ctrl::instance().UpdateTableData("t_data_waveSend", updateSql, whereCon);
res = sqlite_db_ctrl::instance().UpdateTableData("t_data_waveSend", updateSql, whereCon);
if(res !=0 ){
zlog_error(zct, "res = %d", res);
}
std::string strCmd = "rm " + arrRetData[i][1];
system(strCmd.c_str());
}else{
zlog_error(zct, "data_publish res = %d", res);
}
}
}
return 0;
return res;
}
int SqliteDB::CalculateData() {
int res = 0;
array_t vecRet = GetDataMultiLine(T_SENSOR_INFO(TNAME), " dataNodeNo,MeasurementID,NodeWaveSend,featureInterVal,waveInterVal,ZigbeePower ", NULL);
if (vecRet.size() > 0) {
int planCount = 0, planCountStatistic = 0, StatisticCountTotal = 0, SixCountTotal = 0, TimingCountTotal = 0, CountWaveXTotal = 0, waveInterVal = 0, featureInterVal = 0;
@ -1294,7 +1347,10 @@ int SqliteDB::CalculateData() {
sprintf(updateSql, "ZigbeePower = '2',UpdateFlag = 0 ");
memset(whereCon, 0x00, sizeof(whereCon));
sprintf(whereCon, " dataNodeNo = '%s'", vecRet[i][0].c_str());
UpdateTableData(T_SENSOR_INFO(TNAME), updateSql, whereCon);
res = UpdateTableData(T_SENSOR_INFO(TNAME), updateSql, whereCon);
if(res !=0 ){
zlog_error(zct, "res = %d", res);
}
zlog_info(zct, "2 update ZigbeePower ");
}
@ -1303,7 +1359,10 @@ int SqliteDB::CalculateData() {
sprintf(updateSql, "ZigbeePower = '3',UpdateFlag = 0 ");
memset(whereCon, 0x00, sizeof(whereCon));
sprintf(whereCon, " dataNodeNo = '%s'", vecRet[i][0].c_str());
UpdateTableData(T_SENSOR_INFO(TNAME), updateSql, whereCon);
res = UpdateTableData(T_SENSOR_INFO(TNAME), updateSql, whereCon);
if(res !=0 ){
zlog_error(zct, "res = %d", res);
}
zlog_info(zct, "3 update ZigbeePower ");
}
}
@ -1314,7 +1373,7 @@ int SqliteDB::CalculateData() {
zlog_info(zct, "plan Statistic Count = %d , 06 Count = %d , Timing Count = %d , CountWaveX = %d ", planCountStatistic * vecRet.size(), planCount * vecRet.size(), planCount * vecRet.size(), planCount * vecRet.size());
zlog_info(zct, "reality Statistic Count = %d , 06 Count = %d , Timing Count = %d , CountWaveX = %d ,CountWaveY = %d ,CountWaveZ = %d ", StatisticCountTotal, SixCountTotal, TimingCountTotal, CountWaveXTotal, CountWaveYTotal, CountWaveZTotal);
}
return 0;
return res;
}
int SqliteDB::TransBegin() { return sqlite3_exec(mDBAcess, "begin;", 0, 0, 0); }

86
jsonparse/mqtt_cmd_parse.cpp
View File

@ -30,48 +30,22 @@ const char *JSON_FIELD_CommMode = "CommMode";
std::string JsonData::JsonCmd_20(Param_20 &param) {
Json::Value jsonVal;
jsonVal.clear();
jsonVal[JSON_FIELD_CMD] = "20";
jsonVal["success"] = true;
jsonVal["message"] = "";
int ret = 0;
if (0 == param.mMode) {
char localtimestamp[32] = {0};
GetTimeNet(localtimestamp, 1);
std::string nowTimetamp = std::string(localtimestamp);
ret = WriteStr2Config(SYSTEMINFOFILE, "SystemInfo", "dataNodeGatewayName", param.mDataWatchName);
if (ret != 0) {
zlog_error(zct, "[cmd20] WriteStr2Config 1");
jsonVal["success"] = false;
jsonVal["message"] = "fail to write config";
return show_value_.write(jsonVal);
}
WriteStr2Config(SYSTEMINFOFILE, "SystemInfo", "dataNodeGatewayName", param.mDataWatchName);
WriteStr2Config(SYSTEMINFOFILE, "SystemInfo", "dataNodeGatewayAssetId", param.mDataWatchAssetId);
if (ret != 0) {
zlog_error(zct, "[cmd20] WriteStr2Config 2");
jsonVal["success"] = false;
jsonVal["message"] = "fail to write config";
return show_value_.write(jsonVal);
}
WriteStr2Config(SYSTEMINFOFILE, "SystemInfo", "dataNodeGatewayAddedBy", param.mDataWatchAddedBy);
if (ret != 0) {
zlog_error(zct, "[cmd20] WriteStr2Config 3");
jsonVal["success"] = false;
jsonVal["message"] = "fail to write config";
return show_value_.write(jsonVal);
}
WriteStr2Config(SYSTEMINFOFILE, "SystemInfo", "dataNodeGatewayAddedDate", nowTimetamp);
if (ret != 0) {
zlog_error(zct, "[cmd20] WriteStr2Config 4");
jsonVal["success"] = false;
jsonVal["message"] = "fail to write config";
return show_value_.write(jsonVal);
}
}
std::string boardtype = GetFileContent(BOARDTYPE, 1);
std::string ip = IpAddrInit();
std::string sn = GetFileContent(SN, 1);
jsonVal[JSON_FIELD_CMD] = "20";
jsonVal[JSON_FIELD_dataNodeGatewayNo] = GlobalConfig::MacAddr_G;
jsonVal["cmdSerial"] = param.mCmdSerial;
@ -112,20 +86,13 @@ std::string JsonData::JsonCmd_20(Param_20 &param) {
std::string JsonData::JsonCmd_22(Param_22 &param) {
Json::Value jsonVal;
jsonVal.clear();
jsonVal[JSON_FIELD_CMD] = "22";
jsonVal["success"] = true;
jsonVal["message"] = "";
if (0 == param.mMode) {
int ret = WriteStr2Config(SYSTEMINFOFILE, "SystemInfo", "timezone", param.mTimeZone);
if (ret != 0) {
zlog_error(zct, "[cmd22] WriteStr2Config");
jsonVal["success"] = false;
jsonVal["message"] = "fail to write config";
return show_value_.write(jsonVal);
}
WriteStr2Config(SYSTEMINFOFILE, "SystemInfo", "timezone", param.mTimeZone);
}
jsonVal[JSON_FIELD_CMD] = "22";
jsonVal[JSON_FIELD_dataNodeGatewayNo] = GlobalConfig::MacAddr_G;
jsonVal["cmdSerial"] = param.mCmdSerial;
@ -142,46 +109,14 @@ std::string JsonData::JsonCmd_22(Param_22 &param) {
std::string JsonData::JsonCmd_23(Param_23 &param) {
Json::Value jsonVal;
jsonVal.clear();
jsonVal[JSON_FIELD_CMD] = "23";
jsonVal["success"] = true;
jsonVal["message"] = "";
if (0 == param.mMode) {
int ret = 0;
ret = WriteStr2Config(SERVERCONFIG, "Server", "localServerIpAddress", param.mServerIp);
if (ret != 0) {
zlog_error(zct, "[cmd23] WriteStr2Config 1");
jsonVal["success"] = false;
jsonVal["message"] = "fail to write config";
return show_value_.write(jsonVal);
}
ret = WriteStr2Config(SERVERCONFIG, "Server", "localServerPort", param.mPort);
if (ret != 0) {
zlog_error(zct, "[cmd23] WriteStr2Config 2");
jsonVal["success"] = false;
jsonVal["message"] = "fail to write config";
return show_value_.write(jsonVal);
}
ret = WriteStr2Config(SERVERCONFIG, "Server", "CommMode", param.mCommMode);
if (ret != 0) {
zlog_error(zct, "[cmd23] WriteStr2Config 3");
jsonVal["success"] = false;
jsonVal["message"] = "fail to write config";
return show_value_.write(jsonVal);
}
ret = WriteStr2Config(SERVERCONFIG, "Server", "Password", param.mPassword);
if (ret != 0) {
zlog_error(zct, "[cmd23] WriteStr2Config 4");
jsonVal["success"] = false;
jsonVal["message"] = "fail to write config";
return show_value_.write(jsonVal);
}
ret = WriteStr2Config(SERVERCONFIG, "Server", "UserName", param.mUserName);
if (ret != 0) {
zlog_error(zct, "[cmd23] WriteStr2Config 5");
jsonVal["success"] = false;
jsonVal["message"] = "fail to write config";
return show_value_.write(jsonVal);
}
WriteStr2Config(SERVERCONFIG, "Server", "localServerIpAddress", param.mServerIp);
WriteStr2Config(SERVERCONFIG, "Server", "localServerPort", param.mPort);
WriteStr2Config(SERVERCONFIG, "Server", "CommMode", param.mCommMode);
WriteStr2Config(SERVERCONFIG, "Server", "Password", param.mPassword);
WriteStr2Config(SERVERCONFIG, "Server", "UserName", param.mUserName);
zlog_info(zct, "param.mCommMode = %s", param.mCommMode.c_str());
if ("1" == param.mCommMode) { //有线连接
system("mv /etc/init.d/S91quectel-CM.sh /etc/init.d/wireless.sh");
@ -197,7 +132,7 @@ std::string JsonData::JsonCmd_23(Param_23 &param) {
system("reboot");
}
jsonVal[JSON_FIELD_CMD] = "23";
jsonVal[JSON_FIELD_dataNodeGatewayNo] = GlobalConfig::MacAddr_G;
jsonVal["cmdSerial"] = param.mCmdSerial;
@ -584,7 +519,6 @@ void JsonData::DataNodeStatusCheck() {
std::string nowTimetamp = std::string(localtimestamp);
int lNowTime = atoi(nowTimetamp.c_str());
int onlineCheck = readIntValue("config", "online", (char *)GlobalConfig::Config_G.c_str());
//int loseTime = readIntValue("config", "loseTime", (char *)GlobalConfig::Config_G.c_str());
int nodeOnline = readIntValue("config", "nodeOnline", (char *)GlobalConfig::Config_G.c_str());
int count = 0;
if (nSize > 0) {

16
jsonparse/web_cmd_parse2.cpp
View File

@ -492,7 +492,7 @@ std::string JsonData::JsonCmd_Cgi_30(Param_30 &param) {
zlog_info(zct, "sensor type %s", res[17].c_str());
if (res[17] == "01") {
SampleRate = atoi(res[23].c_str());
zlog_info(zct, "@@@@@@@@@@@@@@@@@@@@sample_rate=%d", SampleRate);
zlog_info(zct, "sample_rate=%d", SampleRate);
resolution = (((double)SampleRate / 1000) * 1016) / vecWave.size();
} else if (res[17] == "02") {
@ -500,10 +500,10 @@ std::string JsonData::JsonCmd_Cgi_30(Param_30 &param) {
if (comper != std::string::npos) {
SampleRate = atoi(res[23].c_str());
resolution = (double)SampleRate / vecWave.size();
zlog_info(zct, "@@@@@@@@@@@@@@@@@@@@sample_rate=%d,resolution = %f", SampleRate, resolution);
zlog_info(zct, "sample_rate=%d,resolution = %f", SampleRate, resolution);
} else {
SampleRate = 8192;
zlog_info(zct, "@@@@@@@@@@@@@@@@@@@@sample_rate=%d", SampleRate);
zlog_info(zct, "sample_rate=%d", SampleRate);
if (vecWave.size() < 8192) {
resolution = (double)SampleRate / vecWave.size();
} else {
@ -512,7 +512,7 @@ std::string JsonData::JsonCmd_Cgi_30(Param_30 &param) {
}
}
zlog_info(zct, "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@the sample rate is %d,the resolution %f", SampleRate, resolution);
zlog_info(zct, "the sample rate is %d,the resolution %f", SampleRate, resolution);
char buf[32];
memset(buf, 0, 32);
sprintf(buf, "%f", resolution);
@ -661,7 +661,7 @@ std::string JsonData::JsonCmd_Cgi_40(Param_40 &param) {
zlog_info(zct, "sensor type %s", res[17].c_str());
if (res[17] == "01") {
SampleRate = atoi(res[23].c_str());
zlog_info(zct, "@@@@@@@@@@@@@@@@@@@@sample_rate=%d", SampleRate);
zlog_info(zct, "sample_rate=%d", SampleRate);
resolution = (((double)SampleRate / 1000) * 1016) / 8192;
} else if (res[17] == "02") {
std::string::size_type comper = param.mChannelId.find("Z");
@ -669,15 +669,15 @@ std::string JsonData::JsonCmd_Cgi_40(Param_40 &param) {
SampleRate = atoi(res[23].c_str());
resolution = (double)SampleRate / vecWave.size();
zlog_info(zct, "@@@@@@@@@@@@@@@@@@@@sample_rate=%d,resolution = %f", SampleRate, resolution);
zlog_info(zct, "sample_rate=%d,resolution = %f", SampleRate, resolution);
} else {
SampleRate = 8000;
zlog_info(zct, "@@@@@@@@@@@@@@@@@@@@sample_rate=%d", SampleRate);
zlog_info(zct, "sample_rate=%d", SampleRate);
resolution = (((double)SampleRate / 1000) * 1024) / 8192;
}
}
zlog_info(zct, "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@the sample rate is %d,the resolution %f", SampleRate, resolution);
zlog_info(zct, "the sample rate is %d,the resolution %f", SampleRate, resolution);
char buf[32];
memset(buf, 0, 32);
sprintf(buf, "%f", resolution);

15
jsonparse/web_cmd_parse3.cpp
View File

@ -275,17 +275,17 @@ std::string JsonData::JsonCmd_Cgi_55(Param_55 &param) {
vecWave.push_back(fTemp);
}
if (res[17] == "01") {
zlog_info(zct,"@@@@@@@@@@@@@@@@@@@@sample_rate=%d", SampleRate);
zlog_info(zct,"sample_rate=%d", SampleRate);
resolution = (((double)SampleRate / 1000) * 1016) / vecWave.size();
} else if (res[17] == "02") {
std::string::size_type comper = param.mChannelId.find("Z");
if (comper != std::string::npos) {
resolution = (double)SampleRate / vecWave.size();
zlog_info(zct,"@@@@@@@@@@@@@@@@@@@@sample_rate=%d,resolution = %f", SampleRate, resolution);
zlog_info(zct,"sample_rate=%d,resolution = %f", SampleRate, resolution);
} else {
SampleRate = 8000;
zlog_info(zct,"@@@@@@@@@@@@@@@@@@@@sample_rate=%d", SampleRate);
zlog_info(zct,"sample_rate=%d", SampleRate);
resolution = (((double)SampleRate / 1024) * 1024) / 8192;
}
}
@ -357,7 +357,6 @@ std::string JsonData::JsonCmd_Cgi_56(Param_56 &param) {
jsonVal["dataNodeGatewayNo"] = GlobalConfig::MacAddr_G;
jsonVal["success"] = true;
jsonVal["message"] = "";
// int i = 0;
std::string strWaveData;
std::string filename = "/opt/data/" + param.mChannelId + ".dat";
char localtimestamp[32] = {0};
@ -403,7 +402,7 @@ std::string JsonData::JsonCmd_Cgi_56(Param_56 &param) {
}
if (res[17] == "01") {
zlog_info(zct,"@@@@@@@@@@@@@@@@@@@@sample_rate=%d", SampleRate);
zlog_info(zct,"sample_rate=%d", SampleRate);
resolution = (((double)SampleRate / 1000) * 1016) / vecWave.size();
} else if (res[17] == "02") {
@ -412,10 +411,10 @@ std::string JsonData::JsonCmd_Cgi_56(Param_56 &param) {
SampleRate = atoi(res[23].c_str());
resolution = (double)SampleRate / vecWave.size();
zlog_info(zct,"@@@@@@@@@@@@@@@@@@@@sample_rate=%d,resolution = %f", SampleRate, resolution);
zlog_info(zct,"sample_rate=%d,resolution = %f", SampleRate, resolution);
} else {
SampleRate = 8192;
zlog_info(zct,"@@@@@@@@@@@@@@@@@@@@sample_rate=%d", SampleRate);
zlog_info(zct,"sample_rate=%d", SampleRate);
if (vecWave.size() < 8192) {
resolution = (double)SampleRate / vecWave.size();
} else {
@ -477,7 +476,7 @@ std::string JsonData::JsonCmd_Cgi_56(Param_56 &param) {
jsBody["timestamp"] = std::string(localtimestamp);
jsBody["Data"] = strWaveData;
zlog_info(zct,"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@the sample rate is %d,the resolution %f", SampleRate, resolution);
zlog_info(zct,"the sample rate is %d,the resolution %f", SampleRate, resolution);
char buf[32];
memset(buf, 0, 32);
sprintf(buf, "%f", resolution);

9
platform/platform_init.cpp
View File

@ -230,25 +230,26 @@ void PlatformInit::SystemInfoInit() {
os.close();
}
void PlatformInit::UserInit() {
int PlatformInit::UserInit() {
std::string userName = ReadStrByOpt(SYSTEMINFOFILE, "UserInfo", "UserName");
int ret = 0;
if (userName.length() == 0) {
ret = WriteStr2Config(SYSTEMINFOFILE, "UserInfo", "UserName", "Admin");
if (ret != 0) {
return;
return 1;
}
ret = WriteStr2Config(SYSTEMINFOFILE, "UserInfo", "adminPassword", "njchaos");
if (ret != 0) {
return;
return 2;
}
ret = WriteStr2Config(SYSTEMINFOFILE, "UserInfo", "userPassword", "");
if (ret != 0) {
return;
return 3;
}
}
return ret;
}
void PlatformInit::EquipIpInit(std::string eth) {

2
platform/platform_init.hpp
View File

@ -40,7 +40,7 @@ public :
* @brief cgi用户信息初始化
* @return void
*/
static void UserInit();
static int UserInit();
/**
* @brief 数据库初始化

2
threadfunc/thread_func.hpp
View File

@ -22,12 +22,10 @@
void CheckThread(); //循环检测线程
void StartMqttClient(); //启动mqtt服务
void SearchThread(); //组播功能, 提供发现设备功能
void RecvUpdateFile(); //更新升级包
void StartCgiServer(); //启动cgi处理服务端
void HeartRep();
void UartStart(); //
void TestUart();
void WatchDog();
void UartStartWave();
void StartUdpSys(); //组播通信
void GetCSQ();

20
uart/uart.cpp
View File

@ -467,14 +467,13 @@ void Uart::DealDataNodeName(const char *pData) {
}
std::string hardVersion = vecRes[0][2];
std::string softVersion = vecRes[0][3];
if ((hardVersion == "3.0" && compareVersions(softVersion, "3.6") == -1) || (hardVersion == "4.0" && compareVersions(softVersion, "4.6") == -1)) {
if ((hardVersion == "3.0" && compareVersions(softVersion, "3.6") == -1) || (hardVersion == "4.0" && compareVersions(softVersion, "4.6") == -1)|| (hardVersion == "1.0" && compareVersions(softVersion,"1.2") == -1)) {
memcpy(MeasurementID, vecRes[0][0].c_str(), sizeof(MeasurementID));
}
std::string strNodeName(NodeName);
zlog_info(zct, "strNodeName = %s", strNodeName.c_str());
solve(gbkNodeName, NodeName);
zlog_info(zct, "gbkNodeName = %s", gbkNodeName);
std::string utfNodeName = GBKToUTF8(gbkNodeName);
zlog_info(zct, "NodeName = %s", NodeName);
zlog_info(zct, "whereCon = %s", whereCon);
sprintf(uplCon, "dataNodeName = '%s' , MeasurementID = '%s',NodeWaveSend = '%s'", gbkNodeName, MeasurementID, nodeWaveSend);
@ -485,6 +484,7 @@ void Uart::DealDataNodeName(const char *pData) {
void Uart::DealDataNodeInfo(const char *pData) {
zlog_info(zct, "recv remote zigbee module info");
int res = 0;
RecvData *pRecvData = (RecvData *)pData;
char buf[32] = {0};
char chTemp = pRecvData->Data[0]; //设备状态标志 1 byte
@ -706,7 +706,10 @@ void Uart::DealDataNodeInfo(const char *pData) {
dataNodeInfo.ZigbeeChannel, dataNodeInfo.ZigbeeShortAddr.c_str(), dataNodeInfo.ZigbeeLongAddr.c_str(), dataNodeInfo.ZigbeeDesAddr.c_str(), dataNodeInfo.ZigbeePower, dataNodeInfo.ZigbeeRetry, dataNodeInfo.ZigbeeRetryGap, dataNodeInfo.ACCSampleTime, "1",
dataNodeInfo.ConfigDate.c_str(), dataNodeInfo.VIntegralFilterFrequency, dataNodeInfo.RSSI);
sprintf(whereCon, "dataNodeNo = '%s'", dataNodeInfo.ZigbeeLongAddr.c_str());
sqlite_db_ctrl::instance().UpdateTableData(T_SENSOR_INFO(TNAME), updateSql, whereCon);
res = sqlite_db_ctrl::instance().UpdateTableData(T_SENSOR_INFO(TNAME), updateSql, whereCon);
if(res !=0 ){
zlog_error(zct, "res = %d", res);
}
} else {
char insertSql[1024] = {0};
sprintf(insertSql, " '%s','%s','%d','%d','%d','%d','%d','%d',\
@ -720,7 +723,10 @@ void Uart::DealDataNodeInfo(const char *pData) {
dataNodeInfo.StartBrands.c_str(), dataNodeInfo.StopBrands.c_str(), dataNodeInfo.FeatureInterVal, dataNodeInfo.WaveInterVal, dataNodeInfo.SamplingRate, "", dataNodeInfo.Range, dataNodeInfo.EnvelopeBandPass.c_str(), dataNodeInfo.FaultFrequency.c_str(),
dataNodeInfo.ZigbeePanId.c_str(), dataNodeInfo.ZigbeeChannel, dataNodeInfo.ZigbeeShortAddr.c_str(), dataNodeInfo.ZigbeeLongAddr.c_str(), dataNodeInfo.ZigbeeDesAddr.c_str(), dataNodeInfo.ZigbeePower, dataNodeInfo.ZigbeeRetry, dataNodeInfo.ZigbeeRetryGap,
dataNodeInfo.ACCSampleTime, "1", dataNodeInfo.ConfigDate.c_str(), dataNodeInfo.VIntegralFilterFrequency, dataNodeInfo.RSSI);
sqlite_db_ctrl::instance().InsertData(T_SENSOR_INFO(TNAME), insertSql);
res = sqlite_db_ctrl::instance().InsertData(T_SENSOR_INFO(TNAME), insertSql);
if(res !=0 ){
zlog_error(zct, "res = %d", res);
}
}
char szTableName[50] = {0x00};
sprintf(szTableName, "t_data_%s", dataNodeInfo.ZigbeeLongAddr.c_str());
@ -776,8 +782,10 @@ void Uart::DealDataNodeInfo(const char *pData) {
jsonVal["cmdBody"] = dataBody;
std::string strCmd26 = showValue.write(jsonVal);
// 传感器发来的数据包中的表示设备信息的数据转化为json格式后，通过调用data_publish将数据传给mqttclient ： Topic：wireless/cmd/60294D203717
data_publish(strCmd26.c_str(), GlobalConfig::Topic_G.mPubCmd.c_str());
res = data_publish(strCmd26.c_str(), GlobalConfig::Topic_G.mPubCmd.c_str());
if(res !=0 ){
zlog_error(zct, "res = %d", res);
}
zlog_info(zct, "remote wireless sensor device info AccFlag : %d EquipSta : %d BpNo : %s ConfigFlag : %d EnvelopeBandPass : %s FaultFrequency : %s FeatureInterVal : %u FirstPowerTime : %s HardVersion : %s InitFlag : %d SamplingRate : %d range : %d SerialNo : %s\
SoftVersion : %s StartBrands : %s StopBrands : %s TemBotFlag : %d TemTopFlag : %d WaveInterVal : %d ZigbeeChannel : %d ZigbeeDesAddr : %s ZigbeeFlag : %d ZigbeeLongAddr : %s panid : %s ZigbeeShortAddr : %s Configdate : %s vintegralfilterfrequency : %d RSSI : %d ",
dataNodeInfo.AccFlag, dataNodeInfo.EquipSta, dataNodeInfo.BpNo.c_str(), dataNodeInfo.ConfigFlag, dataNodeInfo.EnvelopeBandPass.c_str(), dataNodeInfo.FaultFrequency.c_str(), dataNodeInfo.FeatureInterVal, dataNodeInfo.FirstPowerTime.c_str(),