Z991239-5267 #comment 卡集实体引入卡库实体新接口定义

Signed-Off-By: commit-hook

Module/mod_CardReadAdapter/CMakeLists.txt

@@ -15,6 +15,7 @@ target_include_directories(${MODULE_NAME} PRIVATE
 	${ModuleCommonHeadPath}
 	${MODULE_BASE_DIR}/mod_heartbeat
 	${MODULE_BASE_DIR}/mod_CardIssuerStand
+	${MODULE_BASE_DIR}/mod_cardissuerstore
 	${MODULE_BASE_DIR}/mod_ContactlessCard
 )
 

Module/mod_CardReadAdapter/CardReadAdapterFSM.h

@@ -12,8 +12,10 @@
 //#include "ICDataElement.h"
 using namespace CardReadAdapter;
 #include "CardIssuer_client_g.h"
+#include "CardIssuerStore_client_g.h"
 #include "ContactlessCard_client_g.h"
 #include "CardIssuer_msg_g.h"
+#include "CardIssuerStore_msg_g.h"
 #include "ContactlessCard_msg_g.h"
 #include "CardReadAdapter_msg_g.h"
 #include "HeartBeat_client_g.h"
@@ -23,6 +25,7 @@ using namespace CardReadAdapter;
 using namespace std;
 using namespace HeartBeat;
 using namespace CardIssuer;
+using namespace CardIssuerStore;
 using namespace ContactlessCard;
 
 
@@ -765,7 +768,7 @@ public:
 
 		END_FSM_RULE()
 
-		CCardReadAdapterFSM() : m_pCardIssuer(NULL), m_pContactless(NULL), m_pHBClient(NULL){}
+		CCardReadAdapterFSM() : m_pCardIssuer(NULL), m_pCardIssuerStore(NULL), m_pContactless(NULL), m_pHBClient(NULL){}
 	~CCardReadAdapterFSM(){}
 	virtual ErrorCodeEnum OnInit();
 	virtual ErrorCodeEnum OnExit();
@@ -872,6 +875,7 @@ protected:
 private:
 	CCardReadAdapterEntity *m_pEty;
 	CardIssuerService_ClientBase *m_pCardIssuer;
+	CardIssuerStoreService_ClientBase* m_pCardIssuerStore;
 	ContactlessCardService_ClientBase *m_pContactless;
 	HeartBeatService_ClientBase* m_pHBClient;
 	BusinessContext m_busCtx;
@@ -938,6 +942,15 @@ private:
 			return eErrCode;
 		}
 	}
+
+	bool IsCardIssuerStore() {
+		if (m_eMachineType == SP::Module::Comm::RVC_CardStore || m_eMachineType == SP::Module::Comm::RVC_CardPrinter) {
+			return true;
+		}
+		else {
+			return false;
+		}
+	}
 };
 struct InitTask : public ITaskSp
 {

Module/mod_CardReadAdapter/mod_CardReadAdapter.cpp

@@ -283,6 +283,25 @@ void CCardReadAdapterEntity::OnBroadcastEvent(CUUID SubID, const char *pszEntity
 			SpSendBroadcast(GetFunction(), SP_MSG_OF(CardIssuerSCIConnect), SP_MSG_SIG_OF(CardIssuerSCIConnect), evt);
 		}
 	}
+	else if (_strnicmp(pszEntityName, "CardIssuerStore", strlen("CardIssuerStore")) == 0)
+	{
+		if (dwMessageSignature == eMsgSig_FetchCard)
+		{
+			CardIssuerStore::FetchCard fc;
+			SpBuffer2Object(Buffer, fc);
+			CardIsserFetchCard evt;
+			evt.status = fc.status;
+			SpSendBroadcast(GetFunction(), SP_MSG_OF(CardIsserFetchCard), SP_MSG_SIG_OF(CardIsserFetchCard), evt);
+		}
+		else if (dwMessageSignature == eMsgSig_SCIConnect)
+		{
+			CardIssuerStore::SCIConnect scic;
+			SpBuffer2Object(Buffer, scic);
+			CardIssuerSCIConnect evt;
+			evt.status = scic.status;
+			SpSendBroadcast(GetFunction(), SP_MSG_OF(CardIssuerSCIConnect), SP_MSG_SIG_OF(CardIssuerSCIConnect), evt);
+		}
+	}
 	else if (_strnicmp(pszEntityName, "ContactlessCard", strlen("ContactlessCard")) == 0)
 	{
 		if (dwMessageSignature == eMsgSig_FetchCard)