#IQRV #comment 去除部分无效的接口

Module/include/DevFSMCommBase.hpp

@@ -719,29 +719,6 @@ public:
 		m_errPkg.apiErrCode = apiCode;
 	}
 
-	DWORD AlarmDEC(bool bToBusiness = false, bool alarmOrNot = true) {
-		WORD wdErrCode = 0;
-		CSimpleStringA csErrMsg(true);
-		ErrorCodeEnum ec = GetAndSplitDevErrInfo(csErrMsg, wdErrCode, (LPCTSTR)m_errPkg.msgHead);
-		if (ec == Error_Succeed && wdErrCode != 0) {
-			//oilyang@20200525 if have been set ErrorCode of entity defined (not device),use it directly
-			if ((m_errPkg.apiErrCode >> 20) == m_entCode.dwEntityId)
-				UpdateDEC(m_errPkg.apiErrCode);
-			else
-				UpdateDEC(wdErrCode);
-		} else if (m_errPkg.apiErrCode != 0) {
-			UpdateDEC(m_errPkg.apiErrCode);
-		}
-		//oilyang@20200525 if have been set ErrorCode of entity defined (not device),use it directly
-		DWORD dwCode = GetAlarmDEC();
-		if (alarmOrNot) {
-            LogErrMsgEx(m_errPkg, csErrMsg, dwCode, bToBusiness);
-		} else {
-			DbgWithLink(bToBusiness ? LOG_LEVEL_ERROR : LOG_LEVEL_WARN, bToBusiness ? LOG_TYPE_USER : LOG_TYPE_SYSTEM).setAPI(m_errPkg.msgHead)("{\"DevSN\":\"%s\", \"Code\":\"%s\", \"Msg\":\"%s\"}"
-				, m_errPkg.devSN.GetData(), SpStrError(m_errPkg.devErrCode), csErrMsg.GetData());
-		}
-		return dwCode;
-	}
 	void SetErrorAndLog(ErrorCodeEnum errCode, DWORD userCode, CSimpleStringA devApi, CSimpleStringA funPath, bool bInBusiness = false, int costTime = 0, CSimpleStringA logCode = "", CSimpleStringA context = "")
 	{
 		//set error info

Module/mod_CardIssuerStand/CardIssuerFSM.cpp

@@ -1790,21 +1790,6 @@ int CCardIssuerFSM::UnAcceptCard()
 		default:
 			break;
 		}
-
-		//oilyang@20230612 delete the following lines,as no need to GetDevStatus twice
-		//long l_beginTime, l_endTime;
-		//l_beginTime = GetTickCountRVC();
-		//eErr = m_hDevHelper->SetCardInType(CI_CARD_IN_TYPE_FORBIDDEN);
-		//l_endTime = GetTickCountRVC();
-
-		//if (Error_Succeed != eErr){
-		//	SetErrPackage("UnAcceptCard::SetCardInType(CI_CARD_IN_TYPE_FORBIDDEN)", m_csDevSN, eErr, MEC_DEVAPI_CARDISSUER_SetCardInType);
-		//	AlarmDEC();
-		//} 
-		//if (GetDevStatus())
-		//	return 0;
-		//else
-		//	return 1;
 	}
 	else
 	{
@@ -4135,8 +4120,6 @@ ErrorCodeEnum CCardIssuerFSM::MachineMoveCardFrontGate(bool bInBussiness)
 			SetErrorAndLog(eMoveFrontGate, CardIssuer_UserErrorCode_MoveCardToGate_Failed, "DevAdapter::MoveCard", __FUNCTION__, bInBussiness, l_endTime - l_beginTime, "QLR040220305", "");
 		
 		}
-		//AlarmDEC(bInBussiness);
-			
 	}
 	else {
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::MoveCard").setCostTime(l_endTime - l_beginTime)("MachineMoveCardFrontGate::MoveCard");

Module/mod_FingerPrint/FingerPrintFSM.cpp

@@ -390,23 +390,13 @@ int CFingerPrintFSM::Initial()
 
 ErrorCodeEnum CFingerPrintFSM::OnExit()
 {
-	CSimpleStringA tmpDevSN("");
-	GetEntityBase()->GetFunction()->GetSysVar("FWBDevSN", tmpDevSN);
-	if (tmpDevSN.GetLength() > 12 && tmpDevSN.IndexOf("FWB") > 2)
+	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("This is normal device.");
+	if (m_hDevHelper != nullptr)
 	{
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("This is fwb device, DevSN:%s", tmpDevSN.GetData());
-		return Error_Succeed;
-	}
-	else
-	{
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("This is normal device.");
-		if (m_hDevHelper != nullptr)
-		{
-			m_hDevHelper.TearDown();
-			m_bOpened = false;
-		}
-		return Error_Succeed;
+		m_hDevHelper.TearDown();
+		m_bOpened = false;
 	}
+	return Error_Succeed;
 }
 
 #pragma endregion