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

Signed-Off-By: commit-hook

Module/mod_cardissuerstore/CardIssuerStoreFSM.cpp

@@ -6318,8 +6318,7 @@ int CCardIssuerFSM::FindFirstEmptySlot()
 
 	if (eErr != Error_Succeed)
 	{
-		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("FindFirstEmptySlot::QuerySlotsStatus fail");
-		SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_QuerySlotsStatus, "DevAdapter::QuerySlotsStatus", __FUNCTION__, false, l_endTime - l_beginTime, "", "");
+		SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_QuerySlotsStatus, "DevAdapter::QuerySlotsStatus", __FUNCTION__, false, l_endTime - l_beginTime, "", "FindFirstEmptySlot::QuerySlotsStatus fail");
 		return -1;
 	}
 	else {
@@ -6336,7 +6335,7 @@ int CCardIssuerFSM::FindFirstEmptySlot()
 			return i;
 		}
 	}
-	DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("can't find a empty slot");
+	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("can't find a empty slot");
 	return -1;
 }
 bool CCardIssuerFSM::IsValidSlotNum(const int slot)
@@ -6359,7 +6358,6 @@ bool CCardIssuerFSM::IsSlotHasCard(const int slot)
 		
 
 		if(eErr != Error_Succeed){
-			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("IsSlotHasCard::QuerySlotsStatus fail, slot:%d", slot);
 			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());
 		}
@@ -6402,7 +6400,7 @@ void CCardIssuerFSM::AfterPreOnlineOnStore(ErrorCodeEnum err, const int slot)
 		}
 		else
 		{
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("AfterPreOnlineOnStore::MoveCardToSlot fail, slot:%d ", 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());
@@ -6440,22 +6438,23 @@ bool CCardIssuerFSM::OperateCardStore(CSmartPointer<IConfigInfo>& spConfigRun, i
 
 		if (eErr == Error_Succeed)
 		{
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::ReadAccount").setCostTime(l_endTime - l_beginTime)("OperateCardStore::ReadAccount");
+			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::ReadAccount").setCostTime(l_endTime - l_beginTime)("OperateCardStore::ReadAccount, dwSize:%d, t2Size:%d, t3Size:%d",
+				card.dwSize, card.dwTrack2Size, card.dwTrack3Size);
 		}
 		else {
 			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("OperateCardStore::ReadAccount fail");
 			SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_ReadAccount, "DevAdapter::ReadAccount", __FUNCTION__, false, l_endTime - l_beginTime, "", "");
 		}
 
-		LogWarn(Severity_Low, Error_Unexpect, CardIssuerStore_UserErrorCode_ReadAccount_Cost_Time, CSimpleStringA::Format("{\"cost\":%d}", l_endTime - l_beginTime));
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("OperateCardStore::ReadAccount, dwSize:%d, t2Size:%d, t3Size:%d,eErr:%d",
-			card.dwSize, card.dwTrack2Size, card.dwTrack3Size, eErr);
+		//LogWarn(Severity_Low, Error_Unexpect, CardIssuerStore_UserErrorCode_ReadAccount_Cost_Time, CSimpleStringA::Format("{\"cost\":%d}", l_endTime - l_beginTime));
+		//DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("OperateCardStore::ReadAccount, dwSize:%d, t2Size:%d, t3Size:%d,eErr:%d",
+		//	card.dwSize, card.dwTrack2Size, card.dwTrack3Size, eErr);
 
 		bool bDataOK = true;
 		//读卡成功并解析出卡序号，才算成功，卡序号也要返回
 		if (eErr == Error_Succeed && card.dwSize > 0 && card.dwSize < 64)
 		{
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("read account OK.");
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("read account OK.");
 			//oilyang@20201217 if only ic 
 			if (card.dwTrack3Size == 2)
 			{
@@ -6494,9 +6493,12 @@ bool CCardIssuerFSM::OperateCardStore(CSmartPointer<IConfigInfo>& spConfigRun, i
 			if (card.dwSize > 6)
 			{
 				string xTestStr(card.account);
-				LogWarn(Severity_Low, Error_Succeed, CardIssuerStore_UserErrorCode_CardBin, CSimpleStringA::Format("cardBin:%s****%s", xTestStr.substr(0, 6).c_str(), xTestStr.substr(card.dwSize - 4, 4).c_str()));
+				CSimpleStringA cardInfo(true);
+				cardInfo = CSimpleStringA::Format("cardBin:%s****%s , len:%d", xTestStr.substr(0, 6).c_str(), xTestStr.substr(card.dwSize - 4, 4).c_str(), xTestStr.length());
+				LogWarn(Severity_Low, Error_Succeed, CardIssuerStore_UserErrorCode_CardBin, cardInfo.GetData());
+				//LogWarn(Severity_Low, Error_Succeed, CardIssuerStore_UserErrorCode_CardBin, CSimpleStringA::Format("cardBin:%s****%s , len:%d", xTestStr.substr(0, 6).c_str(), xTestStr.substr(card.dwSize - 4, 4).c_str()));
 			}
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("card.account:%d, card serial %s", m_currCardNo.GetLength(), m_addCardSerial.GetData());
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("card.account:%d, card serial %s", m_currCardNo.GetLength(), m_addCardSerial.GetData());
 			if (m_addCardSerial.GetLength() <= 0)
 				bDataOK = false;
 		}
@@ -6530,12 +6532,12 @@ bool CCardIssuerFSM::OperateCardStore(CSmartPointer<IConfigInfo>& spConfigRun, i
 				}
 				else
 				{
-					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("operate slot(%d) success, but write card info to cardissuer.ini failed.", slot);
+					DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode(RTAERR_CONFIG_WRITE_FAILED)("operate slot(%d) success, but write card info to cardissuer.ini failed.", slot);
 				}
 			}
 			else
 			{
-				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("OperateCardStore::MoveCardToSlot, slot:%d ", slot);
+				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());
@@ -6548,8 +6550,8 @@ bool CCardIssuerFSM::OperateCardStore(CSmartPointer<IConfigInfo>& spConfigRun, i
 	}
 	else
 	{
-		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("OperateCardStore::MoveCardFromSlot fail, slot:%d", slot);
-		SetErrorAndLog(eErr, MEC_DEVAPI_CARDISSUER_MoveCardFromSlot, "DevAdapter::MoveCardFromSlot", __FUNCTION__, false, l_endTime - l_beginTime, "", "");
+		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());
 		status = 1;
 	}
 	return false;
@@ -6720,9 +6722,10 @@ bool CCardIssuerFSM::CheckHasPanKuRecord(CSmartPointer<IConfigInfo>&spConfigRun)
 	int operFlag, slotNum;
 	spConfigRun->ReadConfigValueInt("OperateCardStore", "OperationFlag", operFlag);
 	spConfigRun->ReadConfigValueInt("OperateCardStore", "SlotNum", slotNum);
-	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("<CheckHasPanKuRecord>, operFlag:%d, slotNum:%d", operFlag, slotNum);
+	
 	if(operFlag == 1 && slotNum >= 0)
 	{
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("<CheckHasPanKuRecord>, operFlag:%d, slotNum:%d", operFlag, slotNum);
 		return true;
 	}
 	return false;