Z991239-6316 #comment feat: 规范卡库日志

Signed-Off-By: commit-hook

Module/mod_cardissuerstore/CardIssuerStoreFSM.cpp

@@ -305,7 +305,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:%s, PsbCode:%s, PsbName:%s, CardInit:%d, remains:%d, issued:%d, mixed:%d,",
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("GetMaterial CardBoxNo:%s, PsbCode:%s, PsbName:%s, CardInit:%d, remains:%d, issued:%d, mixed:%d,",
 				pGMEE->ctx->Ans.CardBoxNo[i].GetData(),
 				pGMEE->ctx->Ans.PsbCode[i].GetData(),
 				pGMEE->ctx->Ans.PsbName[i].GetData(),
@@ -2411,7 +2411,7 @@ int CCardIssuerFSM::EjectCard(SpReqAnsContext<CardIssuerStoreService_Eject_Req,C
 		if (ctx != NULL)
 			ctx->Answer(Error_Succeed);
 		ret = 0;
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode("QLR040222005")();
+		//DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode("QLR040222005")();
 	}
 	else {
 		if (ctx != NULL){
@@ -2502,7 +2502,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_STORE_OP, "CardIssuer op.");
 				acceptTries = 0;
 				goto Err;
 			}
@@ -2790,7 +2790,7 @@ int CCardIssuerFSM::ReadCard_Contact(SpReqAnsContext<CardIssuerStoreService_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_STORE_OP, "CardIssuer op.");
 			if (magTracks.track[1].dwSize > 40)
 			{
 				errMsg = CSimpleString::Format("MagRead, track2Size maybe wrong:t2Size:%d", magTracks.track[1].dwSize);
@@ -3077,7 +3077,7 @@ int CCardIssuerFSM::ReadCard_RF(SpReqAnsContext<CardIssuerStoreService_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_STORE_OP, "CardIssuer op.");
 			if (magTracks.track[1].dwSize > 40)
 			{
 				errMsg = CSimpleString::Format("MagRead, track2Size maybe wrong:t2Size:%d", magTracks.track[1].dwSize);
@@ -4680,7 +4680,7 @@ ErrorCodeEnum CCardIssuerFSM::MachineMoveCardFrontGate(bool bInBussiness)
 			
 	}
 	else {
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::MoveCard").setCostTime(l_endTime - l_beginTime)("MachineMoveCardFrontGate::MoveCard");
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::MoveCard").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040222005")("MachineMoveCardFrontGate::MoveCard");
 	}
 	
 	return eMoveFrontGate;
@@ -5164,7 +5164,7 @@ bool CCardIssuerFSM::SyncMaterialCount(IHttpFunc* client,SyncMaterialCountInfo s
 		bool isSucc = rootRet["success"].asBool();
 		if (isSucc){
 			//成功
-			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_USER).setLogCode("QLR0402220A1")("同步物料计数成功");
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setLogCode("QLR0402220A1")("同步物料计数成功");
 			return true;
 		}
 		else {
@@ -7244,19 +7244,26 @@ int CCardIssuerFSM::EjectJS(SpReqAnsContext<CardIssuerStoreService_EjectJS_Req,
 		return 1;//S9
 	}
 	else {
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode("QLR040222042")("EjectCard, ret: %d", ret);
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::MoveCard").setCostTime(l_endTime - l_beginTime).setLogCode("QLR040222042")("EjectJS::MoveCard(CI_MOVECARD_FRONT_GATE)");
 		//等待取卡
 		DWORD dwStart, dwEnd;
 		dwStart = GetTickCountRVC();
+		ErrorCodeEnum errState = Error_Succeed;
+		long l_beginTime, l_endTime;
+		DWORD dwTmpUserErrCode = 0;
 		LogEvent(Severity_Middle, LOG_EVT_CARDISSUER_STORE_GREEN_ON, "CardReader(fetch) warning on");
 		do {
-			if (GetDevStatus(false)) {
+			l_beginTime = GetTickCountRVC();
+			errState = m_hDevHelper->GetDevStatus(m_devStatus);
+			l_endTime = GetTickCountRVC();
+
+			if (Error_Succeed == errState) {
 				dwEnd = GetTickCountRVC();
 				if (m_devStatus.eMedia == CI_MEDIA_ENTERING) {
 					Sleep(WAIT_INTERVAL);
 				}
 				else {
-					long l_beginTime, l_endTime;
+
 					l_beginTime = GetTickCountRVC();
 					ErrorCodeEnum eErr = m_hDevHelper->SetCardInType(CI_CARD_IN_TYPE_FORBIDDEN);
 					l_endTime = GetTickCountRVC();
@@ -7280,15 +7287,23 @@ int CCardIssuerFSM::EjectJS(SpReqAnsContext<CardIssuerStoreService_EjectJS_Req,
 			else
 			{
 				LogEvent(Severity_Middle, LOG_EVT_CARDISSUER_STORE_GREEN_OFF, "CardReader(fetch) warning off");
+
+				if (IsInBusiness() && ctx != NULL) {
+					dwTmpUserErrCode = SetErrorAndLog(errState, MEC_DEVAPI_CARDISSUER_GetDevStatus, "DevAdapter::GetDevStatus", __FUNCTION__, true, l_endTime - l_beginTime, "QLR040222042", "");
+				}
+				else {
+					dwTmpUserErrCode = SetErrorAndLog(errState, MEC_DEVAPI_CARDISSUER_GetDevStatus, "DevAdapter::GetDevStatus", __FUNCTION__, false, l_endTime - l_beginTime, "QLR040222042", "");
+				}
+
 				if (ctx != NULL)
 				{
-					ctx->Answer(Error_Unexpect, 0x22000002);
+					ctx->Answer(Error_Unexpect, dwTmpUserErrCode);
 				}
 				return 1;//S9
 			}
 		} while ((dwEnd - dwStart) < 55 * 1000);//预留5秒给吞卡操作
 		LogEvent(Severity_Middle, LOG_EVT_CARDISSUER_STORE_GREEN_OFF, "CardReader(fetch) warning off");
-		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER)("客户未取卡超时");
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("客户未取卡超时");
 
 		//超时未取卡进行吞卡操作
 		l_beginTime = GetTickCountRVC();
@@ -7358,7 +7373,7 @@ int CCardIssuerFSM::CaptureJS(SpReqAnsContext<CardIssuerStoreService_CaptureJS_R
 
 	if (eErr == Error_Succeed) {
 		
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("CaptureJS::GetDevStatus succ,m_devStatus.eMedia=%d", (int)m_devStatus.eMedia);
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::GetDevStatus").setCostTime(l_endTime - l_beginTime)("CaptureJS::GetDevStatus succ,m_devStatus.eMedia=%d", (int)m_devStatus.eMedia);
 		if (m_devStatus.eMedia == CI_MEDIA_NOTPRESENT) {
 			//读卡器无卡
 			l_beginTime = GetTickCountRVC();
@@ -7375,12 +7390,12 @@ int CCardIssuerFSM::CaptureJS(SpReqAnsContext<CardIssuerStoreService_CaptureJS_R
 			CSimpleStringA maskCardno = MaskCardno(m_currCardNo.GetData());
 			m_currCardNo = m_addCardNo = "";
 			if (ctx != NULL) {		
-				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("CaptureJS::GetDevStatus succ, No card found in cardReader, m_currCardNo=%s", maskCardno.GetData());
+				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setLogCode("QLR040222043").setResultCode("RTA2WCW")("CaptureJS::GetDevStatus succ, No card found in cardReader, m_currCardNo=%s", maskCardno.GetData());
 				LogWarn(Severity_Low, Error_Unexpect, CardIssuerStore_UserErrorCode_Capture_NoCard_Failed, "Capture card, No card found in cardReader");
 				ctx->Answer(Error_Exception, CardIssuerStore_UserErrorCode_Capture_NoCard_Failed);//读卡器无卡
 			}
 			else {
-				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("CaptureJS::GetDevStatus succ, No card found in cardReader");
+				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setLogCode("QLR040222043").setResultCode("RTA2WCW")("CaptureJS::GetDevStatus succ, No card found in cardReader");
 			}
 			return 0;//回到无卡状态
 		}

Module/mod_cardissuerstore/CardIssuerStoreFSM.h

@@ -175,7 +175,7 @@ public:
 	{
 		if (ctx != NULL)
 		{
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("Operate CardStore unhandled");
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA2WCL")("Operate CardStore unhandled");
 			ctx->Answer(Error_InvalidState, CardIssuerStore_UserErrorCode_EntityInStateCannotProcess);
 		}
 	}
@@ -191,7 +191,7 @@ public:
 	{
 		if (ctx != NULL)
 		{
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("card read unhandled");
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA2WCL")("card read unhandled");
 			ctx->Answer(Error_InvalidState, CardIssuerStore_UserErrorCode_EntityInStateCannotProcess);
 		}
 	}
@@ -208,7 +208,7 @@ public:
 	{
 		if (ctx != NULL)
 		{
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("card read unhandled(new)");
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA2WCL")("card read unhandled(new)");
 		}
 	}
 protected:
@@ -297,7 +297,7 @@ public:
 	{
 		if (ctx != NULL)
 		{
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("card read unhandled");
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA2WCL")("card Write unhandled");
 			ctx->Answer(Error_InvalidState, CardIssuerStore_UserErrorCode_EntityInStateCannotProcess);
 		}
 	}
@@ -314,7 +314,7 @@ public:
 	{
 		if (ctx != NULL)
 		{
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("card read unhandled(new)");
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA2WCL")("card Write unhandled(new)");
 		}
 	}
 protected:
@@ -358,7 +358,7 @@ public:
 	{
 		if (ctx != NULL)
 		{
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("card issue ex unhandled");
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA2WCL")("card issue ex unhandled");
 			ctx->Answer(Error_InvalidState, CardIssuerStore_UserErrorCode_EntityInStateCannotProcess);
 		}
 	}
@@ -373,7 +373,7 @@ public:
 	{
 		if (ctx != NULL)
 		{
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("sam/ic unhandled");
+			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setResultCode("RTA2WCL")("sam/ic unhandled");
 			ctx->Answer(Error_InvalidState, CardIssuerStore_UserErrorCode_EntityInStateCannotProcess);
 		}
 	}
@@ -387,7 +387,7 @@ public:
 	virtual void OnUnhandled()
 	{
 		if (ctx != NULL){
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("PrintCardIm unhandled");
+			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setResultCode("RTA2WCL")("PrintCardIm unhandled");
 			ctx->Answer(Error_InvalidState, CardIssuerStore_UserErrorCode_EntityInStateCannotProcess);
 		}
 	}
@@ -758,7 +758,7 @@ public:
 	{
 		if (ctx != NULL)
 		{
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("EjectJS Operate unhandled");
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA2WCL")("EjectJS Operate unhandled");
 			//ctx->Answer(Error_Unexpect, CardIssuerStore_UserErrorCode_EntityInStateCannotProcess);
 		}
 	}
@@ -774,7 +774,7 @@ public:
 	{
 		if (ctx != NULL)
 		{
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("CaptureJS Operate unhandled");
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA2WCL")("CaptureJS Operate unhandled");
 			//ctx->Answer(Error_Unexpect, CardIssuerStore_UserErrorCode_EntityInStateCannotProcess);
 		}
 	}
@@ -790,7 +790,7 @@ public:
 	{
 		if (ctx != NULL)
 		{
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("ReadBatchCardInfoInRangeJS Operate unhandled");
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA2WCL")("ReadBatchCardInfoInRangeJS Operate unhandled");
 			//ctx->Answer(Error_Unexpect, CardIssuerStore_UserErrorCode_EntityInStateCannotProcess);
 		}
 	}
@@ -806,7 +806,7 @@ public:
 	{
 		if (ctx != NULL)
 		{
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("AddAndReadCardFromBoxJS Operate unhandled");
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA2WCL")("AddAndReadCardFromBoxJS Operate unhandled");
 			//ctx->Answer(Error_Unexpect, CardIssuerStore_UserErrorCode_EntityInStateCannotProcess);
 		}
 	}
@@ -822,7 +822,7 @@ public:
 	{
 		if (ctx != NULL)
 		{
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("AddCardFromBoxJS Operate unhandled");
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA2WCL")("AddCardFromBoxJS Operate unhandled");
 			//ctx->Answer(Error_Unexpect, CardIssuerStore_UserErrorCode_EntityInStateCannotProcess);
 		}
 	}
@@ -838,7 +838,7 @@ public:
 	{
 		if (ctx != NULL)
 		{
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("MoveAndReadCardFromSlotJS Operate unhandled");
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA2WCL")("MoveAndReadCardFromSlotJS Operate unhandled");
 			//ctx->Answer(Error_Unexpect, CardIssuerStore_UserErrorCode_EntityInStateCannotProcess);
 		}
 	}
@@ -854,7 +854,7 @@ public:
 	{
 		if (ctx != NULL)
 		{
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("MoveCardFromSlotJS Operate unhandled");
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA2WCL")("MoveCardFromSlotJS Operate unhandled");
 			//ctx->Answer(Error_Unexpect, CardIssuerStore_UserErrorCode_EntityInStateCannotProcess);
 		}
 	}
@@ -871,7 +871,7 @@ public:
 	{
 		if (ctx != NULL)
 		{
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("MoveBacktoSlotJS Operate unhandled");
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA2WCL")("MoveBacktoSlotJS Operate unhandled");
 			//ctx->Answer(Error_Unexpect, CardIssuerStore_UserErrorCode_EntityInStateCannotProcess);
 		}
 	}
@@ -903,7 +903,7 @@ public:
 	{
 		if (ctx != NULL)
 		{
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("ICCommandJS Operate unhandled");
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA2WCL")("ICCommandJS Operate unhandled");
 			//ctx->Answer(Error_Unexpect, CardIssuerStore_UserErrorCode_EntityInStateCannotProcess);
 		}
 	}
@@ -919,7 +919,7 @@ public:
 	{
 		if (ctx != NULL)
 		{
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("WriteTrackJS Operate unhandled");
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA2WCL")("WriteTrackJS Operate unhandled");
 			//ctx->Answer(Error_Unexpect, CardIssuerStore_UserErrorCode_EntityInStateCannotProcess);
 		}
 	}
@@ -935,7 +935,7 @@ public:
 	{
 		if (ctx != NULL)
 		{
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("PrintCardImmediatelyJS Operate unhandled");
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA2WCL")("PrintCardImmediatelyJS Operate unhandled");
 			//ctx->Answer(Error_Unexpect, CardIssuerStore_UserErrorCode_EntityInStateCannotProcess);
 		}
 	}
@@ -951,7 +951,7 @@ public:
 	{
 		if (ctx != NULL)
 		{
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("PostOnlineJS Operate unhandled");
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA2WCL")("PostOnlineJS Operate unhandled");
 			//ctx->Answer(Error_Unexpect, CardIssuerStore_UserErrorCode_EntityInStateCannotProcess);
 		}
 	}
@@ -967,7 +967,7 @@ public:
 	{
 		if (ctx != NULL)
 		{
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("IssueFromBoxJS Operate unhandled");
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA2WCL")("IssueFromBoxJS Operate unhandled");
 			//ctx->Answer(Error_Unexpect, CardIssuerStore_UserErrorCode_EntityInStateCannotProcess);
 		}
 	}
@@ -983,7 +983,7 @@ public:
 	{
 		if (ctx != NULL)
 		{
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("PreOnlineCrossJS Operate unhandled");
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA2WCL")("PreOnlineCrossJS Operate unhandled");
 			//ctx->Answer(Error_Unexpect, CardIssuerStore_UserErrorCode_EntityInStateCannotProcess);
 		}
 	}
@@ -1008,7 +1008,7 @@ public:
 	{
 		if (ctx != NULL)
 		{
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("ReadJS Operate unhandled");
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA2WCL")("ReadJS Operate unhandled");
 			//ctx->Answer(Error_Unexpect, CardIssuerStore_UserErrorCode_EntityInStateCannotProcess);
 		}
 	}

Module/mod_cardissuerstore/mod_cardissuerStore.h

@@ -215,7 +215,7 @@ public:
 	}
 	void SetSomeFlag(SpReqAnsContext<CardIssuerStoreService_SetSomeFlag_Req, CardIssuerStoreService_SetSomeFlag_Ans>::Pointer ctx)
 	{
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("set issue flag to %d", ctx->Req.IssueBusiness);
+		//DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("set issue flag to %d", ctx->Req.IssueBusiness);
 		if (ctx->Req.IssueBusiness == 1)
 			m_fsm.FrontSetIssueFlag(true);
 		else if (ctx->Req.IssueBusiness == 0)