Explorar o código

Z991239-6292 #comment feat: 精简卡库加卡日志

Signed-Off-By: commit-hook
刘文涛80174520 hai 3 meses
pai
achega
b4e5c4fff4

+ 11 - 10
Module/mod_cardissuerstore/CardIssuerStoreFSM.cpp

@@ -7436,10 +7436,10 @@ int CCardIssuerFSM::CaptureJS(SpReqAnsContext<CardIssuerStoreService_CaptureJS_R
 int CCardIssuerFSM::ReadBatchCardInfoInRangeJS(SpReqAnsContext<CardIssuerStoreService_ReadBatchCardInfoInRangeJS_Req, CardIssuerStoreService_ReadBatchCardInfoInRangeJS_Ans>::Pointer ctx)
 {
 	LOG_FUNCTION();
-	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("区间盘库开始");
+	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("区间盘库开始");
 	long l_beginTime, l_endTime;
 	CSimpleStringA cardInfo("");
-	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("<ReadBatchCardInfoInRangeJS>, beginSlot=%d, endSlot=%d", ctx->Req.beginSlot, ctx->Req.endSlot);
+	//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("<ReadBatchCardInfoInRangeJS>, beginSlot=%d, endSlot=%d", ctx->Req.beginSlot, ctx->Req.endSlot);
 	//新模式盘库
 	if (m_maxSlot == 0) {
 		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("<ReadBatchCardInfoInRangeJS>, m_maxSlot=0 is wrong");
@@ -7509,7 +7509,7 @@ int CCardIssuerFSM::ReadBatchCardInfoInRangeJS(SpReqAnsContext<CardIssuerStoreSe
 	}
 	//返回盘库记录
 	if (slotNum == endSlot && status == 0) {
-		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("operate cardStore succ in slot(%d).", slotNum);
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("operate cardStore succ in slot(%d).", slotNum);
 		//ctx->Ans.status = status;
 		ctx->Ans.slotNum.Init(endSlot - beginSlot + 1);
 		ctx->Ans.cardNo.Init(endSlot - beginSlot + 1);
@@ -7547,7 +7547,7 @@ int CCardIssuerFSM::ReadBatchCardInfoInRangeJS(SpReqAnsContext<CardIssuerStoreSe
 int CCardIssuerFSM::GetCardInStoreJS(SpReqAnsContext<CardIssuerStoreService_GetCardInStoreJS_Req, CardIssuerStoreService_GetCardInStoreJS_Ans>::Pointer ctx)
 {
 	LOG_FUNCTION();
-	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("查询卡库容量及卡槽状态开始");
+	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("查询卡库容量及卡槽状态开始");
 	long l_beginTime, l_endTime;
 
 	//卡库数量盘点
@@ -7559,7 +7559,7 @@ int CCardIssuerFSM::GetCardInStoreJS(SpReqAnsContext<CardIssuerStoreService_GetC
 	l_endTime = GetTickCountRVC();
 	if (eErr == Error_Succeed)
 	{
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::GetSlotSum").setCostTime(l_endTime - l_beginTime)("<GetCardInStoreJS>, CardStore slot num is:%d", slotstatus.dwSize);
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::QuerySlotsStatus").setCostTime(l_endTime - l_beginTime)("GetCardInStoreJS::QuerySlotsStatus, CardStore slot num is:%d", slotstatus.dwSize);
 		if (slotstatus.dwSize > 0)
 		{
 			ctx->Ans.slotSum = slotstatus.dwSize;
@@ -7570,7 +7570,7 @@ int CCardIssuerFSM::GetCardInStoreJS(SpReqAnsContext<CardIssuerStoreService_GetC
 			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("<GetCardInStoreJS>, CardStore slot num is zero.");
 		}
 
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::QuerySlotsStatus").setCostTime(l_endTime - l_beginTime)("GetCardInStoreJS::QuerySlotsStatus");
+		//DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::QuerySlotsStatus").setCostTime(l_endTime - l_beginTime)("GetCardInStoreJS::QuerySlotsStatus");
 
 		ctx->Ans.hasCardSlotNum.Init(slotstatus.dwSize);
 		for (int i = 0; i < slotstatus.dwSize; ++i)
@@ -8219,7 +8219,7 @@ int CCardIssuerFSM::PrintCardImmediatelyJS(SpReqAnsContext<CardIssuerStoreServic
 
 	if (eErr != Error_Succeed)
 	{
-		LogWarn(Severity_Low, Error_Succeed, CardIssuerStore_UserErrorCode_PrintCardFaceRightNow, "PrintCardFaceRightNow fail.");
+		//LogWarn(Severity_Low, Error_Succeed, CardIssuerStore_UserErrorCode_PrintCardFaceRightNow, "PrintCardFaceRightNow fail.");
 		DWORD dwTmpUserErrCode = SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_PrintCardFaceRightNow, "DevAdapter::PrintCardFaceRightNow", __FUNCTION__, IsInBusiness(), l_endTime - l_beginTime, "QLR040222051", "");
 		ctx->Answer(Error_Unexpect, dwTmpUserErrCode);
 		
@@ -8426,7 +8426,7 @@ int CCardIssuerFSM::ICCommandJS(SpReqAnsContext<CardIssuerStoreService_ICCommand
 			{
 				char* pRet = new char[MAX_IC_BUFFER_SIZE];
 				ZeroMemory(pRet, MAX_IC_BUFFER_SIZE);
-				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("RFTypeABCommand, recvBuf.dwSize:%d", recvBuf.dwSize);
+				DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("RFTypeABCommand, recvBuf.dwSize:%d", recvBuf.dwSize);
 				HexBuf2StrBuf(recvBuf.data, (char**)&pRet, recvBuf.dwSize);
 				ctx->Ans.ret1.Init(1);
 				ctx->Ans.ret2.Init(1);
@@ -9967,9 +9967,10 @@ bool CCardIssuerFSM::AfterPreOnlineCrossJS(const int slot,CSimpleStringA cardNo)
 	}
 	else
 	{
-		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("AfterPreOnlineCrossJS::MoveCardToSlot err, slot:%d", slot);
+		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, "", "");
+		SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_MoveCardToSlot, "DevAdapter::MoveCardFromSlot", __FUNCTION__, false, l_endTime - l_beginTime, "", errMsg.GetData());
 
 
 		eErr = MachineMoveCardBackNotHold();

+ 1 - 1
Module/mod_cardissuerstore/mod_cardissuerStore.cpp

@@ -171,7 +171,7 @@ void CardIssuerStoreServerSession::Handle_ReadBatchCardInfoInRangeJS(SpReqAnsCon
 {
 	LOG_FUNCTION();
 	DbgToBeidou(ctx->link, __FUNCTION__)();
-	DbgWithLink(LOG_LEVEL_INFO, ctx->link.checkEmpty() ? LOG_TYPE_SYSTEM : LOG_TYPE_USER).setAPI(__FUNCTION__)("Invoke ReadBatchCardInfoInRangeJS");
+	DbgWithLink(LOG_LEVEL_INFO, ctx->link.checkEmpty() ? LOG_TYPE_SYSTEM : LOG_TYPE_USER).setAPI(__FUNCTION__)("Invoke ReadBatchCardInfoInRangeJS  beginSlot=%d, endSlot=%d", ctx->Req.beginSlot, ctx->Req.endSlot);
 	m_pEntity->ReadBatchCardInfoInRangeJS(ctx);
 }
 //卡库容量和卡槽状态