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

将历史电池电量数据移动到历史表，传感器传递波形时不解析特征值

Browse Source
This commit is contained in:
CHINAMI-TV221UM\Administrator 2024-08-23 12:26:03 +08:00
parent 509e3dfaa4
commit 408d0c7c42
4 changed files with 39 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
dbaccess/SH_SqlDB.cpp
View File

@ -200,6 +200,20 @@ void SqliteDB::SqliteInit(const char *pDbName, bool isDB2)
T_BATTERY_INFO(TIMESTAMP)); T_BATTERY_INFO(TIMESTAMP));
CreateTable(sql_exec, isDB2); CreateTable(sql_exec, isDB2);
memset(sql_exec, 0, 2048);
sprintf(sql_exec, "create table if not exists %s(%s,%s,%s,%s,%s,%s,%s,%s,%s);",
"t_battery_history",
T_BATTERY_INFO(DATANODENO),
T_BATTERY_INFO(DIP),
T_BATTERY_INFO(TEMBOT),
T_BATTERY_INFO(NODEWORKTIME),
T_BATTERY_INFO(NODESENDTIME),
T_BATTERY_INFO(BATTERYVOLTAGE),
T_BATTERY_INFO(BATTERYUSAGE),
T_BATTERY_INFO(BATTERYREMAIN),
T_BATTERY_INFO(TIMESTAMP));
CreateTable(sql_exec, isDB2);
/*memset(sql_exec, 0, 2048); /*memset(sql_exec, 0, 2048);
sprintf(sql_exec, "create table if not exists %s(%s,%s,%s,%s,%s integer,%s integer ,%s integer ,%s integer,%s integer);", sprintf(sql_exec, "create table if not exists %s(%s,%s,%s,%s,%s integer,%s integer ,%s integer ,%s integer,%s integer);",
T_DATANODE_TIME(TNAME), T_DATANODE_TIME(TNAME),
@ -363,7 +377,17 @@ int SqliteDB::CreateTable(const char *sql, bool isDB2)
} }
return iRet; return iRet;
} }
int SqliteDB::ExeSql(const char *sql, bool isDB2)
{
print_light_green("%s\n", sql);
char *msg;
int iRet = sqlite3_exec(GetDbHandle(isDB2), sql, 0, 0, &msg);
if (iRet != SQLITE_OK) {
print_error("sqlite3 error: code=%d msg=%s\n", iRet, msg);
sqlite3_free(msg);
}
return iRet;
}
int SqliteDB::GetTableColumnCount(const char *tablename, bool isDB2) int SqliteDB::GetTableColumnCount(const char *tablename, bool isDB2)
{ {
std::string strSql = "select * from "; std::string strSql = "select * from ";
@ -931,6 +955,12 @@ int SqliteDB::CalculateBattery()
memset(whereCon,0x00,sizeof(whereCon)); memset(whereCon,0x00,sizeof(whereCon));
memset(updateSql,0x00,sizeof(updateSql)); 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);
sprintf(deleteSql,"delete from t_battery_info where timeStamp < '%s' and dataNodeNo = '%s'",strtimeStamp.c_str(),vecRes[i][0].c_str());
ExeSql(deleteSql);
sprintf(whereCon,"dataNodeNo = '%s' ",vecRes[i][0].c_str()); sprintf(whereCon,"dataNodeNo = '%s' ",vecRes[i][0].c_str());
if(startCapacity > 0){ if(startCapacity > 0){

1
dbaccess/SH_SqlDB.hpp
View File

@ -37,6 +37,7 @@ public:
int TransRollback(); int TransRollback();
int TransCommit(); int TransCommit();
int CreateTable(const char *sql, bool isDB2=false); int CreateTable(const char *sql, bool isDB2=false);
int ExeSql(const char *sql, bool isDB2=false);
int GetTableColumnCount(const char *tablename, bool isDB2 = false); int GetTableColumnCount(const char *tablename, bool isDB2 = false);
int GetTableRows(const char *tablename, const char *whereCon); int GetTableRows(const char *tablename, const char *whereCon);
int AlterTable(const char *tablename, const char *column, bool isAdd = true, bool isDB2=false); int AlterTable(const char *tablename, const char *column, bool isAdd = true, bool isDB2=false);

2
threadfunc/SH_ThreadFunc.cpp
View File

@ -307,7 +307,7 @@ void CheckThread()
GetTimeNet(localtimestamp, 1); GetTimeNet(localtimestamp, 1);
char whereCon[1024] = {0}; char whereCon[1024] = {0};
sprintf(whereCon," timestamp < '%ld' ",atol(localtimestamp) - 15638400); //删除半年前的数据 sprintf(whereCon," timestamp < '%ld' ",atol(localtimestamp) - 15638400); //删除半年前的数据
sql_ctl->DeleteTableData(T_BATTERY_INFO(TNAME),whereCon); sql_ctl->DeleteTableData(" t_battery_history ",whereCon);
/*staticData = 0; /*staticData = 0;
Json::Value jsHeart; Json::Value jsHeart;
Json::FastWriter fw; Json::FastWriter fw;

8
uart/SH_Uart.cpp
View File

@ -1964,8 +1964,9 @@ void Uart::DealDataNodeFeature(const char *pData, int flag)
char buf[20] = {0x00}; char buf[20] = {0x00};
int nodeResend = 0; int nodeResend = 0;
sprintf(buf, "%02x%02x", pRecvData->ShortAddr[0], pRecvData->ShortAddr[1]); sprintf(buf, "%02x%02x", pRecvData->ShortAddr[0], pRecvData->ShortAddr[1]);
LOG_INFO("DealDataNodeFeature %02x%02x\n",pRecvData->ShortAddr[0], pRecvData->ShortAddr[1]); LOG_INFO("DealDataNodeFeature %02x%02x,isWave \n",pRecvData->ShortAddr[0], pRecvData->ShortAddr[1],flag);
if (bSendTimeStamp)//波形处理中
return;
std::string strShortAddr = std::string(buf); std::string strShortAddr = std::string(buf);
print_info("zigbeeShortAddr='%s'\n", strShortAddr.c_str()); print_info("zigbeeShortAddr='%s'\n", strShortAddr.c_str());
char getLongAddr_sql[32] = { 0 }; char getLongAddr_sql[32] = { 0 };
@ -3432,7 +3433,8 @@ void Uart::DealDataNodeFeature(const char *pData, int flag)
} }
bZigbeeSinal = false; bZigbeeSinal = false;
} }
LOG_INFO("DealDataNodeFeature end\n");
LOG_INFO("DealDataNodeFeature end %02x%02x,isWave \n",pRecvData->ShortAddr[0], pRecvData->ShortAddr[1],flag);
} }
void Uart::DealDataNodeWave(const char *pData) void Uart::DealDataNodeWave(const char *pData)