Z991239-5317 #comment 卡集实体引入新的卡机实体接口。

Signed-Off-By: commit-hook

Module/mod_CardReadAdapter/CardReadAdapterFSM.cpp

@@ -689,8 +689,8 @@ int CCardReadAdapterFSM::CardIssuerRead(SpReqAnsContext<CardReadAdapterService_R
 	if (IsTheEntity(ctx->Req.module,Module_CardIssuer) && IsCardIssuerSessionOK())
 	{
 		if (!IsCardIssuerStore()) {
-			CardIssuerService_QueryCardInfo_Req qciReq;
-			CardIssuerService_QueryCardInfo_Ans qciAns;
+			CardIssuerStandService_QueryCardInfo_Req qciReq;
+			CardIssuerStandService_QueryCardInfo_Ans qciAns;
 			bool bHasCard = false, bNeedPreOnline = false, bCardMismatch = false;
 			DWORD dwUsrErrCode = 0;
 			CSimpleStringA csRetStr(true);
@@ -719,8 +719,8 @@ int CCardReadAdapterFSM::CardIssuerRead(SpReqAnsContext<CardReadAdapterService_R
 						DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("before call CardIssuer->Insert, have received cancel event");
 						return 3;
 					}
-					CardIssuerService_Insert_Req req;
-					CardIssuerService_Insert_Ans ans;
+					CardIssuerStandService_Insert_Req req;
+					CardIssuerStandService_Insert_Ans ans;
 					req.aid = ctx->Req.aid;
 					DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("to call cardissuer insert..");
 					m_busCtx.eCardProcStage = Card_ProcStage_WaitForCard;
@@ -749,8 +749,8 @@ int CCardReadAdapterFSM::CardIssuerRead(SpReqAnsContext<CardReadAdapterService_R
 				}
 				if (bHasCard)
 				{
-					CardIssuerService_Read_Req reqR;
-					CardIssuerService_Read_Ans ansR;
+					CardIssuerStandService_Read_Req reqR;
+					CardIssuerStandService_Read_Ans ansR;
 					reqR.aid = ctx->Req.aid;
 					reqR.reserved1 = ctx->Req.lightPos;
 					DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("to read ctx->Req.lightPos:%d", ctx->Req.lightPos);
@@ -793,8 +793,8 @@ int CCardReadAdapterFSM::CardIssuerRead(SpReqAnsContext<CardReadAdapterService_R
 			}
 			if (bHasCard && bNeedPreOnline)
 			{
-				CardIssuerService_PreOnline_Req req;
-				CardIssuerService_PreOnline_Ans ans;
+				CardIssuerStandService_PreOnline_Req req;
+				CardIssuerStandService_PreOnline_Ans ans;
 				req.businessData = ctx->Req.businessData;
 				BroadcastReadICing(0);
 				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("to preonline");
@@ -806,8 +806,8 @@ int CCardReadAdapterFSM::CardIssuerRead(SpReqAnsContext<CardReadAdapterService_R
 					//oilyang@20220613 既然前面bNeedPreOnline给默认值，这里的判断也就失去了意义
 					//if (ctx->Ans.ICType == 1 || ctx->Ans.ICType == 3)
 					{
-						CardIssuerService_SetSomeFlag_Req ssfReq;
-						CardIssuerService_SetSomeFlag_Ans ssfAns;
+						CardIssuerStandService_SetSomeFlag_Req ssfReq;
+						CardIssuerStandService_SetSomeFlag_Ans ssfAns;
 						ssfReq.IssueBusiness = 4;
 						eErr = (*m_pCardIssuer)(EntityResource::getLink().upgradeLink())->SetSomeFlag(ssfReq, ssfAns, 5000, dwUsrErrCode);
 						if (eErr == Error_Succeed)
@@ -1133,8 +1133,8 @@ int CCardReadAdapterFSM::IssueCard(SpReqAnsContext<CardReadAdapterService_Issue_
 	{
 		if (!IsCardIssuerStore()) {
 			ErrorCodeEnum eErr = Error_Unexpect;
-			CardIssuerService_IssueEx_Req req;
-			CardIssuerService_IssueEx_Ans ans;
+			CardIssuerStandService_IssueEx_Req req;
+			CardIssuerStandService_IssueEx_Ans ans;
 			req.hopper = ctx->Req.hopper;
 			req.reserved1.Copy(ctx->Req.reserved1);
 			req.reserved2.Copy(ctx->Req.reserved2);
@@ -1420,8 +1420,8 @@ int CCardReadAdapterFSM::WriteTrack(SpReqAnsContext<CardReadAdapterService_Write
 	if (IsCardIssuerSessionOK())
 	{
 		if (!IsCardIssuerStore()) {
-			CardIssuerService_WriteTrack_Req req;
-			CardIssuerService_WriteTrack_Ans ans;
+			CardIssuerStandService_WriteTrack_Req req;
+			CardIssuerStandService_WriteTrack_Ans ans;
 			req.co = ctx->Req.co;
 			req.mode = ctx->Req.mode;
 			req.track1 = ctx->Req.track1;
@@ -1484,8 +1484,8 @@ int CCardReadAdapterFSM::PreOnline(SpReqAnsContext<CardReadAdapterService_PreOnl
 	if (IsTheEntity(ctx->Req.module, Module_CardIssuer) && IsCardIssuerSessionOK())
 	{
 		if (!IsCardIssuerStore()) {
-			CardIssuerService_PreOnline_Req req;
-			CardIssuerService_PreOnline_Ans ans;
+			CardIssuerStandService_PreOnline_Req req;
+			CardIssuerStandService_PreOnline_Ans ans;
 			req.businessData = ctx->Req.businessData;
 			if (!ctx->Req.reserved2[0].IsNullOrEmpty())
 				req.reserved1 = ctx->Req.reserved2[0];
@@ -1558,8 +1558,8 @@ int CCardReadAdapterFSM::PostOnline(SpReqAnsContext<CardReadAdapterService_PostO
 	if (IsTheEntity(ctx->Req.module, Module_CardIssuer) && IsCardIssuerSessionOK() && m_busCtx.eCardFromWhich == Card_In_CardIssuer)
 	{
 		if (!IsCardIssuerStore()) {
-			CardIssuerService_PostOnline_Req req;
-			CardIssuerService_PostOnline_Ans ans;
+			CardIssuerStandService_PostOnline_Req req;
+			CardIssuerStandService_PostOnline_Ans ans;
 			req.data = ctx->Req.data;
 			eErr = (*m_pCardIssuer)(EntityResource::getLink().upgradeLink())->PostOnline(req, ans, 50000, dwUsrErrCode, csRetStr);
 			if (eErr == Error_Succeed)
@@ -1616,8 +1616,8 @@ int CCardReadAdapterFSM::EjectCard(SpReqAnsContext<CardReadAdapterService_Eject_
 	if (IsTheEntity(ctx->Req.module, Module_CardIssuer) && IsCardIssuerSessionOK() && m_busCtx.eCardFromWhich == Card_In_CardIssuer)
 	{
 		if (!IsCardIssuerStore()) {
-			CardIssuerService_Eject_Req req;
-			CardIssuerService_Eject_Ans ans;
+			CardIssuerStandService_Eject_Req req;
+			CardIssuerStandService_Eject_Ans ans;
 			eErr = (*m_pCardIssuer)(EntityResource::getLink().upgradeLink())->Eject(req, ans, 50000, dwUsrErrCode, csRetStr);
 			if (eErr == Error_Succeed)
 			{
@@ -1680,8 +1680,8 @@ int CCardReadAdapterFSM::CaptureCard(SpReqAnsContext<CardReadAdapterService_Capt
 	if (IsTheEntity(ctx->Req.module, Module_CardIssuer) && IsCardIssuerSessionOK() && m_busCtx.eCardFromWhich == Card_In_CardIssuer)
 	{
 		if (!IsCardIssuerStore()) {
-			CardIssuerService_Capture_Req req;
-			CardIssuerService_Capture_Ans ans;
+			CardIssuerStandService_Capture_Req req;
+			CardIssuerStandService_Capture_Ans ans;
 			eErr = (*m_pCardIssuer)(EntityResource::getLink().upgradeLink())->Capture(req, ans, 15000, dwUsrErrCode, csRetStr);
 			if (eErr == Error_Succeed)
 			{
@@ -1725,8 +1725,8 @@ int CCardReadAdapterFSM::QueryCardInfo(SpReqAnsContext<CardReadAdapterService_Qu
 	if (IsTheEntity(ctx->Req.module, Module_CardIssuer) && IsCardIssuerSessionOK() && m_busCtx.eCardFromWhich == Card_In_CardIssuer)
 	{
 		if (!IsCardIssuerStore()) {
-			CardIssuerService_QueryCardInfo_Req req;
-			CardIssuerService_QueryCardInfo_Ans ans;
+			CardIssuerStandService_QueryCardInfo_Req req;
+			CardIssuerStandService_QueryCardInfo_Ans ans;
 			eErr = (*m_pCardIssuer)(EntityResource::getLink().upgradeLink())->QueryCardInfo(req, ans, 10000, dwUsrErrCode);
 			if (eErr == Error_Succeed)
 			{
@@ -1816,7 +1816,7 @@ void CCardReadAdapterFSM::CheckAndReconnectSession()
 					m_pCardIssuer->GetFunction()->CloseSession();
 					m_pCardIssuer = NULL;
 				}
-				m_pCardIssuer = new CardIssuerService_ClientBase(GetEntityBase());
+				m_pCardIssuer = new CardIssuerStandService_ClientBase(GetEntityBase());
 				if (m_pCardIssuer != NULL)
 				{
 					eErr = m_pCardIssuer->Connect();
@@ -1961,8 +1961,8 @@ int CCardReadAdapterFSM::SetSomeFlag(SpReqAnsContext<CardReadAdapterService_SetS
 	if (IsCardIssuerSessionOK())
 	{
 		if (!IsCardIssuerStore()) {
-			CardIssuerService_SetSomeFlag_Req req;
-			CardIssuerService_SetSomeFlag_Ans ans;
+			CardIssuerStandService_SetSomeFlag_Req req;
+			CardIssuerStandService_SetSomeFlag_Ans ans;
 			req.IssueBusiness = ctx->Req.IssueBusiness;
 			req.reserved1.Init(ctx->Req.reserved1.GetCount());
 			for (int i = 0; i < ctx->Req.reserved1.GetCount(); ++i)
@@ -2021,8 +2021,8 @@ int CCardReadAdapterFSM::GetDevInfo(SpReqAnsContext<CardReadAdapterService_GetDe
 	if (IsTheEntity(ctx->Req.module, Module_CardIssuer) && IsCardIssuerSessionOK())
 	{
 		if (!IsCardIssuerStore()) {
-			CardIssuerService_GetDevInfo_Req req;
-			CardIssuerService_GetDevInfo_Ans ans;
+			CardIssuerStandService_GetDevInfo_Req req;
+			CardIssuerStandService_GetDevInfo_Ans ans;
 			eErr = (*m_pCardIssuer)(EntityResource::getLink().upgradeLink())->GetDevInfo(req, ans, 10000);
 			if (eErr == Error_Succeed)
 			{
@@ -2114,8 +2114,8 @@ int CCardReadAdapterFSM::GetMaterialCount(SpReqAnsContext<CardReadAdapterService
 	if (IsCardIssuerSessionOK())
 	{
 		if (!IsCardIssuerStore()) {
-			CardIssuerService_GetMaterialCountEx_Req req;
-			CardIssuerService_GetMaterialCountEx_Ans ans;
+			CardIssuerStandService_GetMaterialCountEx_Req req;
+			CardIssuerStandService_GetMaterialCountEx_Ans ans;
 			req.GetHopper.Copy(ctx->Req.GetHopper);
 			req.reserved1.Copy(ctx->Req.reserved1);
 			req.reserved2.Copy(ctx->Req.reserved2);
@@ -2190,8 +2190,8 @@ int CCardReadAdapterFSM::SetMaterialCount(SpReqAnsContext<CardReadAdapterService
 	if (IsCardIssuerSessionOK())
 	{
 		if (!IsCardIssuerStore()) {
-			CardIssuerService_SetMaterialCountEx_Req req;
-			CardIssuerService_SetMaterialCountEx_Ans ans;
+			CardIssuerStandService_SetMaterialCountEx_Req req;
+			CardIssuerStandService_SetMaterialCountEx_Ans ans;
 			req.SetCaptured = ctx->Req.SetCaptured;
 			req.captured = ctx->Req.captured;
 			req.SetHopper.Copy(ctx->Req.SetHopper);
@@ -2264,8 +2264,8 @@ int CCardReadAdapterFSM::GetSCIInfo(SpReqAnsContext<CardReadAdapterService_GetSC
 	{
 		if (!IsCardIssuerStore()) {
 			ErrorCodeEnum eErr = Error_Unexpect;
-			CardIssuerService_GetSCIInfo_Req req;
-			CardIssuerService_GetSCIInfo_Ans ans;
+			CardIssuerStandService_GetSCIInfo_Req req;
+			CardIssuerStandService_GetSCIInfo_Ans ans;
 			eErr = (*m_pCardIssuer)(EntityResource::getLink().upgradeLink())->GetSCIInfo(req, ans, 15000);
 			if (eErr == Error_Succeed)
 			{
@@ -2312,8 +2312,8 @@ int CCardReadAdapterFSM::OpenSafeLock(SpReqAnsContext<CardReadAdapterService_Ope
 	{
 		if (!IsCardIssuerStore()) {
 			ErrorCodeEnum eErr = Error_Unexpect;
-			CardIssuerService_OpenSafeLock_Req req;
-			CardIssuerService_OpenSafeLock_Ans ans;
+			CardIssuerStandService_OpenSafeLock_Req req;
+			CardIssuerStandService_OpenSafeLock_Ans ans;
 			req.reserved1.Copy(ctx->Req.reserved1);
 			req.reserved2.Copy(ctx->Req.reserved2);
 			eErr = (*m_pCardIssuer)(EntityResource::getLink().upgradeLink())->OpenSafeLock(req, ans, 15000);
@@ -2401,8 +2401,8 @@ int CCardReadAdapterFSM::SAMICCommand(SpReqAnsContext<CardReadAdapterService_SAM
 	{
 		if (!IsCardIssuerStore()) {
 			ErrorCodeEnum eErr = Error_Unexpect;
-			CardIssuerService_SAMICCommand_Req req;
-			CardIssuerService_SAMICCommand_Ans ans;
+			CardIssuerStandService_SAMICCommand_Req req;
+			CardIssuerStandService_SAMICCommand_Ans ans;
 			req.cmdType = ctx->Req.cmdType;
 			req.param1.Copy(ctx->Req.param1);
 			req.param2.Copy(ctx->Req.param2);
@@ -2462,8 +2462,8 @@ int CCardReadAdapterFSM::QueryPrinterStatus(SpReqAnsContext<CardReadAdapterServi
 	{
 		if (!IsCardIssuerStore()) {
 			ErrorCodeEnum eErr = Error_Unexpect;
-			CardIssuerService_QueryPrinterStatus_Req req;
-			CardIssuerService_QueryPrinterStatus_Ans ans;
+			CardIssuerStandService_QueryPrinterStatus_Req req;
+			CardIssuerStandService_QueryPrinterStatus_Ans ans;
 			req.param1.Copy(ctx->Req.param1);
 			req.param2.Copy(ctx->Req.param2);
 			req.reserved1.Copy(ctx->Req.reserved1);
@@ -2519,8 +2519,8 @@ int CCardReadAdapterFSM::Print(SpReqAnsContext<CardReadAdapterService_Print_Req,
 	{
 		if (!IsCardIssuerStore()) {
 			ErrorCodeEnum eErr = Error_Unexpect;
-			CardIssuerService_Print_Req req;
-			CardIssuerService_Print_Ans ans;
+			CardIssuerStandService_Print_Req req;
+			CardIssuerStandService_Print_Ans ans;
 			req.data1 = ctx->Req.data1;
 			req.data2 = ctx->Req.data2;
 			req.data3 = ctx->Req.data3;
@@ -2582,8 +2582,8 @@ int CCardReadAdapterFSM::QuerySCIList(SpReqAnsContext<CardReadAdapterService_Que
 	{
 		if (!IsCardIssuerStore()) {
 			ErrorCodeEnum eErr = Error_Unexpect;
-			CardIssuerService_QuerySCIList_Req req;
-			CardIssuerService_QuerySCIList_Ans ans;
+			CardIssuerStandService_QuerySCIList_Req req;
+			CardIssuerStandService_QuerySCIList_Ans ans;
 			req.reserved1.Copy(ctx->Req.reserved1);
 			req.reserved2.Copy(ctx->Req.reserved2);
 			eErr = (*m_pCardIssuer)(EntityResource::getLink().upgradeLink())->QuerySCIList(req, ans, 50000, dwUsrErrCode);
@@ -2660,8 +2660,8 @@ int CCardReadAdapterFSM::BindSCI(SpReqAnsContext<CardReadAdapterService_BindSCI_
 	{
 		if (!IsCardIssuerStore()) {
 			ErrorCodeEnum eErr = Error_Unexpect;
-			CardIssuerService_BindSCI_Req req;
-			CardIssuerService_BindSCI_Ans ans;
+			CardIssuerStandService_BindSCI_Req req;
+			CardIssuerStandService_BindSCI_Ans ans;
 			req.type = ctx->Req.type;
 			req.sciNo = ctx->Req.sciNo;
 			req.reserved1.Copy(ctx->Req.reserved1);
@@ -2829,8 +2829,8 @@ int CCardReadAdapterFSM::QueryCardInfoOnStore(SpReqAnsContext<CardReadAdapterSer
 		if (!IsCardIssuerStore()) {
 			DWORD dwUserErrorCode = 0;
 			ErrorCodeEnum eErr = Error_Unexpect;
-			CardIssuerService_QueryCardInfoOnStore_Req req;
-			CardIssuerService_QueryCardInfoOnStore_Ans ans;
+			CardIssuerStandService_QueryCardInfoOnStore_Req req;
+			CardIssuerStandService_QueryCardInfoOnStore_Ans ans;
 			req.reserved1.Copy(ctx->Req.reserved1);
 			req.reserved2.Copy(ctx->Req.reserved2);
 			req.reserved3.Copy(ctx->Req.reserved3);
@@ -2895,8 +2895,8 @@ int CCardReadAdapterFSM::GetAddCardInfo(SpReqAnsContext<CardReadAdapterService_G
 		if (!IsCardIssuerStore()) {
 			DWORD dwUserErrorCode = 0;
 			ErrorCodeEnum eErr = Error_Unexpect;
-			CardIssuerService_GetAddCardInfo_Req req;
-			CardIssuerService_GetAddCardInfo_Ans ans;
+			CardIssuerStandService_GetAddCardInfo_Req req;
+			CardIssuerStandService_GetAddCardInfo_Ans ans;
 			req.isSync = ctx->Req.isSync;
 			req.reserved1.Copy(ctx->Req.reserved1);
 			req.reserved2.Copy(ctx->Req.reserved2);
@@ -3085,8 +3085,8 @@ void CCardReadAdapterFSM::CancelReadForEntity(ModuleType eModule)
 	{
 		if (!IsCardIssuerStore()) {
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Set cancel read by ContactlessCard flag of CardIssuer.");
-			CardIssuerService_SetSomeFlag_Req req;
-			CardIssuerService_SetSomeFlag_Ans ans;
+			CardIssuerStandService_SetSomeFlag_Req req;
+			CardIssuerStandService_SetSomeFlag_Ans ans;
 			req.IssueBusiness = 3;
 			(*m_pCardIssuer)(EntityResource::getLink().upgradeLink())->SetSomeFlag(req, ans, 5000);
 			(*m_pCardIssuer)(EntityResource::getLink().upgradeLink())->CancelInsert();
@@ -3114,8 +3114,8 @@ int CCardReadAdapterFSM::PrintCardIm(SpReqAnsContext<CardReadAdapterService_Prin
 	{
 		if (!IsCardIssuerStore()) {
 			ErrorCodeEnum eErr = Error_Unexpect;
-			CardIssuerService_PrintCardImmediately_Req req;
-			CardIssuerService_PrintCardImmediately_Ans ans;
+			CardIssuerStandService_PrintCardImmediately_Req req;
+			CardIssuerStandService_PrintCardImmediately_Ans ans;
 			req.formFile = ctx->Req.formFile;
 			req.printData = ctx->Req.printData;
 			req.reserved1.Copy(ctx->Req.reserved1);
@@ -3184,8 +3184,8 @@ int CCardReadAdapterFSM::QueryCIStatus(SpReqAnsContext<CardReadAdapterService_Qu
 	{
 		if (!IsCardIssuerStore()) {
 			ErrorCodeEnum eErr = Error_Unexpect;
-			CardIssuerService_QueryCIStatus_Req req;
-			CardIssuerService_QueryCIStatus_Ans ans;
+			CardIssuerStandService_QueryCIStatus_Req req;
+			CardIssuerStandService_QueryCIStatus_Ans ans;
 			req.reserved1.Copy(ctx->Req.reserved1);
 			req.reserved2.Copy(ctx->Req.reserved2);
 			req.reserved3.Copy(ctx->Req.reserved3);

Module/mod_CardReadAdapter/CardReadAdapterFSM.h

@@ -12,10 +12,10 @@
 #include "CardIssuerStore_UserErrorCode.h"
 //#include "ICDataElement.h"
 using namespace CardReadAdapter;
-#include "CardIssuer_client_g.h"
+#include "CardIssuerStand_client_g.h"
 #include "CardIssuerStore_client_g.h"
 #include "ContactlessCard_client_g.h"
-#include "CardIssuer_msg_g.h"
+#include "CardIssuerStand_msg_g.h"
 #include "CardIssuerStore_msg_g.h"
 #include "ContactlessCard_msg_g.h"
 #include "CardReadAdapter_msg_g.h"
@@ -25,7 +25,7 @@ using namespace CardReadAdapter;
 #include <map>
 using namespace std;
 using namespace HeartBeat;
-using namespace CardIssuer;
+using namespace CardIssuerStand;
 using namespace CardIssuerStore;
 using namespace ContactlessCard;
 
@@ -875,7 +875,7 @@ protected:
 	int m_ejectTries;
 private:
 	CCardReadAdapterEntity *m_pEty;
-	CardIssuerService_ClientBase *m_pCardIssuer;
+	CardIssuerStandService_ClientBase *m_pCardIssuer;
 	CardIssuerStoreService_ClientBase* m_pCardIssuerStore;
 	ContactlessCardService_ClientBase *m_pContactless;
 	HeartBeatService_ClientBase* m_pHBClient;

Module/mod_CardReadAdapter/mod_CardReadAdapter.cpp

@@ -264,11 +264,11 @@ void CCardReadAdapterEntity::OnBroadcastEvent(CUUID SubID, const char *pszEntity
 		return;
 
 	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("OnBroadcastEvent,msg:%s,%d,%d",pszEntityName,dwMessageId,dwMessageSignature);
-	if (_strnicmp(pszEntityName, "CardIssuer", strlen("CardIssuer")) == 0)
+	if (_strnicmp(pszEntityName, "CardIssuerStand", strlen("CardIssuerStand")) == 0)
 	{
 		if (dwMessageSignature == eMsgSig_FetchCard)
 		{
-			CardIssuer::FetchCard fc;
+			CardIssuerStand::FetchCard fc;
 			SpBuffer2Object(Buffer, fc);
 			CardIsserFetchCard evt;
 			evt.status = fc.status;
@@ -276,7 +276,7 @@ void CCardReadAdapterEntity::OnBroadcastEvent(CUUID SubID, const char *pszEntity
 		}
 		else if (dwMessageSignature == eMsgSig_SCIConnect)
 		{
-			CardIssuer::SCIConnect scic;
+			CardIssuerStand::SCIConnect scic;
 			SpBuffer2Object(Buffer, scic);
 			CardIssuerSCIConnect evt;
 			evt.status = scic.status;