~chenluhua/Bond2.git

			@@ -5,6 +5,7 @@
			#include <functional>
			#include <vector>
			#include <map>
			#include <set>
			#include "CCollectionEvent.h"


			@@ -141,7 +142,11 @@
			void OnTimer(UINT nTimerid);
			void setActionTimeout(int nSecond);
			int init(CModel* pModel, const char* pszName, unsigned int port);
			int loadCacheFromFile(const char* pszFilepath);
			int saveCache();
			int term();
			int serialize(char* pszBuffer, int nBufferSize);
			int unserialize(const char* pszBuffer, int nBufferSize);

			public:
			/* request开头的函数为主动发送数据的函数 */
			@@ -164,7 +169,9 @@
			int replyLinkEventReport(IMessage* pRecv);
			int replyEanbleDisableEventReport(IMessage* pRecv);
			int replyCommand(IMessage* pRecv);
			int replyConfigureSpooling(IMessage* pRecv);
			int replyEanbleDisableAlarmReport(IMessage* pRecv);
			int replyPurgeSpooledData(IMessage* pRecv);
			int replyQueryPPIDList(IMessage* pRecv);
			int replyTerminalDisplay(IMessage* pRecv);

			@@ -187,6 +194,7 @@
			CRITICAL_SECTION m_criticalSection;
			std::list<CHsmsAction*> m_listAction;
			std::list<CHsmsAction*> m_listActionSent;
			std::list<CHsmsAction*> m_listActionSpooling;

			private:
			SECSListener m_listener;
			@@ -194,6 +202,8 @@
			HANDLE m_hCimWorkEvent;
			HANDLE m_hCimWorkThreadHandle;
			unsigned m_nCimWorkThrdaddr;
			std::string m_strCacheFilepath;
			CHsmsAction* m_pActiveAction;

			private:
			// CVariable vector
			@@ -204,5 +214,8 @@

			// CollectionEvent vector
			std::vector<SERVO::CCollectionEvent*> m_collectionEvents;

			// Spooling Config
			std::map<uint16_t, std::set<uint16_t>> m_spoolingConfig;
			};