Z991239-5971 #comment 去掉健康、启动器对CardIssuer的兼容。保留检测时的名称

Module/mod_healthmanager/mod_healthmanager.cpp

@@ -1512,16 +1512,7 @@ void CHealthManagerEntity::OnEntityStateHook(const char* pszEntityName, const ch
 				m_modRunInfo[pszEntityName].bAbnormalBusy = true;
 				m_modRunInfo[pszEntityName].abnormalCount++;
 				EntityLostProcTask* task;
-				//oiltmp@20240415 to be delete after x months
-				if (_strnicmp("CardIssuer", pszEntityName, strlen(pszEntityName)) == 0)
-				{
-					if (m_sysStaticInfo.strMachineType.Compare("RVC.CardStore") == 0 || m_sysStaticInfo.strMachineType.Compare("RVC.CardPrinter") == 0)
-						task = new EntityLostProcTask(this, "CardIssuerStore");
-					else
-						task = new EntityLostProcTask(this, "CardIssuerStand");
-				}
-				else
-					task = new EntityLostProcTask(this, pszEntityName);
+				task = new EntityLostProcTask(this, pszEntityName);
 				GetFunction()->PostThreadPoolTask(task);
 			}
 		}
@@ -1583,22 +1574,7 @@ void CHealthManagerEntity::OnAnswer(CSmartPointer<IAsynWaitSp> pAsynWaitSp)
 			, SpStrError(new_entry->ErrorResult), SpStrEntityState((EntityStateEnum)new_entry->state), m_modRunInfo[new_entry->EntityName].bAbnormalBusy);
 		if (!m_modRunInfo[new_entry->EntityName].bAbnormalBusy)
 		{
-			//oiltmp@20240415 to be delete after x months
-			if (_strnicmp("CardIssuer", new_entry->EntityName.GetData(), new_entry->EntityName.GetLength()) == 0)
-			{
-				if (m_sysStaticInfo.strMachineType.Compare("RVC.CardStore") == 0 || m_sysStaticInfo.strMachineType.Compare("RVC.CardPrinter") == 0)
-				{
-					DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("ExceptionErrorProcess CardIssuerStore");
-					ExceptionErrorProcess("CardIssuerStore", new_entry->ErrorResult);
-				}
-				else
-				{
-					DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("ExceptionErrorProcess CardIssuerStand");
-					ExceptionErrorProcess("CardIssuerStand", new_entry->ErrorResult);
-				}
-			}
-			else
-				ExceptionErrorProcess((const char*)new_entry->EntityName, new_entry->ErrorResult);
+			ExceptionErrorProcess((const char*)new_entry->EntityName, new_entry->ErrorResult);
 			std::map<std::string, std::string> msgInfo;
 			msgInfo["EntityName"] = new_entry->EntityName.GetData();
 			msgInfo["SelfTestReturnCode"] = SpStrError(new_entry->ErrorResult);
@@ -1685,22 +1661,7 @@ ErrorCodeEnum CHealthManagerEntity::CheckEntity(const char* pszEntityName, Entit
 	CSmartPointer<IEntityFunctionPrivilege> pFuncPrivilege = pFunc.ConvertCase<IEntityFunctionPrivilege>();
 	CSmartPointer<IAsynWaitSp> spWait;
 	ErrorCodeEnum errCode;
-	//oiltmp@20240415 to be delete after x months
-	if (_strnicmp("CardIssuer", pszEntityName, strlen(pszEntityName)) == 0)
-	{
-		if (m_sysStaticInfo.strMachineType.Compare("RVC.CardStore") == 0 || m_sysStaticInfo.strMachineType.Compare("RVC.CardPrinter") == 0)
-		{
-			errCode = pFuncPrivilege->TestEntity("CardIssuerStore", eTestType, spWait);
-			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("TestEntity CardIssuerStore");
-		}
-		else
-		{
-			errCode = pFuncPrivilege->TestEntity("CardIssuerStand", eTestType, spWait);
-			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("TestEntity CardIssuerStand");
-		}
-	}
-	else
-		errCode = pFuncPrivilege->TestEntity(pszEntityName, eTestType, spWait);
+	errCode = pFuncPrivilege->TestEntity(pszEntityName, eTestType, spWait);
 
 	if (errCode == Error_Succeed)
 	{
@@ -1745,7 +1706,8 @@ void CHealthManagerEntity::OnSelfCheckTimeout()
 		else if (tmpTerminalStage.Compare("A") != 0)
 		{
 			//the hardward entity and some other entity no need to test
-			if (_strnicmp("PinPad", pszEntityName, strlen("PinPad")) == 0 || _strnicmp("CardIssuer", pszEntityName, strlen("CardIssuer")) == 0
+			if (_strnicmp("PinPad", pszEntityName, strlen("PinPad")) == 0 
+				|| _strnicmp("CardIssuerStand", pszEntityName, strlen("CardIssuerStand")) == 0 || _strnicmp("CardIssuerStore", pszEntityName, strlen("CardIssuerStore")) == 0
 				|| _strnicmp("ContactlessCard", pszEntityName, strlen("ContactlessCard")) == 0
 				|| _strnicmp("IDCertificate", pszEntityName, strlen("IDCertificate")) == 0
 				|| _strnicmp("gpio", pszEntityName, strlen("gpio")) == 0 || _strnicmp("HSPScanner", pszEntityName, strlen("HSPScanner")) == 0

Module/mod_vtmloader/VtmLoaderFSM.cpp

@@ -695,16 +695,7 @@ void CVtmLoaderFSM::s3_on_entry()
 		{
 		case LOADOPT_IGNORE:
 		{
-			//oiltmp@20240415 to be delete after x months
-			if (_strnicmp("CardIssuer", it->first, it->first.GetLength()) == 0)
-			{
-				if (m_sysInfo.strMachineType.Compare("RVC.CardStore") == 0 || m_sysInfo.strMachineType.Compare("RVC.CardPrinter") == 0)
-					pFuncPrivilege->StartEntity("CardIssuerStore", NULL, spWait);
-				else
-					pFuncPrivilege->StartEntity("CardIssuerStand", NULL, spWait);
-			}
-			else
-				pFuncPrivilege->StartEntity(it->first, NULL, spWait);
+			pFuncPrivilege->StartEntity(it->first, NULL, spWait);
 			if (spWait != NULL)
 				spWait->WaitAnswer(MAX_IGNORE_TIMEOUT);
 			it->second.eResult = LOADING_SUCCEED;