update log

YAServerDlg.cpp

@@ -454,6 +454,7 @@ UINT thread_cell(LPVOID lparam)//
 	{
 		//处理格子信息
 		int nRet = dlg->ModifyCardInfo();
+		Sleep(1);
 	}
 	return 0;
 }
@@ -12916,6 +12917,13 @@ void CYAServerDlg::ReadFileTest()
 		dist->acce_state_last = card->accelerate_state_last;
 		dist->ins_direction = card->ins_direction;
 
+		if (card->card_id == "0020000001074" && card->accelerate_state != 0)
+		{
+			char log[100] = {0};
+			sprintf_s(log,"card_id: %s, as: %d",card->card_id.c_str(),card->accelerate_state);
+			Log::write_log(FILE_TYPE::SYS_S,log,true);
+		}
+
 		card->add_dist(dist);
 
 		if (card->m_afmData.bStatus)
@@ -12933,13 +12941,41 @@ void CYAServerDlg::ReadFileTest()
 			Log::write_log(FILE_TYPE::DISTXX_S, strlog, true);
 
 
-			memset(chlog, 0, MAX_LOG_LENGTH);
+			/*memset(chlog, 0, MAX_LOG_LENGTH);
 			sprintf_s(chlog, "sn:%d, ox: %f, oy: %f, x: %f, y: %f, z: %f, iw: %f, uw: %f, as: %d, asl: %d, ct: %d, ov: %f, cv: %f, av: %f, lsn: %d, cardid: %s", 
-				card->m_nCalcSyncNum,card->origin_locate.x,card->origin_locate.y,card->x, card->y,card->z,card->ins_weight,
-				card->uwb_weight,card->accelerate_state,card->accelerate_state_last,card->time_stamp_cal,card->origin_locate.v,
-				card->get_speed(),card->last_locate.acceleration,card->m_nSyncNumInList,card->card_id.c_str());
+			card->m_nCalcSyncNum,card->origin_locate.x,card->origin_locate.y,card->x, card->y,card->z,card->ins_weight,
+			card->uwb_weight,card->accelerate_state,card->accelerate_state_last,card->time_stamp_cal,card->origin_locate.v,
+			card->get_speed(),card->last_locate.acceleration,card->m_nSyncNumInList,card->card_id.c_str());
 			strlog = chlog;
-			Log::write_log(FILE_TYPE::KALMAN_S,strlog,true);
+			Log::write_log(FILE_TYPE::KALMAN_S,strlog,true);*/
+
+			std::string flag1 = card->is_fit_pos?"Y":"N";
+			int nSource1 = 0;
+			if (card->last_cell)
+			{
+				nSource1 = card->last_cell->dataSource;
+			}		
+			char chLog1[300] = {0};
+			sprintf_s(chLog1,"cardid: %s, sync_num: %d, ct: %d, ox: %f, oy: %f, x: %f,y: %f, readerName: %s, cellId : %d, originId: %d, oReaderName: %s, ov: %f, cv: %f, fit: %s, source: %d",
+				card->card_id.c_str(),
+				card->m_nCalcSyncNum,
+				card->time_stamp_cal,
+				card->origin_locate.x,
+				card->origin_locate.y,
+				card->x, 
+				card->y,
+				card->curCellReaderName.c_str(),
+				card->curCellId,
+				card->originCellId,
+				card->originCellReaderName.c_str(),
+				card->origin_locate.v,
+				card->get_speed(),
+				flag1.c_str(),
+				nSource1);
+
+			std::string strLog1 = "";
+			strLog1 = chLog1;
+			Log::write_log(FILE_TYPE::KALMAN_S,strLog1,true);
 
 			card->last_x = card->x;
 			card->last_y = card->y;
@@ -12960,13 +12996,13 @@ void CYAServerDlg::ReadFileTest()
 			strlog = chlog;
 			Log::write_log(FILE_TYPE::DISTXX_S, strlog, true);
 
-			memset(chlog, 0, MAX_LOG_LENGTH);
+			/*memset(chlog, 0, MAX_LOG_LENGTH);
 			sprintf_s(chlog, "sn:%d, ox: %f, oy: %f, x: %f, y: %f, as: %d, ct: %d, ov: %f, cv: %f, av: %f, lsn: %d, cardid: %s", 
 				card->m_nCalcSyncNum,card->origin_locate.x,card->origin_locate.y,card->x, card->y,
 				card->accelerate_state,card->time_stamp_cal,card->origin_locate.v,
 				card->get_speed(),card->last_locate.acceleration,card->m_nSyncNumInList,card->card_id.c_str());
 			strlog = chlog;
-			Log::write_log(FILE_TYPE::KALMAN_S,strlog,true);
+			Log::write_log(FILE_TYPE::KALMAN_S,strlog,true);*/
 
 			card->last_x = card->x;
 			card->last_y = card->y;
@@ -13199,55 +13235,83 @@ int CYAServerDlg::ModifyCardInfo()
 		}
 
 		nCounts++;
-
-		char sql[LENGTH_SQL] = {0};
-		char chTime[STR_LEN_TIME] = {0};
-		char chIntervalTime[STR_LEN_TIME] = {0};
-		//确定下面不是Interval_time?@lsp
-		sprintf_s(chTime,
-		STR_LEN_TIME,
-		"%u-%u-%u %u:%u:%u.%u",
-		it->second->cellDealTime.wYear,
-		it->second->cellDealTime.wMonth,
-		it->second->cellDealTime.wDay,
-		it->second->cellDealTime.wHour,
-		it->second->cellDealTime.wMinute,
-		it->second->cellDealTime.wSecond,
-		it->second->cellDealTime.wMilliseconds);
-
-		sprintf_s(chIntervalTime,
-		STR_LEN_TIME,
-		"%u-%u-%u %u:%u:%u.%u",
-		it->second->last_cell->interval_time.wYear,
-		it->second->last_cell->interval_time.wMonth,
-		it->second->last_cell->interval_time.wDay,
-		it->second->last_cell->interval_time.wHour,
-		it->second->last_cell->interval_time.wMinute,
-		it->second->last_cell->interval_time.wSecond,
-		it->second->last_cell->interval_time.wMilliseconds);
-
-		std::string strTime = "";
-		strTime = chIntervalTime;
-		sprintf_s(sql,
-		LENGTH_SQL,
-		"insert ignore into his_cell_location(card_id,cur_time,interval_time,origin_reader_name,origin_cell_id,real_reader_name,real_cell_id,card_stamp_time,isFit,speed,mileage,map_id,area_id) values('%s','%s','%s','%s',%d,'%s',%d,%d,%d,%.4f,%.4f,%d,%d);",
-		it->second->card_id.c_str(),
-		chTime,
-		chIntervalTime,
-		it->second->originCellReaderName.c_str(),
-		it->second->originCellId,
-		it->second->curCellReaderName.c_str(),
-		it->second->curCellId,
-		it->second->time_stamp_last,
-		it->second->is_fit_pos,
-		it->second->get_speed(),
-		it->second->mileage,
-		it->second->map_id,
-		it->second->area_id);
-		std::string strSql = "";
-		strSql = sql;
-		strContent += strSql;
-		it->second->locateCounts++;
+		
+		std::string flag1 = it->second->is_fit_pos?"Y":"N";
+		int nSource1 = 2;
+		if (it->second->last_cell)
+		{
+			nSource1 = it->second->last_cell->dataSource;
+		}		
+		char chLog1[300] = {0};
+		sprintf_s(chLog1,"cardid: %s, sync_num: %d, ct: %d, ox: %f, oy: %f, x: %f,y: %f, readerName: %s, cellId : %d, originId: %d, oReaderName: %s, ov: %f, cv: %f, fit: %s, source: %d",
+			it->second->card_id.c_str(),
+			it->second->m_nCalcSyncNum,
+			it->second->time_stamp_cal,
+			it->second->origin_locate.x,
+			it->second->origin_locate.y,
+			it->second->x, 
+			it->second->y,
+			it->second->curCellReaderName.c_str(),
+			it->second->curCellId,
+			it->second->originCellId,
+			it->second->originCellReaderName.c_str(),
+			it->second->origin_locate.v,
+			it->second->get_speed(),
+			flag1.c_str(),
+			nSource1);
+
+		std::string strLog1 = "";
+		strLog1 = chLog1;
+		Log::write_log(FILE_TYPE::KALMAN_S,strLog1,true);
+
+		//char sql[LENGTH_SQL] = {0};
+		//char chTime[STR_LEN_TIME] = {0};
+		//char chIntervalTime[STR_LEN_TIME] = {0};
+		////确定下面不是Interval_time?@lsp
+		//sprintf_s(chTime,
+		//	STR_LEN_TIME,
+		//	"%u-%u-%u %u:%u:%u.%u",
+		//	it->second->cellDealTime.wYear,
+		//	it->second->cellDealTime.wMonth,
+		//	it->second->cellDealTime.wDay,
+		//	it->second->cellDealTime.wHour,
+		//	it->second->cellDealTime.wMinute,
+		//	it->second->cellDealTime.wSecond,
+		//	it->second->cellDealTime.wMilliseconds);
+
+		//sprintf_s(chIntervalTime,
+		//	STR_LEN_TIME,
+		//	"%u-%u-%u %u:%u:%u.%u",
+		//	it->second->last_cell->interval_time.wYear,
+		//	it->second->last_cell->interval_time.wMonth,
+		//	it->second->last_cell->interval_time.wDay,
+		//	it->second->last_cell->interval_time.wHour,
+		//	it->second->last_cell->interval_time.wMinute,
+		//	it->second->last_cell->interval_time.wSecond,
+		//	it->second->last_cell->interval_time.wMilliseconds);
+
+		//std::string strTime = "";
+		//strTime = chIntervalTime;
+		//sprintf_s(sql,
+		//	LENGTH_SQL,
+		//	"insert ignore into his_cell_location(card_id,cur_time,interval_time,origin_reader_name,origin_cell_id,real_reader_name,real_cell_id,card_stamp_time,isFit,speed,mileage,map_id,area_id) values('%s','%s','%s','%s',%d,'%s',%d,%d,%d,%.4f,%.4f,%d,%d);",
+		//	it->second->card_id.c_str(),
+		//	chTime,
+		//	chIntervalTime,
+		//	it->second->originCellReaderName.c_str(),
+		//	it->second->originCellId,
+		//	it->second->curCellReaderName.c_str(),
+		//	it->second->curCellId,
+		//	it->second->time_stamp_last,
+		//	it->second->is_fit_pos,
+		//	it->second->get_speed(),
+		//	it->second->mileage,
+		//	it->second->map_id,
+		//	it->second->area_id);
+		//std::string strSql = "";
+		//strSql = sql;
+		//strContent += strSql;
+		//it->second->locateCounts++;
 	}
 	if (strContent != "")
 	{
@@ -13537,14 +13601,14 @@ void CYAServerDlg::deal_card_msg( std::shared_ptr<Card> card/*Card* card*/, bool
 					strlog = chlog;
 					Log::write_log(FILE_TYPE::DISTEX_S, strlog, true);
 
-					memset(chlog, 0, MAX_LOG_LENGTH);
-					sprintf_s(chlog, "sn:%d, ox: %f, oy: %f, x: %f, y: %f, z: %f, iw: %f, uw: %f, as: %d, asl: %d, ct: %d, ov: %f, cv: %f, av: %f, lsn: %d, cardid: %s", 
-					//sprintf_s(chlog, "%d,%f,%f,%f,%f,%f,iw: %f,uw: %f,as: %d,asl: %d,ct: %d, ov: %f,cv: %f,av: %f, lsn: %d,cardid: %s", 
-						card->m_nCalcSyncNum,card->origin_locate.x,card->origin_locate.y,card->x, card->y,card->z,card->ins_weight,
-						card->uwb_weight,card->accelerate_state,card->accelerate_state_last,card->time_stamp_cal,card->origin_locate.v,
-						card->get_speed(),card->last_locate.acceleration,card->m_nSyncNumInList,card->card_id.c_str());
-					strlog = chlog;
-					Log::write_log(FILE_TYPE::KALMAN_S,strlog,true);
+					//memset(chlog, 0, MAX_LOG_LENGTH);
+					//sprintf_s(chlog, "sn:%d, ox: %f, oy: %f, x: %f, y: %f, z: %f, iw: %f, uw: %f, as: %d, asl: %d, ct: %d, ov: %f, cv: %f, av: %f, lsn: %d, cardid: %s", 
+					////sprintf_s(chlog, "%d,%f,%f,%f,%f,%f,iw: %f,uw: %f,as: %d,asl: %d,ct: %d, ov: %f,cv: %f,av: %f, lsn: %d,cardid: %s", 
+					//	card->m_nCalcSyncNum,card->origin_locate.x,card->origin_locate.y,card->x, card->y,card->z,card->ins_weight,
+					//	card->uwb_weight,card->accelerate_state,card->accelerate_state_last,card->time_stamp_cal,card->origin_locate.v,
+					//	card->get_speed(),card->last_locate.acceleration,card->m_nSyncNumInList,card->card_id.c_str());
+					//strlog = chlog;
+					//Log::write_log(FILE_TYPE::KALMAN_S,strlog,true);
 
 					card->last_x = card->x;
 					card->last_y = card->y;

classdef.cpp

@@ -1400,9 +1400,9 @@ int Card::algo_tdoa_1d(int cnt)
 		{
 			acce_cur_state = ACCELERATE_STATE::STATE_ACCE_IDLING;	//µ¡ËÙ״̬
 #ifdef _DEBUG
-			char msg[100] = {0};
-			sprintf_s(msg,"card:%s is idling,the card's ct is %d",card_id.c_str(),time_stamp_cal);
-			Log::write_log(FILE_TYPE::SYS_S,msg,true);
+			//char msg[100] = {0};
+			//sprintf_s(msg,"card:%s is idling,the card's ct is %d",card_id.c_str(),time_stamp_cal);
+			//Log::write_log(FILE_TYPE::SYS_S,msg,true);
 #endif	
 		}else{
 			if (ret == 0)
@@ -1929,38 +1929,38 @@ void Card::get_coordinate( int cnt )
 		this->output_y = this->y;
 	}
 
-	if ((isNeedWrited || nStartLocateCounts<6) && sync_num > 0)
+	/*if ((isNeedWrited || nStartLocateCounts<6) && sync_num > 0)
 	{
-		std::string flag1 = is_fit_pos?"Y":"N";
-		int nSource1 = 0;
-		if (last_cell)
-		{
-			nSource1 = last_cell->dataSource;
-		}		
-		char chLog1[300] = {0};
-		sprintf_s(chLog1,"cardid: %s, sync_num: %d, ct: %d, ox: %f, oy: %f, x: %f,y: %f, readerName: %s, cellId : %d, originId: %d, oReaderName: %s, ov: %f, cv: %f, fit: %s, source: %d",
-			card_id.c_str(),
-			m_nCalcSyncNum,
-			time_stamp_cal,
-			origin_locate.x,
-			origin_locate.y,
-			x, 
-			y,
-			curCellReaderName.c_str(),
-			curCellId,
-			originCellId,
-			originCellReaderName.c_str(),
-			origin_locate.v,
-			get_speed(),
-			flag1.c_str(),
-			nSource1);
-			
-		std::string strLog1 = "";
-		strLog1 = chLog1;
-		Log::write_log(FILE_TYPE::KALMAN_S,strLog1,true);
-		
-		isNeedWrited = false;
-	}
+	std::string flag1 = is_fit_pos?"Y":"N";
+	int nSource1 = 0;
+	if (last_cell)
+	{
+	nSource1 = last_cell->dataSource;
+	}		
+	char chLog1[300] = {0};
+	sprintf_s(chLog1,"cardid: %s, sync_num: %d, ct: %d, ox: %f, oy: %f, x: %f,y: %f, readerName: %s, cellId : %d, originId: %d, oReaderName: %s, ov: %f, cv: %f, fit: %s, source: %d",
+	card_id.c_str(),
+	m_nCalcSyncNum,
+	time_stamp_cal,
+	origin_locate.x,
+	origin_locate.y,
+	x, 
+	y,
+	curCellReaderName.c_str(),
+	curCellId,
+	originCellId,
+	originCellReaderName.c_str(),
+	origin_locate.v,
+	get_speed(),
+	flag1.c_str(),
+	nSource1);
+
+	std::string strLog1 = "";
+	strLog1 = chLog1;
+	Log::write_log(FILE_TYPE::KALMAN_S,strLog1,true);
+
+	isNeedWrited = false;
+	}*/
 }
 
 void Card::get_coordinate()
@@ -6529,9 +6529,6 @@ int Card::colourfulCloudsChasingTheMoon(std::shared_ptr<Cell> &cell, std::list<s
 	}	
 }
 
-/*
- * 
-*/
 //int Card::DiscreteLocate(int cnt)
 //{
 //	try{

config.ini

@@ -10,7 +10,7 @@ usedb=0
 [SERVER_SETTING]
 websocket_url=ws://localhost:8086/
 tcp_host=0.0.0.0
-tcp_port=9700
+tcp_port=9800
 interval_send_json_postion=1000
 interval_send_json_counting=10000
 interval_send_json_alarm=10000

debug_server/debug_server_socket.cpp

@@ -117,6 +117,7 @@ DWORD WINAPI WorkerThread(LPVOID lpParam)
                 }
             }
         }
+		Sleep(1);
     }
 }
 
@@ -187,5 +188,6 @@ int parserMsg(SOCKET s, char *msg)
 		    }
 		}
 	}
+
 	return OK;
 }