Prechádzať zdrojové kódy

add system analysis count

zhengwei 8 rokov pred
rodič
commit
3c32c09062
2 zmenil súbory, kde vykonal 20 pridanie a 8 odobranie
  1. 13 1
      YAServerDlg.cpp
  2. 7 7
      system_basic_info/SystemAnalysis.h

+ 13 - 1
YAServerDlg.cpp

@@ -2140,11 +2140,17 @@ void CYAServerDlg::parse_package_data(BYTE* DataBuffer, int nLen, DWORD dwConnID
 			parse_data_locate_reader(DataBuffer, nCurPos, nLen, dwConnID, reader_id);
 			ReaderMap::iterator it = mp_reader_list.find(reader_id);
 			if(it != mp_reader_list.end()){
+				LOCATION_SYSTEM_BRANCH(LOCATION_SYSTEM_BRANCH_61);
 				while(nCurPos < nLen - (int)sizeof(WORD)){ // 减去crc
 				    LOCATION_SYSTEM_BRANCH(LOCATION_SYSTEM_BRANCH_13);
 					parse_data_locate_card(DataBuffer, nCurPos, reader_id, wChr);
 				}
 			}
+			else
+			{
+			    LOCATION_SYSTEM_BRANCH(LOCATION_SYSTEM_BRANCH_62);
+				debug_print_syslog(0, "CHAR_LOCATEDATA reader_id:%d\n", reader_id);
+			}
 			break;
 		}
 	case CHAR_LOCATEDATA_TDOA:
@@ -2154,7 +2160,7 @@ void CYAServerDlg::parse_package_data(BYTE* DataBuffer, int nLen, DWORD dwConnID
 
 			ReaderMap::iterator it = mp_reader_list.find(reader_id);
 			if(it != mp_reader_list.end()){
-				LOCATION_SYSTEM_BRANCH(LOCATION_SYSTEM_BRANCH_61);
+				LOCATION_SYSTEM_BRANCH(LOCATION_SYSTEM_BRANCH_63);
 				while(nCurPos < nLen - (int)sizeof(WORD)){ // 减去crc
 				    LOCATION_SYSTEM_BRANCH(LOCATION_SYSTEM_BRANCH_14);
 					parse_data_locate_card(DataBuffer, nCurPos, reader_id, wChr);
@@ -2173,6 +2179,8 @@ void CYAServerDlg::parse_package_data(BYTE* DataBuffer, int nLen, DWORD dwConnID
 			g_is_rec_hist = true;
 			parse_data_locate_reader_his(DataBuffer, nLen, nCurPos, reader_id, nTick, strtime, wChr);
 			while(nCurPos < nLen - (int)sizeof(WORD)){ // 减去crc
+			    LOCATION_SYSTEM_BRANCH(LOCATION_SYSTEM_BRANCH_64);
+			    debug_print_syslog(0, "CHAR_LOCATEDATAHIS reader_id:%d\n", reader_id);
 				parse_data_locate_card_his(DataBuffer, nCurPos, reader_id, nTick, strtime, wChr);
 			}
 			break;
@@ -2187,11 +2195,13 @@ void CYAServerDlg::parse_package_data(BYTE* DataBuffer, int nLen, DWORD dwConnID
 			TRACE(_T("new byte  = %d \r\n"),nLen);
 			while(nCurPos < nLen - (int)sizeof(WORD)){ // 减去crc
 				// 获取一条记录的长度
+				LOCATION_SYSTEM_BRANCH(LOCATION_SYSTEM_BRANCH_65);
 				WORD wframelen  = 0;
 				CFunctions::getWord(DataBuffer, &wframelen, nCurPos);
 				nCurPos += sizeof(WORD);
 
 				if(bt){
+					LOCATION_SYSTEM_BRANCH(LOCATION_SYSTEM_BRANCH_66);
 					memset(bt, 0, nLen);
 					memcpy(bt, &DataBuffer[nCurPos], wframelen);
 					parse_data_locate_card_his_tdoa(bt, wframelen, reader_id, nTick, strtime);
@@ -2227,7 +2237,9 @@ void CYAServerDlg::parse_package_data(BYTE* DataBuffer, int nLen, DWORD dwConnID
 			parse_data_locate_reader(DataBuffer, nCurPos, nLen, dwConnID, reader_id);
 			ReaderMap::iterator it = mp_reader_list.find(reader_id);
 			if(it != mp_reader_list.end()){
+				LOCATION_SYSTEM_BRANCH(LOCATION_SYSTEM_BRANCH_67);
 				while(nCurPos < nLen - (int)sizeof(WORD)){ // 减去crc
+				    LOCATION_SYSTEM_BRANCH(LOCATION_SYSTEM_BRANCH_68);
 					parse_data_adhoc(DataBuffer, nCurPos, reader_id);
 				}
 			}

+ 7 - 7
system_basic_info/SystemAnalysis.h

@@ -67,13 +67,13 @@ typedef enum StationSyncBasicBranch
     LOCATION_SYSTEM_BRANCH_59,        //used
     LOCATION_SYSTEM_BRANCH_60,        //used
     LOCATION_SYSTEM_BRANCH_61,        //used
-    LOCATION_SYSTEM_BRANCH_62,
-    LOCATION_SYSTEM_BRANCH_63,
-    LOCATION_SYSTEM_BRANCH_64,
-    LOCATION_SYSTEM_BRANCH_65,
-    LOCATION_SYSTEM_BRANCH_66,
-    LOCATION_SYSTEM_BRANCH_67,
-    LOCATION_SYSTEM_BRANCH_68,
+    LOCATION_SYSTEM_BRANCH_62,        //used
+    LOCATION_SYSTEM_BRANCH_63,        //used
+    LOCATION_SYSTEM_BRANCH_64,        //used
+    LOCATION_SYSTEM_BRANCH_65,        //used
+    LOCATION_SYSTEM_BRANCH_66,        //used
+    LOCATION_SYSTEM_BRANCH_67,        //used
+    LOCATION_SYSTEM_BRANCH_68,        //used
     LOCATION_SYSTEM_BRANCH_69,
     LOCATION_SYSTEM_BRANCH_70,
     LOCATION_SYSTEM_BRANCH_71,