Z991239-5470 #comment feat: 准入实体，增加pinpad在线判断

Module/mod_accessauth/AccessAuthFSM.cpp

@@ -1186,8 +1186,8 @@ DWORD CAccessAuthFSM::GetEncTerminalInfo(CBlob& encInfo)
 	strncpy(pInfo->szTerminalNo, (const char*)si.strTerminalID, sizeof(pInfo->szTerminalNo) - 1);
 
 	CSimpleStringA strPinPadID = "", strDeviceID = "";
-	bool bHasPinPad = false;
-	int nRet = ((CAccessAuthEntity*)m_pEntity)->GetPinPadIDAndDeviceID(strPinPadID, strDeviceID, bHasPinPad);
+	bool isPinPadMac = false, bPinPadOnline = false;
+	int nRet = ((CAccessAuthEntity*)m_pEntity)->GetPinPadIDAndDeviceID(strPinPadID, strDeviceID, isPinPadMac, bPinPadOnline);
 	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("GetPinPadIDAndDeviceID ret: %d, PinPadID: %s, DeviceID: %s", nRet, (const char*)strPinPadID, (const char*)strDeviceID);
 	if (nRet == 2 || nRet == 3) {
 		strncpy(pInfo->szPadDeviceID, (const char*)strDeviceID, sizeof(pInfo->szPadDeviceID) - 1);
@@ -1364,8 +1364,8 @@ DWORD CAccessAuthFSM::GetTokenReq(CAccessAuthGetTokenReq* getTokenReq)
 	getTokenReq->sessionTempPubKey = tmpStr;
 
 	CSimpleStringA strPinPadID = "", strDeviceID = "";
-	bool bHasPinPad = false;
-	int nRet = ((CAccessAuthEntity*)m_pEntity)->GetPinPadIDAndDeviceID(strPinPadID, strDeviceID, bHasPinPad);
+	bool isPinPadMac = false, bPinPadOnline = false;
+	int nRet = ((CAccessAuthEntity*)m_pEntity)->GetPinPadIDAndDeviceID(strPinPadID, strDeviceID, isPinPadMac, bPinPadOnline);
 	getTokenReq->pinPadID = strPinPadID.GetData();
 	if (pEntity->HasPinPad()) 
 	{
@@ -1410,9 +1410,9 @@ void CAccessAuthFSM::UpdateWK()
 	LOG_FUNCTION();
 	auto pEntity = ((CAccessAuthEntity*)m_pEntity);
 	CSimpleStringA strPinPadID = "", strDeviceID = "";
-	bool bHasPinPad = false;
-	pEntity->GetPinPadIDAndDeviceID(strPinPadID, strDeviceID, bHasPinPad);
-	if (bHasPinPad) {
+	bool isPinPadMac = false, bPinPadOnline = false;
+	pEntity->GetPinPadIDAndDeviceID(strPinPadID, strDeviceID, isPinPadMac, bPinPadOnline);
+	if (bPinPadOnline) {
 		CSmartPointer<UpdateWKTask> updateWKTask = new UpdateWKTask(this, pEntity);
 		GetEntityBase()->GetFunction()->PostThreadPoolTask(updateWKTask.GetRawPointer());
 	}