diff --git a/Cidn-SH b/Cidn-SH index 8fcef16..b400925 100644 Binary files a/Cidn-SH and b/Cidn-SH differ diff --git a/jsonparse/SH_JsonCmd.cpp b/jsonparse/SH_JsonCmd.cpp index fced795..c616dd5 100644 --- a/jsonparse/SH_JsonCmd.cpp +++ b/jsonparse/SH_JsonCmd.cpp @@ -600,9 +600,9 @@ void JsonData::DataNodeStatusCheck() sprintf(whereCon, "dataNodeNo='%s'", strDataNodeNo.c_str()); sql_ctl->UpdateTableData(T_SENSOR_INFO(TNAME), "status='1'", whereCon); } - if (lTimeTemp > atoi(vetRes[i][21].c_str()) * 5 * 60 )//判定传感器是否超过五次未传特征值 + if (lTimeTemp > atoi(vetRes[i][21].c_str()) * 10 * 60 )//判定传感器是否超过十次未传特征值 { - LOG_DEBUG("lTimeTemp = %d,featureInterVal = %d\n",lTimeTemp,atoi(vetRes[i][21].c_str())); + LOG_DEBUG("lTimeTemp = %d,lNowTime = %d,llastTime = %d,featureInterVal = %d\n",lTimeTemp,lNowTime,llastTime,atoi(vetRes[i][21].c_str())); count ++; } } diff --git a/threadfunc/SH_ThreadFunc.cpp b/threadfunc/SH_ThreadFunc.cpp index 9da4e88..ecea19b 100644 --- a/threadfunc/SH_ThreadFunc.cpp +++ b/threadfunc/SH_ThreadFunc.cpp @@ -241,7 +241,7 @@ void CheckThread() } - if (600 == online_check) { + if (1800 == online_check) { online_check = 0; int Count = sql_ctl->GetTableRows(T_SENSOR_INFO(TNAME), NULL); if(Count > 0){ @@ -688,6 +688,7 @@ void InitModule() #endif #ifdef Q4G_MODULE #ifdef G2UL_GATEWAY + system("killall daemon_CM"); InitGpio(GlobalConfig::GPIO_G.commPower,1);//4G,5G模组供电, gpio_set(GlobalConfig::GPIO_G.commPower,1); InitGpio(GlobalConfig::GPIO_G.commRest,1);