Browse Source

Z991239-5054 #comment 信创增加支持接口

oilyang 1 year ago
parent
commit
41796b5e6e
2 changed files with 49 additions and 17 deletions
  1. 16 4
      Module/mod_vtmloader/mod_vtmloader.cpp
  2. 33 13
      Module/mod_vtmloader/mod_vtmloader.h

+ 16 - 4
Module/mod_vtmloader/mod_vtmloader.cpp

@@ -7,6 +7,22 @@
 #include "tokenDefine.h"
 #include <SpIni.h>
 
+void VtmLoaderServerSession::Handle_SetTerminalNo(SpReqAnsContext<VtmLoaderService_SetTerminalNo_Req, VtmLoaderService_SetTerminalNo_Ans>::Pointer ctx)
+{
+	m_pEntity->SetTerminalNo(ctx);
+}
+void VtmLoaderServerSession::Handle_NoticeAppReady(SpReqAnsContext<VtmLoaderService_NoticeAppReady_Req, VtmLoaderService_NoticeAppReady_Ans>::Pointer ctx)
+{
+	//m_pEntity->NoticeAppReady(ctx);
+}
+void VtmLoaderServerSession::Handle_CheckDeviceEntity(SpReqAnsContext<VtmLoaderService_CheckDeviceEntity_Req, VtmLoaderService_CheckDeviceEntity_Ans>::Pointer ctx)
+{
+	m_pEntity->CheckDeviceEntity(ctx);
+}
+void VtmLoaderServerSession::Handle_SaveTerminalNo(SpReqAnsContext<VtmLoaderService_SaveTerminalNo_Req, VtmLoaderService_SaveTerminalNo_Ans>::Pointer ctx)
+{
+	m_pEntity->SaveTerminalNo(ctx);
+}
 
 void CVtmLoaderEntity::OnPreStart(CAutoArray<CSimpleStringA> strArgs,CSmartPointer<ITransactionContext> pTransactionContext) 
 {
@@ -22,10 +38,6 @@ void CVtmLoaderEntity::OnPreClose(EntityCloseCauseEnum eCloseCause,CSmartPointer
 	pTransactionContext->SendAnswer(Error_Succeed); 
 }	
 
-CServerSessionBase *CVtmLoaderEntity::OnNewSession(const char* /*pszRemoteEntityName*/, const char * /*pszParam*/)
-{
-	return new CVtmLoaderSession(this);
-}
 
 void CVtmLoaderEntity::OnLog(const CAutoArray<CUUID> &SubIDs, const CUUID nLogID,const LogTypeEnum eLogType, const SeverityLevelEnum eLevel,
 	const DWORD dwSysError,const DWORD dwUserCode,const DWORD dwEntityInstanceID, const WORD wEntityDevelID, 

+ 33 - 13
Module/mod_vtmloader/mod_vtmloader.h

@@ -5,8 +5,21 @@
 //#include "IHttpFunc.h"
 #include "VtmLoader_server_g.h"
 using namespace VtmLoader;
+class CVtmLoaderEntity;
+
+class VtmLoaderServerSession : public VtmLoaderService_ServerSessionBase
+{
+public:
+	VtmLoaderServerSession(CVtmLoaderEntity* pEntity) :m_pEntity(pEntity) {}
+	virtual ~VtmLoaderServerSession() {}
+	virtual void Handle_SetTerminalNo(SpReqAnsContext<VtmLoaderService_SetTerminalNo_Req, VtmLoaderService_SetTerminalNo_Ans>::Pointer ctx);
+	virtual void Handle_NoticeAppReady(SpReqAnsContext<VtmLoaderService_NoticeAppReady_Req, VtmLoaderService_NoticeAppReady_Ans>::Pointer ctx);
+	virtual void Handle_CheckDeviceEntity(SpReqAnsContext<VtmLoaderService_CheckDeviceEntity_Req, VtmLoaderService_CheckDeviceEntity_Ans>::Pointer ctx);
+	virtual void Handle_SaveTerminalNo(SpReqAnsContext<VtmLoaderService_SaveTerminalNo_Req, VtmLoaderService_SaveTerminalNo_Ans>::Pointer ctx);
+private:
+	CVtmLoaderEntity* m_pEntity;
+};
 
-// 
 class CVtmLoaderEntity : public CEntityBase, public ILogListener
 {
 public:
@@ -21,7 +34,10 @@ public:
 
 	virtual void OnPreStart(CAutoArray<CSimpleStringA> strArgs,CSmartPointer<ITransactionContext> pTransactionContext);
 	virtual void OnPreClose(EntityCloseCauseEnum eCloseCause,CSmartPointer<ITransactionContext> pTransactionContext) ;
-	virtual CServerSessionBase *OnNewSession(const char* /*pszRemoteEntityName*/, const char * /*pszParam*/);
+	virtual CServerSessionBase *OnNewSession(const char* /*pszRemoteEntityName*/, const char * /*pszParam*/)
+	{
+		return new VtmLoaderServerSession(this);
+	}
 	virtual void OnLog(const CAutoArray<CUUID> &SubIDs, const CUUID nLogID,const LogTypeEnum eLogType, const SeverityLevelEnum eLevel,
 		const DWORD dwSysError,const DWORD dwUserCode,const DWORD dwEntityInstanceID, const WORD wEntityDevelID, 
 		const CAutoArray<DWORD> &Param, const char *pszEntityName, const char *pszModuleName,const char *pszMessage, const linkContext &pLinkInfo);
@@ -29,7 +45,21 @@ public:
 	ErrorCodeEnum UnsubscribeEntitysEvents();
 	CSimpleStringA GetCurMaintainer(){ return m_strUserID;}
 
-
+	void SetTerminalNo(SpReqAnsContext<VtmLoaderService_SetTerminalNo_Req, VtmLoaderService_SetTerminalNo_Ans>::Pointer ctx) { m_FSM.SetTerminalNo(ctx); }
+	//void NoticeAppReady(SpReqAnsContext<VtmLoaderService_NoticeAppReady_Req, VtmLoaderService_NoticeAppReady_Ans>::Pointer ctx);
+	void CheckDeviceEntity(SpReqAnsContext<VtmLoaderService_CheckDeviceEntity_Req, VtmLoaderService_CheckDeviceEntity_Ans>::Pointer ctx)
+	{
+		CheckDeviceEntityEvent* pEvt = new CheckDeviceEntityEvent();
+		pEvt->ctx = ctx;
+		m_FSM.PostEventFIFO(pEvt);
+	}
+	void SaveTerminalNo(SpReqAnsContext<VtmLoaderService_SaveTerminalNo_Req, VtmLoaderService_SaveTerminalNo_Ans>::Pointer ctx)
+	{
+		SaveTerminalNoEvent* pEvt = new SaveTerminalNoEvent();
+		pEvt->ctx = ctx;
+		m_FSM.PostEventFIFO(pEvt);
+	}
+	
 protected:
 	//GUITask m_task;
 	CVtmLoaderFSM m_FSM;
@@ -51,13 +81,3 @@ public:
 	//IHttpFunc* m_pHttpFunc;
 };
 
-class CVtmLoaderSession : public VtmLoaderService_ServerSessionBase
-{
-public:
-	CVtmLoaderSession(CVtmLoaderEntity *pEntity) : m_pEntity(pEntity) {}
-	virtual ~CVtmLoaderSession() {}
-	
-private:
-	CVtmLoaderEntity *m_pEntity;
-};
-