Z991348-1263 #comment 发卡压力测试 other:发卡压力测试

Module/mod_cardissuer/CardIssuerFSM.cpp

@@ -2418,19 +2418,19 @@ int CCardIssuerFSM::UnAcceptCard()
 int CCardIssuerFSM::IssueCard(SpReqAnsContext<CardIssuerService_Issue_Req, CardIssuerService_Issue_Ans>::Pointer ctx, SpReqAnsContext<CardIssuerService_IssueEx_Req, CardIssuerService_IssueEx_Ans>::Pointer ctxEx)
 {
 	LOG_FUNCTION();
-#ifdef TWINKLE_LOCAL_DEBUG
+//#ifdef TWINKLE_LOCAL_DEBUG
 	//oiltest@20190725 便携卡机压力测试，仅供开发环境测试
 	if (ctxEx != NULL)
 	{
-		if (ctxEx->Req.hopper == 99)
+		if (ctxEx->Req.hopper == 199)
 		{
-			Dbg("SCI压力测试开始");
-			oiltestSCI();
-			Dbg("SCI压力测试结束");
+			Dbg("issue card no-stop begin");
+			oiltestSCI(false);
+			Dbg("issue card no-stop end");
 			return 0;
 		}
 	}
-#endif
+//#endif
 	if ((_strnicmp("RVC.PAD", m_csMachineType, strlen("RVC.PAD")) == 0 
 		|| (_strnicmp("RVC.Desk2S", m_csMachineType, strlen("RVC.Desk2S")) == 0 && m_majorVerion == 1 && m_minorVerion == 0))
 		&& !m_bChannelOK)
@@ -7087,10 +7087,10 @@ void CCardIssuerFSM::oiltest()
 	}
 }
 
-void CCardIssuerFSM::oiltestSCI()
+void CCardIssuerFSM::oiltestSCI(bool bSCI)
 {
 	LOG_FUNCTION();
-	if (!m_bChannelOK)
+	if (bSCI && !m_bChannelOK)
 	{
 		Dbg("SCI压力测试，安全通道建立不成功，终止测试");
 		return;
@@ -7123,6 +7123,7 @@ void CCardIssuerFSM::oiltestSCI()
 			if (hopperRemains == 0)
 			{
 				Dbg("卡箱1，卡箱2都没有卡片了");
+				Dbg("hopper 1 & 2 no more card.");
 				return;
 			}
 			else
@@ -7274,13 +7275,13 @@ void CCardIssuerFSM::oiltestSCI()
 			Dbg("asked to capture %d", eErr);
 			if (eErr != Error_Succeed)
 			{
-				Dbg("吞卡失败");
+				Dbg("capture card failed.");
 				DevErrorInfo devErrInfo;
 				m_pCardIssuer->GetLastErr(devErrInfo);
 				Dbg("capture err %s", devErrInfo.szErrMsg);
 			}
 			captureCount++;
-			Dbg("吞卡成功,%d", captureCount);
+			Dbg("capture card suc,the %d", captureCount);
 			m_pCardProcess->DataInit();
 			if (Error_Succeed == eErr) {
 				eErr = m_pCardIssuer->SetCardInType(CI_CARD_IN_TYPE_FORBIDDEN);
@@ -7300,13 +7301,13 @@ void CCardIssuerFSM::oiltestSCI()
 						//waitTries++;
 					}
 					else {
-						Dbg("卡片被取走");
+						Dbg("Card have been fetched.");
 						break;
 					}
 				}
 				else
 				{
-					Dbg("GetDevStatus 失败");
+					Dbg("GetDevStatus faied.");
 					break;
 				}
 			} while ((dwEnd - dwStart) < 60 * 1000);

Module/mod_cardissuer/CardIssuerFSM.h

@@ -874,7 +874,7 @@ public:
 	void GetSCINo(CSimpleStringA&);
 
 	void oiltest();
-	void oiltestSCI();
+	void oiltestSCI(bool bSCI = true);
 	bool WriteSlotInfo(CSmartPointer<IConfigInfo> &cfgRun, const char *acc, const char *cardSerial,int slot,bool bClear=false);
 	bool ReadSlotInfo(CSmartPointer<IConfigInfo> &cfgRun, CSimpleStringA &acc, CSimpleStringA &cardSerial, int slot, int &hasCard);
 	bool WriteCardInfo(CSmartPointer<IConfigInfo> &cfgRun, const char *acc, const char* serial, int slot, bool bClear = false, bool bHasCard = false);