~chenluhua/Bond2.git

			@@ -1,4 +1,4 @@
			#pragma once
			#pragma once
			#include <string>
			#include <list>
			#include "HsmsAction.h"
			@@ -7,6 +7,8 @@
			#include <map>
			#include <set>
			#include "CCollectionEvent.h"
			#include "ProcessJob.h"
			#include "CControlJob.h"


			#define EQCONSTANT_VALUE_MAX 64
			@@ -22,10 +24,22 @@
			#define ER_PARAM_ERROR -3
			#define ER_NO_EVENT -4
			#define ER_UNLINK_EVENT_REPORT -5
			#define ER_NO_PPID_LIST -6
			#define ER_NOT_SUPPORTED -7


			/* CAACK */

			#define CAACK_0 0 /* ok */
			#define CAACK_1 1 /* invalid command */
			#define CAACK_2 2 /* cannot perform now */
			#define CAACK_3 3 /* invalid data or argument */
			#define CAACK_4 4 /* initiated for asynchronous completion */
			#define CAACK_5 5 /* rejected - invalid state */
			#define CAACK_6 6 /* command performed with errors */

			/*
			* 常量数据结构
			* 常量数据结构
			*/
			typedef struct _EQConstant
			{
			@@ -34,7 +48,7 @@
			} EQConstant;

			/*
			* Command 数据结构
			* Command 数据结构
			*/
			typedef struct _CommandParameter
			{
			@@ -43,7 +57,7 @@
			} CommandParameter;

			/*
			* Report 数据结构
			* Report 数据结构
			*/
			typedef struct _REPORT
			{
			@@ -52,7 +66,7 @@
			} REPORT;

			/*
			* Value 数据结构
			* Value 数据结构
			*/
			typedef struct _VALUE
			{
			@@ -67,6 +81,15 @@
			typedef std::function<void(void* pFrom, SYSTEMTIME& time)> DATETIMESYNC;
			typedef std::function<void(void* pFrom, bool bEnable, std::vector<unsigned int>& ids)> EDEVENTREPORT;
			typedef std::function<void(void* pFrom, bool bEnable, unsigned int id)> EDALARMREPORT;
			typedef std::function<std::vector<std::string> (void* pFrom)> QUERYPPIDLIST;
			typedef std::function<unsigned int (void* pFrom,
			unsigned int DATAID,
			const char* pszCarrierAction,
			const char* pszCarrierId,
			unsigned char PTN,
			std::string& strErrorTxt)> CARRIERACTION;
			typedef std::function<int(void* pFrom, std::vector<SERVO::CProcessJob*>& pjs)> PRJOBMULTICREATE;
			typedef std::function<int(void* pFrom, SERVO::CControlJob& controlJob)> CONTROLJOBCREATE;
			typedef struct _SECSListener
			{
			SECSEQOFFLINE onEQOffLine;
			@@ -77,6 +100,10 @@
			DATETIMESYNC onDatetimeSync;
			EDEVENTREPORT onEnableDisableEventReport;
			EDALARMREPORT onEnableDisableAlarmReport;
			QUERYPPIDLIST onQueryPPIDList;
			CARRIERACTION onCarrierAction;
			PRJOBMULTICREATE onPRJobMultiCreate;
			CONTROLJOBCREATE onControlJobCreate;
			} SECSListener;


			@@ -88,53 +115,63 @@
			~CHsmsPassive();

			public:
			/* 设置机器型号最大长度 20 bytes */
			/* 设置机器型号最大长度 20 bytes */
			void setEquipmentModelType(const char* pszMode);

			/* 设置软件版本号最大长度 20 bytes */
			/* 设置软件版本号最大长度 20 bytes */
			void setSoftRev(const char* pszRev);

			// 连接Report
			/* 添加变量值到ISECS2Item */
			void addVariableValueToItem(ISECS2Item* pParent, SERVO::CVariable* pVariable);

			// 连接Report
			void linkEventReport(unsigned int CEID, unsigned int RPTID);

			// 取消连接report
			// 取消连接report
			void unlinkEventReport(unsigned int CEID);

			// define Report
			SERVO::CReport* defineReport(unsigned int RPTID, std::vector<unsigned int>& vids);

			// 取消 define report
			// 取消 define report
			bool removeReport(int rptid);
			void clearAllReport();

			// 从文件中加载CVariable列表
			// 从文件中加载CVariable列表
			int loadVarialbles(const char* pszFilepath);

			// 取得CVariable列表
			// 取得CVariable列表
			std::vector<SERVO::CVariable*>& getVariables();

			// 取得指定Variable
			// 取得指定Variable
			SERVO::CVariable* getVariable(int variableId);
			SERVO::CVariable* getVariable(const char* pszName);
			int deleteVariable(int variableId);

			// 从文件中加载CReport列表
			// 设置变量值
			void setVariableValue(const char* pszName, __int64 value);
			void setVariableValue(const char* pszName, const char* value);
			void setVariableValue(const char* pszName, std::vector<SERVO::CVariable>& vars);

			// 从文件中加载CReport列表
			int loadReports(const char* pszFilepath);

			// 取得Report列表
			// 取得Report列表
			std::vector<SERVO::CReport*>& getReports();

			// 从文件中加载CCollectionEvent列表
			// 从文件中加载CCollectionEvent列表
			int loadCollectionEvents(const char* pszFilepath);

			// 取得CCollectionEvent列表
			// 取得CCollectionEvent列表
			std::vector<SERVO::CCollectionEvent*>& getCollectionEvents();

			// 取消/删除所有CollectionEvent
			// 取消/删除所有CollectionEvent
			void clearAllCollectionEvent();

			// 取得CCollectionEvent
			// 取得CCollectionEvent
			SERVO::CCollectionEvent* getEvent(unsigned short CEID);

			// 取得Report
			// 取得Report
			SERVO::CReport* getReport(int rptid);

			void setListener(SECSListener listener);
			@@ -142,20 +179,38 @@
			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开头的函数为主动发送数据的函数 */
			/* request开头的函数为主动发送数据的函数 */
			int requestAreYouThere();
			int requestAlarmReport(int ALCD, int ALID, const char* ALTX);
			int requestEventReportSend(unsigned int DATAID, unsigned int CEID, const std::vector<std::string>& values);
			int requestEventReportSend(unsigned int CEID);
			int requestEventReportSend(const char* pszEventName);
			int requestEventReportSend_CarrierID_Readed();
			int requestEventReportSend_Port_Unload_Ready();
			int requestEventReportSend_Port_Load_Ready();
			int requestEventReportSend_Port_Blocked();
			int requestEventReportSend_PJ_Queued();
			int requestEventReportSend_PJ_Start();
			int requestEventReportSend_PJ_End();
			int requestEventReportSend_CJ_Start();
			int requestEventReportSend_CJ_End();
			int requestEventReportSend_Panel_Start();
			int requestEventReportSend_Panel_End();
			int requestEventReportSend_OCR_PanelID_Read_OK();

			private:
			void replyAck(int s, int f, unsigned int systemBytes, BYTE ack, const char* pszAckName);

			/* reply开头的函数为回复函数 */
			/* reply开头的函数为回复函数 */
			int replyAreYouThere(IMessage* pRecv);
			int replyEstablishCommunications(IMessage* pRecv);
			int replySelectedEquipmentStatusData(IMessage* pRecv);
			int replyOnLine(IMessage* pRecv);
			int replyOffLine(IMessage* pRecv);
			int replyEquipmentConstantRequest(IMessage* pRecv);
			@@ -166,9 +221,13 @@
			int replyEanbleDisableEventReport(IMessage* pRecv);
			int replyCommand(IMessage* pRecv);
			int replyConfigureSpooling(IMessage* pRecv);
			int replyCarrierAction(IMessage* pRecv);
			int replyEanbleDisableAlarmReport(IMessage* pRecv);
			int replyPurgeSpooledData(IMessage* pRecv);
			int replyQueryPPIDList(IMessage* pRecv);
			int replyTerminalDisplay(IMessage* pRecv);
			int replyCreateObj(IMessage* pRecv);
			int replyPRJobMultiCreate(IMessage* pRecv);

			private:
			inline void Lock() { EnterCriticalSection(&m_criticalSection); }
			@@ -189,13 +248,19 @@
			CRITICAL_SECTION m_criticalSection;
			std::list<CHsmsAction*> m_listAction;
			std::list<CHsmsAction*> m_listActionSent;
			std::list<CHsmsAction*> m_listActionSpooling;

			private:
			SECSListener m_listener;
			std::string m_strVariableFilepath;
			bool m_bVariableUtf8{ false };
			bool m_bVariableUtf8Bom{ false };
			BOOL m_bCimWorking;
			HANDLE m_hCimWorkEvent;
			HANDLE m_hCimWorkThreadHandle;
			unsigned m_nCimWorkThrdaddr;
			std::string m_strCacheFilepath;
			CHsmsAction* m_pActiveAction;

			private:
			// CVariable vector