diff --git a/jsonparse/web_cmd_parse3.cpp b/jsonparse/web_cmd_parse3.cpp index 1d7ac40..f457f85 100644 --- a/jsonparse/web_cmd_parse3.cpp +++ b/jsonparse/web_cmd_parse3.cpp @@ -1093,7 +1093,7 @@ std::string JsonData::JsonCmd_Cgi_65(Param_65 ¶m){ jsonVal[JSON_FIELD_CMD] = "65"; jsonVal["success"] = true; jsonVal["message"] = " "; - array_t vetRes = sqlite_db_ctrl::instance().GetDataMultiLineTransaction(T_SENSOR_INFO(TNAME), " dataNodeName,MeasurementID ", NULL); + array_t vetRes = sqlite_db_ctrl::instance().GetDataMultiLineTransaction(T_SENSOR_INFO(TNAME), " dataNodeName,MeasurementID,RSSI ", NULL); size_t nSize = vetRes.size(); std::string MeasurementID = ""; char szTableName[100] = {0x00}, whereCon[256] = {0x00}; @@ -1142,7 +1142,7 @@ std::string JsonData::JsonCmd_Cgi_65(Param_65 ¶m){ "COUNT(*) FILTER (WHERE data_nodeno = '%s-Z') AS recive_z " "FROM ( " "SELECT * FROM receive_wave_status " - "WHERE timeStamp BETWEEN '%s' AND '%s');",MeasurementID.c_str(),MeasurementID.c_str(),MeasurementID.c_str(),param.timeStart.c_str(),param.timeEnd.c_str()); + "WHERE error_code = 1 and timeStamp BETWEEN '%s' AND '%s');",MeasurementID.c_str(),MeasurementID.c_str(),MeasurementID.c_str(),param.timeStart.c_str(),param.timeEnd.c_str()); vec_t vecResult2 = sqlite_db_ctrl::instance().GetDataSingleLine(count_sql); if (vecResult2.size() > 0) { @@ -1183,6 +1183,13 @@ std::string JsonData::JsonCmd_Cgi_65(Param_65 ¶m){ iTem.append((float(send_z)/(interval/waveInterVal))); iTem.append(send_z); } + std::vector vRssi; + boost::split(vRssi, vetRes[i][2], boost::is_any_of(","), boost::token_compress_on); + if (vRssi.size() > 0 ){ + iTem.append(vRssi[0]); + iTem.append(vRssi[1]); + } + jsBody.append(iTem); } diff --git a/uart/uart.cpp b/uart/uart.cpp index ecec87c..5701a83 100644 --- a/uart/uart.cpp +++ b/uart/uart.cpp @@ -561,7 +561,7 @@ int Uart::DealFeatureValue(const char *pData,uint16_t ushortAdd){ std::string nowTimetamp = std::string(localtimestamp); long now_time = atol(nowTimetamp.c_str()); if(ushortAdd == last_short_addr && (now_time - last_time) < 5){ - zlog_info(zct, "DealFeatureValue short_addr_last = %02x%02x,timestamp_last = %ld,nowTime = %ld",UINT16_HIGH(ushortAdd), UINT16_LOW(ushortAdd),last_time,now_time); + zlog_warn(zct, "DealFeatureValue short_addr_last = %02x%02x,timestamp_last = %ld,nowTime = %ld",UINT16_HIGH(ushortAdd), UINT16_LOW(ushortAdd),last_time,now_time); int iRet = DealDataNodeFeature(pData, 0); if (iRet != 0) { @@ -593,7 +593,7 @@ void Uart::DealRecvData(const char *pData) { std::string nowTimetamp = std::string(localtimestamp); long now_time = atol(nowTimetamp.c_str()); if(ushortAdd == last_short_addr && (now_time - last_time) < 5){ - zlog_warn(zct, "DealFeatureValue short_addr_last = %02x%02x,timestamp_last = %ld,nowTime = %ld",UINT16_HIGH(ushortAdd), UINT16_LOW(ushortAdd),last_time,now_time); + zlog_warn(zct, "WAVE_COMPRESS | UPGRADE_ASK short_addr_last = %02x%02x,timestamp_last = %ld,nowTime = %ld",UINT16_HIGH(ushortAdd), UINT16_LOW(ushortAdd),last_time,now_time); return ; } GetTimeNet(localtimestamp, 1);