优化创建数据库

.gitignore

@@ -8,3 +8,4 @@ cgi-bin/
 bin/
 GateWay/
 Release/
+debug/makefile

dbaccess/SH_SqlDB.cpp

@@ -30,7 +30,7 @@ void SqliteDB::SqliteInit(const char *pDbName,  bool isDB2)
 
     //创建传感器信息存储表
     memset(sql_exec, 0, 2048);
-    sprintf(sql_exec, "create table if not exists %s(%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s);",
+    sprintf(sql_exec, "create table if not exists %s(%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s);",
 						T_SENSOR_INFO(TNAME),
 						T_SENSOR_INFO(DATANODENO),
 						T_SENSOR_INFO(DATANODENAME), 
@@ -75,7 +75,7 @@ void SqliteDB::SqliteInit(const char *pDbName,  bool isDB2)
     					T_SENSOR_INFO(RSSI),
 						"UpdateFlag",
 						"LooseValue",
-						"batteryPower"),
+						"batteryPower");
     CreateTable(sql_exec, isDB2);
 
     int iRet = GetTableRows(" sqlite_master "," name = 't_sensor_info' and sql LIKE '%LooseValue%' ");
@@ -102,10 +102,16 @@ void SqliteDB::SqliteInit(const char *pDbName,  bool isDB2)
 	memset(sql_exec, 0, 2048);
 	sprintf(sql_exec,"update t_sensor_info set MeasurementID = dataNodeNo where MeasurementID = '' ;");
 	UpdateTableData(sql_exec,isDB2);
+	memset(sql_exec, 0, 2048);
+	sprintf(sql_exec,"update t_sensor_info set NodeWaveSend = '0,0,0' where NodeWaveSend = '' ;");
+	UpdateTableData(sql_exec,isDB2);
+	memset(sql_exec, 0, 2048);
+	sprintf(sql_exec,"update t_sensor_info set NodeWaveSend = '0,0,0' where NodeWaveSend IS NULL ;");
+	UpdateTableData(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,%s,%s,%s,%s,%s,%s,%s,%s integer,%s,%s);",
+    sprintf(sql_exec, "create table if not exists %s(%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s integer,%s,%s,%s);",
                        T_DATA_INFO(TNAME),
                        T_DATA_INFO(DATANODENO),
                        T_DATA_INFO(CHANNELID), 
@@ -136,7 +142,7 @@ void SqliteDB::SqliteInit(const char *pDbName,  bool isDB2)
 
     //创建传感器静态数据存储表
     memset(sql_exec, 0, 2048);
-    sprintf(sql_exec, "create table if not exists %s(%s,%s,%s,%s,%s,%s,%s,%s integer,%s,%s);",
+    sprintf(sql_exec, "create table if not exists %s(%s,%s,%s,%s,%s,%s,%s,%s integer,%s,%s,%s);",
                        T_DATASTATIC_INFO(TNAME),
                        T_DATASTATIC_INFO(DATANODENO),
                        T_DATASTATIC_INFO(CHANNELID), 

jsonparse/SH_JsonCmd.cpp

@@ -696,6 +696,7 @@ std::string JsonData::JsonCmd_Cgi_02(Param_02 &param)
         jsonVal["type"] = "GET";     
         jsonVal["timeStamp"] = atoi(nowTimetamp.c_str());
     }
+    jsonVal["timezone"] = ReadStrByOpt(SYSTEMINFOFILE, "SystemInfo", "timezone");
     return showValue.write(jsonVal);
 
 }
@@ -1233,6 +1234,10 @@ std::string JsonData::JsonCmd_Cgi_25(Param_25 &param)
 #ifdef IMX6UL_GATEWAY
 	strNet = param.mNet;
 	param.mNet = "Net";
+#endif	
+#ifdef G2UL_GATEWAY
+	strNet = param.mNet;
+	param.mNet = "eth0";
 #endif	
     if (0 == param.mMode &&(bFlag1 && bFlag2 && bFlag3 && bFlag4) && param.mNetworkPortStatus == "STATIC") {
         WriteStr2Config(NETWORKCONFIG, param.mNet, "dnsName", param.mDnsName);
@@ -2411,7 +2416,12 @@ std::string JsonData::JsonCmd_Cgi_52(Param_52 &param)
     jsonVal["cmdSerial"] = param.mCmdSerial;
     jsonVal["success"] = true;
     jsonVal["message"] = " ";
-
+// #ifndef WIFI_MODULE
+// 	jsonVal["success"] = false;
+//     jsonVal["message"] = " ";
+// 	jsonVal["enable"] = false;
+//     return showValue.write(jsonVal);
+// #endif
     if (0 == param.mMode) {	// 扫描
         wifi::WPAClient wpa;
         std::string netssid = wpa.GetNetSsid();

main.cpp

@@ -64,8 +64,6 @@ int main(int argc, char *argv[])
 
     boost::thread InitModuleReadTh(InitModule);
     InitModuleReadTh.detach();
-    //boost::thread uartWatchDogReadTh(WatchDog);
-    //uartWatchDogReadTh.detach();
 
     // 休眠2秒，等待串口线程初始化完毕
     sleep(2);

threadfunc/SH_ThreadFunc.cpp

@@ -629,6 +629,7 @@ dial5G:
 }
 void UartStart()
 {
+	print_info("2222222222222\n");
    // onReceiveUart cb = (onReceiveUart)&ProtoConvert::HandleFromUart;
    // pUart->setCallBack(cb);
 	print_info("zigAckrep = %d,zigAckreset = %d,zigReset = %d,errorLed = %d,power = %d",\
@@ -668,6 +669,7 @@ void UartStart()
 }
 void InitModule()
 {
+
 #ifdef NR5G_MODULE
 #ifdef G2UL_GATEWAY
 
@@ -722,6 +724,7 @@ void InitModule()
 #endif
 #endif
 }
+
 void TestUart()
 {
 	pUart->InitTestUart(B115200);

uart/SH_Uart.cpp

@@ -1679,7 +1679,8 @@ void Uart::DealDataNodeName(const char* pData)
 	string hardVersion = vecRes[0][2];
 	string softVersion = vecRes[0][3];
 	if((hardVersion == "3.0" && compareVersions(softVersion,"3.6") == -1) || 
-		(hardVersion == "4.0" && compareVersions(softVersion,"4.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);