Bladeren bron

Z991239-6292 #comment feat: 优化卡机日志

Signed-Off-By: commit-hook
刘文涛80174520 3 maanden geleden
bovenliggende
commit
add80f59ed
1 gewijzigde bestanden met toevoegingen van 13 en 13 verwijderingen
  1. 13 13
      Module/mod_CardIssuerStand/CardIssuerStandFSM.cpp

+ 13 - 13
Module/mod_CardIssuerStand/CardIssuerStandFSM.cpp

@@ -255,7 +255,7 @@ unsigned int CCardIssuerFSM::s2_on_event(FSMEvent* pEvt)
 				pGMEE->ctx->Ans.reserved1[i] = 0;
 				pGMEE->ctx->Ans.reserved2[i] = "";
 			}
-			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_USER)("GetMaterial CardBoxNo (%d):%s, PsbCode:%s, PsbName:%s, CardInit:%d, remains:%d, issued:%d, mixed:%d,",i,
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("GetMaterial CardBoxNo (%d):%s, PsbCode:%s, PsbName:%s, CardInit:%d, remains:%d, issued:%d, mixed:%d,",i,
 				pGMEE->ctx->Ans.CardBoxNo[i].GetData(),
 				pGMEE->ctx->Ans.PsbCode[i].GetData(),
 				pGMEE->ctx->Ans.PsbName[i].GetData(),
@@ -2050,7 +2050,7 @@ int CCardIssuerFSM::IssueCard(SpReqAnsContext<CardIssuerStandService_Issue_Req,
 		CSimpleStringA warnInfo = CSimpleStringA::Format("IssuerCard, hopper%d no more cards to issue. LocalRecord CardremainsEx:%d, Vendor return:NoCard(%d), CardCount(%d)",
 			m_currentHopper, m_remainsEx[m_currentHopper - 1], cis.eIssuerBin[m_currentHopper - 1],  cis.dwIssuerCount[m_currentHopper - 1]);
 		//LogWarn(Severity_Middle, Error_Unexpect, CardIssuer_UserErrorCode_No_More_Card_Issue, warnInfo.GetData());
-		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_USER)(warnInfo.GetData());
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)(warnInfo.GetData());
 
 		DWORD dwUsrErrCode = 0;
 		if (cis.eIssuerBin[m_currentHopper - 1] == CI_ISSUEHOPPER_NOTSUPP)
@@ -3207,7 +3207,7 @@ int CCardIssuerFSM::PreOnline_Contact(SpReqAnsContext<CardIssuerStandService_Pre
 			CSimpleStringA csErrMsgWithReturnCode = "";
 			GetCardProcessLastErr(eErrCode, ApiName, alarmMsg, csErrMsgWithReturnCode);
 
-			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_USER)("检测卡片类型时上电失败");
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("检测卡片类型时上电失败");
 			if (!IfUseRf())
 			{
 				if (IsInBusiness())
@@ -3253,7 +3253,7 @@ int CCardIssuerFSM::PreOnline_Contact(SpReqAnsContext<CardIssuerStandService_Pre
 		else if (retDetectAndRead == -2){
 			if (!IfUseRf())
 			{
-				DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_USER)("读取IC数据失败");
+				DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("读取IC数据失败");
 				if (m_issueStatus) {
 					SetErrorAndLog(Error_Unexpect, MEC_DEVAPI_CARDISSUER_ICCommand, "DevAdapter::ICCommand", __FUNCTION__, IsInBusiness(), l_endTime - l_beginTime, "QLR040220320", "");
 				}
@@ -3264,7 +3264,7 @@ int CCardIssuerFSM::PreOnline_Contact(SpReqAnsContext<CardIssuerStandService_Pre
 			}
 			else //非终态,还有非接兜底
 			{
-				DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_USER)("读取IC数据失败");
+				DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("读取IC数据失败");
 				if (m_issueStatus) {
 					SetErrorAndLog(Error_Unexpect, MEC_DEVAPI_CARDISSUER_ICCommand, "DevAdapter::ICCommand", __FUNCTION__, false, l_endTime - l_beginTime, "QLR040220320", "");
 				}
@@ -3275,7 +3275,7 @@ int CCardIssuerFSM::PreOnline_Contact(SpReqAnsContext<CardIssuerStandService_Pre
 		}else if (retDetectAndRead == -3){
 			if (!IfUseRf())
 			{
-				DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_USER)("IC卡建立应用列表失败");
+				DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("IC卡建立应用列表失败");
 				if (m_issueStatus) {
 					SetErrorAndLog(Error_Unexpect, MEC_DEVAPI_CARDISSUER_ICCommand, "DevAdapter::ICCommand", __FUNCTION__, IsInBusiness(), l_endTime - l_beginTime, "QLR040220320", "");
 				}
@@ -3287,7 +3287,7 @@ int CCardIssuerFSM::PreOnline_Contact(SpReqAnsContext<CardIssuerStandService_Pre
 			}
 			else //非终态,还有非接兜底
 			{
-				DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_USER)("IC卡建立应用列表失败");
+				DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("IC卡建立应用列表失败");
 				if (m_issueStatus) {
 					SetErrorAndLog(Error_Unexpect, MEC_DEVAPI_CARDISSUER_ICCommand, "DevAdapter::ICCommand", __FUNCTION__, false, l_endTime - l_beginTime, "QLR040220320", "");
 				}
@@ -3584,7 +3584,7 @@ int CCardIssuerFSM::PreOnline_RF(SpReqAnsContext<CardIssuerStandService_PreOnlin
 			CSimpleStringA csErrMsgWithReturnCode = "";
 			GetCardProcessLastErr(eErrCode, ApiName, alarmMsg, csErrMsgWithReturnCode);
 
-			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_USER)("检测卡片类型时上电失败(非接)");
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("检测卡片类型时上电失败(非接)");
 
 			if (m_issueStatus)
 			{
@@ -3617,7 +3617,7 @@ int CCardIssuerFSM::PreOnline_RF(SpReqAnsContext<CardIssuerStandService_PreOnlin
 		}
 		else if (retDetectAndRead == -2) {
 
-			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_USER)("读取IC数据失败");
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("读取IC数据失败");
 			if (m_issueStatus) {
 				SetErrorAndLog(Error_Unexpect, MEC_DEVAPI_CARDISSUER_RFTypeABCommand, "DevAdapter::RFTypeABCommand", __FUNCTION__, IsInBusiness(), l_endTime - l_beginTime, "QLR040220320", "");
 			}
@@ -3629,7 +3629,7 @@ int CCardIssuerFSM::PreOnline_RF(SpReqAnsContext<CardIssuerStandService_PreOnlin
 		}
 		else if (retDetectAndRead == -3) {
 
-			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_USER)("IC卡建立应用列表失败");
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("IC卡建立应用列表失败");
 			if (m_issueStatus) {
 				SetErrorAndLog(Error_Unexpect, MEC_DEVAPI_CARDISSUER_RFTypeABCommand, "DevAdapter::RFTypeABCommand", __FUNCTION__, IsInBusiness(), l_endTime - l_beginTime, "QLR040220320", "");
 			}
@@ -4236,13 +4236,13 @@ ErrorCodeEnum CCardIssuerFSM::MachineMoveCardFrontGate(bool bInBussiness)
 	if (eMoveFrontGate != Error_Succeed){
 		if (m_bCardFromHopper)
 		{
-			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_USER)("发卡,卡片吐出失败,请联系厂商检查卡嘴是否没对齐或是否有塞卡");
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("发卡,卡片吐出失败,请联系厂商检查卡嘴是否没对齐或是否有塞卡");
 			SetErrorAndLog(eMoveFrontGate, MEC_DEVAPI_CARDISSUER_CI_MOVECARD_FRONT_GATE, "DevAdapter::MoveCard", __FUNCTION__, bInBussiness, l_endTime - l_beginTime, "QLR040220305", "后端发卡,卡片吐出失败");
 
 		}
 		else
 		{
-			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_USER)("前端进卡,卡片吐出失败,请确认卡片是否平整");
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("前端进卡,卡片吐出失败,请确认卡片是否平整");
 			SetErrorAndLog(eMoveFrontGate, CardIssuer_UserErrorCode_MoveCardToGate_Failed, "DevAdapter::MoveCard", __FUNCTION__, bInBussiness, l_endTime - l_beginTime, "QLR040220305", "前端进卡,卡片吐出失败");
 		
 		}
@@ -5275,7 +5275,7 @@ int CCardIssuerFSM::SplitDevModelInfo()
 	LOG_FUNCTION();
 	if (strlen(m_devCat.szModel) < 3)
 	{
-		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("<SplitDevModelInfo>, Wrong szModel:%s", m_devCat.szModel);
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("<SplitDevModelInfo>, Wrong szModel:%s", m_devCat.szModel);
 		return -1;
 	}
 	m_csRF = "";