!10810 卡库精简日志归并到防火墙分支

Merge pull request !10810 from 80174520/feature_cardissuerStore_fixlog

Module/mod_cardissuerstore/CardIssuerStoreFSM.cpp

@@ -808,7 +808,7 @@ unsigned int CCardIssuerFSM::s5_on_event(FSMEvent* pEvt)
 			else
 			{
 				//DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("Read finished,获取设备状态GetDevStatus失败");
-				DWORD dwTmpUserErrCode = SetErrorAndLog(Error_Unexpect, MEC_DEVAPI_CARDISSUER_GetDevStatus, "DevAdapter::GetDevStatus", __FUNCTION__, false, 10, "QLR040222003", "Read finished,获取设备状态GetDevStatus失败");
+				DWORD dwTmpUserErrCode = SetErrorAndLog(Error_Unexpect, MEC_DEVAPI_CARDISSUER_GetDevStatus, "DevAdapter::GetDevStatus", __FUNCTION__, false, 10, "QLR040222003", CombineJsonContext("Read finished, GetDevStatus err"));
 				pCRNFE->ctx->Answer(Error_Unexpect, dwTmpUserErrCode);
 				
 				ret = 1;
@@ -1762,7 +1762,7 @@ ErrorCodeEnum CCardIssuerFSM::OpenDevice(BYTE btOpenType, const char* pDevSN)
 		}
 		else {
 			errMsg = CSimpleStringA::Format("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, "", errMsg.GetData());
+			SetErrorAndLog(eErrDev, MEC_DEVAPI_CARDISSUER_DevOpenEx, "DevAdapter::DevOpenEx", __FUNCTION__, false, l_endTime - l_beginTime, "", CombineJsonContext(errMsg.GetData()));
 
 			Sleep(200);
 			initTries++;
@@ -2302,7 +2302,7 @@ int CCardIssuerFSM::IssueCard(SpReqAnsContext<CardIssuerStoreService_IssueEx_Req
 		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)(ErrMsg.GetData());
 		FSMSetIssueFlag(2);
 		//DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("从卡箱移动卡片到读卡器失败，请重试或检查是否有塞卡");
-		DWORD dwTmpUserErrCode = SetErrorAndLog(errCode, MEC_DEVAPI_CARDISSUER_CI_MOVECARD_FROM_HOPPER, "DevAdapter::MoveCard", __FUNCTION__, false, l_endTime - l_beginTime, "QLR040222020", ErrMsg.GetData());
+		DWORD dwTmpUserErrCode = SetErrorAndLog(errCode, MEC_DEVAPI_CARDISSUER_CI_MOVECARD_FROM_HOPPER, "DevAdapter::MoveCard", __FUNCTION__, false, l_endTime - l_beginTime, "QLR040222020", CombineJsonContext(ErrMsg.GetData()));
 		ctxEx->Answer(Error_Unexpect, dwTmpUserErrCode);
 		//ctxEx->Answer(Error_Unexpect, GetAlarmDEC());
 		return 1;
@@ -2465,7 +2465,7 @@ int CCardIssuerFSM::WaitFetchingCard()
 		{
 			l_endTime = GetTickCountRVC();
 			LogEvent(Severity_Middle, LOG_EVT_CARDISSUER_STORE_GREEN_OFF,"CardReader(fetch) warning off");
-			SetErrorAndLog(Error_Unexpect, MEC_DEVAPI_CARDISSUER_GetDevStatus, "DevAdapter::GetDevStatus", __FUNCTION__, IsInBusiness(), l_endTime - l_beginTime, "QLR040222005", "取卡时设备故障");
+			SetErrorAndLog(Error_Unexpect, MEC_DEVAPI_CARDISSUER_GetDevStatus, "DevAdapter::GetDevStatus", __FUNCTION__, IsInBusiness(), l_endTime - l_beginTime, "QLR040222005", "");
 			return 1;
 		}
 	}while ((dwEnd-dwStart) < 60*1000);
@@ -4673,12 +4673,12 @@ ErrorCodeEnum CCardIssuerFSM::MachineMoveCardFrontGate(bool bInBussiness)
 		if (m_bCardFromHopper)
 		{
 			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_USER)("MachineMoveCardFrontGate::MoveCard(CI_MOVECARD_FRONT_GATE) 发卡，卡片吐出失败，请联系厂商检查卡嘴是否没对齐或是否有塞卡");
-			SetErrorAndLog(eMoveFrontGate, MEC_DEVAPI_CARDISSUER_CI_MOVECARD_FRONT_GATE, "DevAdapter::MoveCard", __FUNCTION__, bInBussiness, l_endTime - l_beginTime, "QLR040222005", "后端发卡，卡片吐出失败");
+			SetErrorAndLog(eMoveFrontGate, MEC_DEVAPI_CARDISSUER_CI_MOVECARD_FRONT_GATE, "DevAdapter::MoveCard", __FUNCTION__, bInBussiness, l_endTime - l_beginTime, "QLR040222005", "");
 		}
 		else
 		{
 			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_USER)("MachineMoveCardFrontGate::MoveCard(CI_MOVECARD_FRONT_GATE) 前端进卡，卡片吐出失败，请确认卡片是否平整");
-			SetErrorAndLog(eMoveFrontGate, CardIssuerStore_UserErrorCode_MoveCardToGate_Failed, "DevAdapter::MoveCard", __FUNCTION__, bInBussiness, l_endTime - l_beginTime, "QLR040222005", "前端进卡，卡片吐出失败");
+			SetErrorAndLog(eMoveFrontGate, CardIssuerStore_UserErrorCode_MoveCardToGate_Failed, "DevAdapter::MoveCard", __FUNCTION__, bInBussiness, l_endTime - l_beginTime, "QLR040222005", "");
 		}
 			
 	}
@@ -5950,7 +5950,7 @@ int CCardIssuerFSM::IssueCardFromStore(SpReqAnsContext<CardIssuerStoreService_Is
 					m_mapJsonErr["cardPos"] = JsonElem(CardPos_HaveCapturedCard);
 					DWORD dwTmpUserErrCode = TryMapAPIRetToUEC(eErr, MEC_DEVAPI_CARDISSUER_MoveCardFromSlot, bTrans);
 
-					DWORD dwTmpUserErrCode2 = SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_MoveCardFromSlot, "DevAdapter::MoveCardToSlot", __FUNCTION__, false, l_endTime - l_beginTime, "", errMsg.GetData());
+					DWORD dwTmpUserErrCode2 = SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_MoveCardFromSlot, "DevAdapter::MoveCardToSlot", __FUNCTION__, false, l_endTime - l_beginTime, "", CombineJsonContext(errMsg.GetData()));
 					if (!bTrans) {
 						dwTmpUserErrCode = dwTmpUserErrCode2;
 						//dwTmpUserErrCode = GetAlarmDEC();
@@ -6286,9 +6286,9 @@ int CCardIssuerFSM::AddCardToStoreStepLast(SpReqAnsContext<CardIssuerStoreServic
 		bool bTrans = true;
 		DWORD dwTmpUserErrCode = TryMapAPIRetToUEC(eErr, MEC_DEVAPI_CARDISSUER_MoveCardToSlot, bTrans);
 
-		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("AddCardToStoreStepLast::MoveCardToSlot(slot:%d) 卡片从读卡器移回到卡槽失败", slot);
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("AddCardToStoreStepLast::MoveCardToSlot(slot:%d)", slot);
 		errMsg = CSimpleStringA::Format("AddCardToStoreStepLast MoveCardToSlot fail, slot:%d", slot);
-		DWORD dwTmpUserErrCode2 = SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_MoveCardToSlot, "DevAdapter::MoveCardToSlot", __FUNCTION__, false, l_endTime - l_beginTime, "QLR0402220A4", errMsg.GetData());
+		DWORD dwTmpUserErrCode2 = SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_MoveCardToSlot, "DevAdapter::MoveCardToSlot", __FUNCTION__, false, l_endTime - l_beginTime, "QLR0402220A4", CombineJsonContext(errMsg.GetData()));
 		if (!bTrans) {
 			dwTmpUserErrCode = dwTmpUserErrCode2;
 			//dwTmpUserErrCode = GetAlarmDEC();
@@ -6369,7 +6369,7 @@ bool CCardIssuerFSM::IsSlotHasCard(const int slot)
 
 		if(eErr != Error_Succeed){
 			CSimpleStringA errMsg = CSimpleStringA::Format("IsSlotHasCard::QuerySlotsStatus fail, slot:%d", slot);
-			SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_QuerySlotsStatus, "DevAdapter::QuerySlotsStatus", __FUNCTION__, false, l_endTime - l_beginTime, "", errMsg.GetData());
+			SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_QuerySlotsStatus, "DevAdapter::QuerySlotsStatus", __FUNCTION__, false, l_endTime - l_beginTime, "", CombineJsonContext(errMsg.GetData()));
 		}
 		else {
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::QuerySlotsStatus").setCostTime(l_endTime - l_beginTime)("IsSlotHasCard::QuerySlotsStatus, slot:%d, status:%d", slot, status.status[slot]);
@@ -6412,8 +6412,7 @@ void CCardIssuerFSM::AfterPreOnlineOnStore(ErrorCodeEnum err, const int slot)
 		{
 			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("AfterPreOnlineOnStore::MoveCardToSlot fail, slot:%d ", slot);
 			CSimpleStringA addMsg = CSimpleStringA::Format("AfterPreOnlineOnStore::MoveCardToSlot(slot:%d)", slot);
-			CSimpleStringA contxtStr = CSimpleStringA::Format("{\"addition\": \"%s\"}", addMsg.GetData());
-			SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_MoveCardToSlot, "DevAdapter::MoveCardToSlot", __FUNCTION__, false, l_endTime - l_beginTime, "", contxtStr.GetData());
+			SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_MoveCardToSlot, "DevAdapter::MoveCardToSlot", __FUNCTION__, false, l_endTime - l_beginTime, "", CombineJsonContext(addMsg.GetData()));
 
 			ToRegistCaptureCardInfo();
 			eErr = MachineMoveCardBackNotHold();
@@ -6550,8 +6549,7 @@ bool CCardIssuerFSM::OperateCardStore(CSmartPointer<IConfigInfo>& spConfigRun, i
 				DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("OperateCardStore::MoveCardToSlot, slot:%d ", slot);
 				//移回卡槽不成功，登记并吞卡
 				CSimpleStringA addMsg = CSimpleStringA::Format("OperateCardStore::MoveCardToSlot(slot:%d)", slot);
-				CSimpleStringA contxtStr = CSimpleStringA::Format("{\"addition\": \"%s\"}", addMsg.GetData());
-				SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_MoveCardToSlot, "DevAdapter::MoveCardToSlot", __FUNCTION__, false, l_endTime - l_beginTime, "", contxtStr.GetData());
+				SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_MoveCardToSlot, "DevAdapter::MoveCardToSlot", __FUNCTION__, false, l_endTime - l_beginTime, "", CombineJsonContext(addMsg.GetData()));
 				status = 3;
 				ToRegistCaptureCardInfo();
 				MachineMoveCardBackNotHold();
@@ -6561,7 +6559,7 @@ bool CCardIssuerFSM::OperateCardStore(CSmartPointer<IConfigInfo>& spConfigRun, i
 	else
 	{
 		CSimpleStringA errMsg = CSimpleStringA::Format("OperateCardStore::MoveCardFromSlot fail, slot:%d", slot);
-		SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_MoveCardFromSlot, "DevAdapter::MoveCardFromSlot", __FUNCTION__, false, l_endTime - l_beginTime, "", errMsg.GetData());
+		SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_MoveCardFromSlot, "DevAdapter::MoveCardFromSlot", __FUNCTION__, false, l_endTime - l_beginTime, "", CombineJsonContext(errMsg.GetData()));
 		status = 1;
 	}
 	return false;
@@ -8090,7 +8088,7 @@ bool CCardIssuerFSM::OperateNewCardStore(int slot, CSimpleStringA& addCardNo, CS
 				CSimpleStringA maskCardno = MaskCardno(addCardNo.GetData());
 				DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("OperateNewCardStore::MoveCardToSlot err, slot:%d, cardNo:%s", slot, maskCardno.GetData());
 				CSimpleStringA errMsg = CSimpleStringA::Format("OperateNewCardStore::MoveCardToSlot err, slot:%d, cardNo:%s", slot, maskCardno.GetData());
-				SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_MoveCardToSlot, "DevAdapter::MoveCardToSlot", __FUNCTION__, false, l_endTime - l_beginTime, "QLR0402220100", errMsg.GetData());
+				SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_MoveCardToSlot, "DevAdapter::MoveCardToSlot", __FUNCTION__, false, l_endTime - l_beginTime, "QLR0402220100", CombineJsonContext(errMsg.GetData()));
 				status = 3;
 			}
 		}
@@ -8100,7 +8098,7 @@ bool CCardIssuerFSM::OperateNewCardStore(int slot, CSimpleStringA& addCardNo, CS
 		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("OperateNewCardStore::MoveCardFromSlot err, slot:%d", slot);
 		CSimpleStringA errMsg = CSimpleStringA::Format("OperateNewCardStore::MoveCardFromSlot err, slot:%d", slot);
 		bool bTrans = true;
-		SetErrorAndLog(eErr, TryMapAPIRetToUEC(eErr, MEC_DEVAPI_CARDISSUER_MoveCardFromSlot, bTrans), "DevAdapter::MoveCardFromSlot", __FUNCTION__, false, l_endTime - l_beginTime, "QLR0402220100", errMsg.GetData());
+		SetErrorAndLog(eErr, TryMapAPIRetToUEC(eErr, MEC_DEVAPI_CARDISSUER_MoveCardFromSlot, bTrans), "DevAdapter::MoveCardFromSlot", __FUNCTION__, false, l_endTime - l_beginTime, "QLR0402220100", CombineJsonContext(errMsg.GetData()));
 		status = 1;
 	}
 	return false;
@@ -8620,7 +8618,7 @@ int CCardIssuerFSM::IssueFromBoxJS(SpReqAnsContext<CardIssuerStoreService_IssueF
 		CSimpleStringA errMsg = CSimpleStringA::Format("IssueFromBoxJS::MoveCard err, m_currentHopper:%d", m_currentHopper);
 		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)(errMsg.GetData());
 		FSMSetIssueFlag(2);
-		DWORD dwTmpUserErrCode = SetErrorAndLog(errCode, MEC_DEVAPI_CARDISSUER_CI_MOVECARD_FROM_HOPPER, "DevAdapter::MoveCard", __FUNCTION__, false, l_endTime - l_beginTime, "QLR040222045", errMsg.GetData());
+		DWORD dwTmpUserErrCode = SetErrorAndLog(errCode, MEC_DEVAPI_CARDISSUER_CI_MOVECARD_FROM_HOPPER, "DevAdapter::MoveCard", __FUNCTION__, false, l_endTime - l_beginTime, "QLR040222045", CombineJsonContext(errMsg.GetData()));
 		ctx->Answer(Error_Unexpect, dwTmpUserErrCode);
 		return 1;
 	}
@@ -9998,7 +9996,7 @@ bool CCardIssuerFSM::AfterPreOnlineCrossJS(const int slot,CSimpleStringA cardNo)
 		errMsg = CSimpleStringA::Format("AfterPreOnlineCrossJS::MoveCardToSlot err, slot:%d", slot);
 		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)(errMsg.GetData());
 		bool bTrans = true;
-		SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_MoveCardToSlot, "DevAdapter::MoveCardFromSlot", __FUNCTION__, false, l_endTime - l_beginTime, "", errMsg.GetData());
+		SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_MoveCardToSlot, "DevAdapter::MoveCardFromSlot", __FUNCTION__, false, l_endTime - l_beginTime, "", CombineJsonContext(errMsg.GetData()));
 
 
 		eErr = MachineMoveCardBackNotHold();

Module/mod_cardissuerstore/CardIssuerStoreFSM.h

@@ -1498,6 +1498,16 @@ public:
 		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("rtaMsg=%s", rtaMsg.GetData());
 		return rtaMsg;
 	}
+
+	CSimpleStringA CombineJsonContext(const char* szMessage)
+	{
+		CSimpleStringA result(true);
+		if (szMessage == NULL || strlen(szMessage) == 0) {
+			return result;
+		}
+		result = CSimpleStringA::Format("{\"addition\": \"%s\"}", szMessage);
+		return  result;
+	}
 #pragma endregion JS新增接口
 
 #pragma region JS新增字段