#IQRV #comment VTMLoader 机型函数重构

Module/mod_vtmloader/VtmLoaderFSM.cpp

@@ -1973,7 +1973,7 @@ void CVtmLoaderFSM::CheckDeviceEntity(SpReqAnsContext<VtmLoaderService_CheckDevi
 	//oiltmp@20240415 to be delete after x months
 	if (ctx->Req.entityName.Compare("CardIssuer") == 0)
 	{
-		if (m_sysInfo.strMachineType.Compare("RVC.CardStore") == 0 || m_sysInfo.strMachineType.Compare("RVC.CardPrinter") == 0)
+		if (isNotStandMachine())
 			csEntityName = "CardIssuerStore";
 		else
 			csEntityName = "CardIssuerStand";
@@ -2116,7 +2116,7 @@ void CVtmLoaderFSM::CheckDeviceBaseEntity(SpReqAnsContext<VtmLoaderService_Check
 	//oiltmp@20240415 to be delete after x months
 	if (ctx->Req.entityName.Compare("CardIssuer") == 0)
 	{
-		if (m_sysInfo.strMachineType.Compare("RVC.CardStore") == 0 || m_sysInfo.strMachineType.Compare("RVC.CardPrinter") == 0)
+		if (isNotStandMachine())
 			csEntityName = "CardIssuerStore";
 		else
 			csEntityName = "CardIssuerStand";
@@ -2353,7 +2353,7 @@ void CVtmLoaderFSM::CheckDeviceBaseEntity(SpReqAnsContext<VtmLoaderService_Check
 	case 0x203: //CardIssuerStand
 	case 0x220: //CardIssuerStore
 	{
-		if (m_sysInfo.strMachineType.Compare("RVC.CardStore") == 0 || m_sysInfo.strMachineType.Compare("RVC.CardPrinter") == 0)
+		if (isNotStandMachine())
 		{
 			CardIssuerStoreService_ClientBase* pClient = new CardIssuerStoreService_ClientBase(this->m_pEntity);
 			if (pClient != NULL)
@@ -2811,8 +2811,7 @@ bool CVtmLoaderFSM::CheckConfigInfoInTestRoom()
 		{
 			return true;
 		}
-		if (m_sysInfo.strMachineType.Compare("RVC.Stand2S") != 0 && m_sysInfo.strMachineType.Compare("RVC.CardStore")
-			&& m_sysInfo.strMachineType.Compare("RVC.CardPrinter") && m_sysInfo.strMachineType.Compare("RVC.Stand1SPlus"))
+		if (isIllegalMachine())
 		{
 			if (m_sysInfo.strMachineType.IsNullOrEmpty())
 				LogWarn(Severity_High, Error_Unexpect, VtmLoader_BootInfoPrint, CSimpleStringA::Format("机型machineType配置为空，请检查", m_sysInfo.strMachineType.GetData()));

Module/mod_vtmloader/VtmLoaderFSM.h

@@ -204,6 +204,15 @@ private:
 	void ToCheckIfInstalling();
 	void DoSpecialJobInTestRoom();
 
+
+	bool isNotStandMachine() {
+		return (m_sysInfo.strMachineType.Compare("RVC.CardStore") == 0 || m_sysInfo.strMachineType.Compare("RVC.CardPrinter") == 0);
+	}
+	bool isIllegalMachine() {
+		return (m_sysInfo.strMachineType.Compare("RVC.Stand2S") != 0 && m_sysInfo.strMachineType.Compare("RVC.CardStore")
+			&& m_sysInfo.strMachineType.Compare("RVC.CardPrinter") && m_sysInfo.strMachineType.Compare("RVC.Stand1SPlus"));
+	}
+
 private:
 	CSystemStaticInfo m_sysInfo;
 	CSimpleStringA m_csErrEntity, m_defaultSystemId, m_terminalNoFromWeb, m_csEntityList;