Z991239-6255 #comment feat: 大机日志精简，去除cardissuer

Signed-Off-By: commit-hook

Module/mod_CardIssuerStand/CardIssuerFSM.cpp

@@ -869,7 +869,7 @@ unsigned int CCardIssuerFSM::s6_on_event(FSMEvent* pEvt)
 	else if (pEvt->iEvt == USER_EVT_JS_EJECT_FINISHED) {
 		pEvt->SetHandled();
 		if (pEvt->param1 == 0) {
-			LogEvent(Severity_Middle, LOG_EVT_CARDISSUER_STORE_OP, "CardIssuer op.");
+			LogEvent(Severity_Middle, LOG_EVT_CARDISSUER_OP, "CardIssuerStand op.");
 			m_currCardNo = "";
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("客户取走卡片");
 			return 0;
@@ -906,7 +906,7 @@ unsigned int CCardIssuerFSM::s7_on_event(FSMEvent* pEvt)
 			FetchCard evt;
 			evt.status = 0;
 			SpSendBroadcast(m_pEntity->GetFunction(), SP_MSG_OF(FetchCard), SP_MSG_SIG_OF(FetchCard), evt);
-			LogEvent(Severity_Middle, LOG_EVT_CARDISSUER_OP, "CardIssuer op.");
+			LogEvent(Severity_Middle, LOG_EVT_CARDISSUER_OP, "CardIssuerStand op.");
 			m_currCardNo = "";
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("客户取走卡片msg发送");
 			return 0;
@@ -1113,13 +1113,13 @@ void CCardIssuerFSM::s9_on_entry()
 	m_currentFSMState = 9;
 	SetDevState(DEVICE_STATUS_FAULT);
 	if (m_quickSelfcheck) {
-		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("CardIssuer in fault state, need to quickSelfcheck.");
+		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("CardIssuerStand in fault state, need to quickSelfcheck.");
 		m_testResult = Error_InvalidState;
 		QuickSelfcheckTask* task = new QuickSelfcheckTask(this);
 		GetEntityBase()->GetFunction()->PostThreadPoolTask(task);
 	}
 	else {
-		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("CardIssuer in fault state, need to reset.");
+		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("CardIssuerStand in fault state, need to reset.");
 		FSMEvent* e = new FSMEvent(USER_EVT_RESET);
 		PostEventFIFO(e);
 	}
@@ -1684,7 +1684,7 @@ ErrorCodeEnum CCardIssuerFSM::OpenDevice(BYTE btOpenType, const char* pDevSN)
 
 			if (!LoadCMBPrint(csBinPath))
 			{
-				errMsg = CSimpleStringA::Format("CardIssuer启动失败:Load CMBPrint failed.");
+				errMsg = CSimpleStringA::Format("CardIssuerStand启动失败:Load CMBPrint failed.");
 				LogWarn(Severity_Middle, Error_Unexpect, CardIssuer_UserErrorCode_LoadLibraryA_CMBPrint_Failed, errMsg.GetData());
 				return Error_DevLoadFileFailed;
 			}
@@ -1695,7 +1695,7 @@ ErrorCodeEnum CCardIssuerFSM::OpenDevice(BYTE btOpenType, const char* pDevSN)
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("OpenDevice::DevOpenEx err, port:%d, baudRate:%d, openType:%d, connectType:%d", m_adapterInfo.GetPortInt(), m_adapterInfo.GetBaudrateInt(), btOpenType, m_connectType);
 			SetErrorAndLog(eErrDev, MEC_DEVAPI_CARDISSUER_DevOpenEx, "DevAdapter::DevOpenEx", __FUNCTION__, false, l_endTime - l_beginTime, "", "");
 			
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("CardIssuer启动失败:DevOpenEx failed.重试:%d", initTries);
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("CardIssuerStand启动失败:DevOpenEx failed.重试:%d", initTries);
 			Sleep(200);
 			initTries++;
 		}
@@ -1703,7 +1703,7 @@ ErrorCodeEnum CCardIssuerFSM::OpenDevice(BYTE btOpenType, const char* pDevSN)
 
 	if (initTries != 0)
 	{
-		errMsg = CSimpleStringA::Format("CardIssuer启动失败，have tried %d times!!!", initTries);
+		errMsg = CSimpleStringA::Format("CardIssuerStand启动失败，have tried %d times!!!", initTries);
 		LogWarn(Severity_Middle, Error_Unexpect, CardIssuer_UserErrorCode_DevOpen_Failed, errMsg.GetData());
 		return Error_DevCommFailed;
 	}
@@ -1711,7 +1711,7 @@ ErrorCodeEnum CCardIssuerFSM::OpenDevice(BYTE btOpenType, const char* pDevSN)
 	{
 		eErrDev = spEntityFunction->OpenConfig(Config_Run, spConfig);
 		if (eErrDev != Error_Succeed) {
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)(CSimpleStringA::Format("CardIssuer启动失败:open run cfg file failed in OpenDevice."));
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)(CSimpleStringA::Format("CardIssuerStand启动失败:open run cfg file failed in OpenDevice."));
 			CloseAndClearDevObj(false);
 			return eErrDev;
 		}
@@ -2350,7 +2350,7 @@ int CCardIssuerFSM::InternalAcceptCard()
 		{
 			if (m_devStatus.eMedia == CI_MEDIA_PRESENT)
 			{
-				LogEvent(Severity_Middle, LOG_EVT_CARDISSUER_OP, "CardIssuer op.");
+				LogEvent(Severity_Middle, LOG_EVT_CARDISSUER_OP, "CardIssuerStand op.");
 				acceptTries = 0;
 				goto Err;
 			}
@@ -2625,7 +2625,7 @@ int CCardIssuerFSM::ReadCard_Contact(SpReqAnsContext<CardIssuerStandService_Read
 
 		if (Error_Succeed == eMagReadErr && magTracks.track[1].eStatus == CI_DATA_OK)
 		{
-			LogEvent(Severity_Middle, LOG_EVT_CARDISSUER_OP, "CardIssuer op.");
+			LogEvent(Severity_Middle, LOG_EVT_CARDISSUER_OP, "CardIssuerStand op.");
 			if (magTracks.track[1].dwSize > 40)
 			{
 				errMsg = CSimpleString::Format("MagRead, track2Size maybe wrong:t2Size:%d", magTracks.track[1].dwSize);
@@ -2899,7 +2899,7 @@ int CCardIssuerFSM::ReadCard_RF(SpReqAnsContext<CardIssuerStandService_Read_Req,
 
 		if (Error_Succeed == eMagReadErr && magTracks.track[1].eStatus == CI_DATA_OK)
 		{
-			LogEvent(Severity_Middle, LOG_EVT_CARDISSUER_OP, "CardIssuer op.");
+			LogEvent(Severity_Middle, LOG_EVT_CARDISSUER_OP, "CardIssuerStand op.");
 			if (magTracks.track[1].dwSize > 40)
 			{
 				errMsg = CSimpleString::Format("MagRead, track2Size maybe wrong:t2Size:%d", magTracks.track[1].dwSize);
@@ -3482,7 +3482,7 @@ int CCardIssuerFSM::PreOnline_RF(SpReqAnsContext<CardIssuerStandService_PreOnlin
 {
 	LOG_FUNCTION();
 	long l_beginTime, l_endTime;
-	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("(PreOnline) use cardissuer rf");
+	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("(PreOnline) use cardissuerStand rf");
 	l_beginTime = GetTickCountRVC();
 	ErrorCodeEnum eErr = m_hDevHelper->MoveCard(CI_MOVECARD_RF_POSITION);
 	l_endTime = GetTickCountRVC();
@@ -6000,7 +6000,7 @@ int CCardIssuerFSM::ReadMag(SpReqAnsContext<CardIssuerStandService_ReadJS_Req, C
 
 		if (Error_Succeed == eMagReadErr && magTracks.track[1].eStatus == CI_DATA_OK)
 		{
-			LogEvent(Severity_Middle, LOG_EVT_CARDISSUER_OP, "CardIssuer op.");
+			LogEvent(Severity_Middle, LOG_EVT_CARDISSUER_OP, "CardIssuerStand op.");
 			if (magTracks.track[1].dwSize > 40)
 			{
 				errMsg = CSimpleString::Format("MagRead, track2Size maybe wrong:t2Size:%d", magTracks.track[1].dwSize);
@@ -7200,7 +7200,7 @@ int CCardIssuerFSM::InternalInsert()
 			//成功
 			if (m_devStatus.eMedia == CI_MEDIA_PRESENT)
 			{
-				LogEvent(Severity_Middle, LOG_EVT_CARDISSUER_OP, "CardIssuer op.");
+				LogEvent(Severity_Middle, LOG_EVT_CARDISSUER_OP, "CardIssuerStand op.");
 				errRet = 0;
 				break;//插卡成功
 			}

Module/mod_ContactlessCard/ContactlessFSM.cpp

@@ -418,7 +418,7 @@ unsigned int CContactlessCardFSM::s7_on_event(FSMEvent* pEvt)
 				FetchCard evt;
 				evt.status = 0;
 				SpSendBroadcast(m_pEntity->GetFunction(),SP_MSG_OF(FetchCard),SP_MSG_SIG_OF(FetchCard),evt);
-				LogEvent(Severity_Middle,LOG_EVT_CONTACTLESS_CARD_OP,"CardIssuer op.");
+				LogEvent(Severity_Middle,LOG_EVT_CONTACTLESS_CARD_OP,"ContactlessCard op.");
 				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("客户取走卡片msg发送");
 				return 0;
 			} else if (pEvt->param1 == 1) {
@@ -965,7 +965,7 @@ int CContactlessCardFSM::AcceptCard(SpReqAnsContext<ContactlessCardService_Inser
 		{
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("insert error_succeed");
 			//FetchCard evt;
-			//evt.status = 3;//oilyang@20181210 用于通知CardIssuer取消插卡
+			//evt.status = 3;//oilyang@20181210 用于通知卡机取消插卡
 			//SpSendBroadcast(m_pEntity->GetFunction(), SP_MSG_OF(FetchCard), SP_MSG_SIG_OF(FetchCard), evt);
 
 			ctx->Ans.ICData = "";
@@ -1075,7 +1075,7 @@ int CContactlessCardFSM::AcceptCard(SpReqAnsContext<ContactlessCardService_Inser
 	{
 		//oilyang@20221212 
 		//actully，we reach here only when calling GetDevStatus failed
-		//we have ContactlessCard AND CardIssuer,no need to throw Error_Unexpect here
+		//we have ContactlessCard AND 卡机,no need to throw Error_Unexpect here
 		if (ctx != NULL)
 			ctx->Answer(Error_DevNotAvailable);
 	}