From 421aabbb83aa017f10be255b3b5a2e3f69abb816 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 21 七月 2025 08:50:19 +0800
Subject: [PATCH] 1.none

---
 SourceCode/Bond/Servo/HsmsPassive.h |   69 ++++++++++++++++++++++++++++++++++
 1 files changed, 69 insertions(+), 0 deletions(-)

diff --git a/SourceCode/Bond/Servo/HsmsPassive.h b/SourceCode/Bond/Servo/HsmsPassive.h
index 670befa..7dbbbf6 100644
--- a/SourceCode/Bond/Servo/HsmsPassive.h
+++ b/SourceCode/Bond/Servo/HsmsPassive.h
@@ -5,12 +5,14 @@
 #include <functional>
 #include <vector>
 #include <map>
+#include "CCollectionEvent.h"
 
 
 #define EQCONSTANT_VALUE_MAX	64
 #define COMMAND_NAME_MAX		64
 #define COMMAND_VALUE_MAX		64
 #define REPORT_NAME_MAX			64
+#define VALUE_NAME_MAX			64
 
 
 #define ER_NOERROR			0
@@ -46,10 +48,22 @@
 	unsigned int id;
 } REPORT;
 
+/*
+ * Value 数据结构
+ */
+typedef struct _VALUE
+{
+	char szName[VALUE_NAME_MAX];
+	unsigned int id;
+} VALUE;
+
 
 typedef std::function<void(void* pFrom)> SECSEQOFFLINE;
 typedef std::function<void(void* pFrom, std::vector<EQConstant>&)> SECSEQCONSTANTREQUEST;
 typedef std::function<void(void* pFrom, const char*, std::vector<CommandParameter>&)> SECSCommand;
+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 struct _SECSListener
 {
 	SECSEQOFFLINE				onEQOffLine;
@@ -57,6 +71,9 @@
 	SECSEQCONSTANTREQUEST		onEQConstantRequest;
 	SECSEQCONSTANTREQUEST		onEQConstantSend;
 	SECSCommand					onCommand;
+	DATETIMESYNC				onDatetimeSync;
+	EDEVENTREPORT				onEnableDisableEventReport;
+	EDALARMREPORT				onEnableDisableAlarmReport;
 } SECSListener;
 
 
@@ -83,6 +100,42 @@
 	// 取消连接report
 	void unlinkEventReport(unsigned int CEID);
 
+	unsigned int getCEID(int RPTID);
+
+	// define Report
+	SERVO::CReport* defineReport(unsigned int RPTID, std::vector<unsigned int>& vids);
+
+	// 取消 define report
+	bool removeReport(int rptid);
+	void clearAllReport();
+
+	// 从文件中加载CVariable列表
+	int loadVarialbles(const char* pszFilepath);
+
+	// 取得CVariable列表
+	std::vector<SERVO::CVariable*>& getVariables();
+
+	// 取得指定Variable
+	SERVO::CVariable* getVariable(int variableId);
+
+	// 从文件中加载CReport列表
+	int loadReports(const char* pszFilepath);
+
+	// 取得Report列表
+	std::vector<SERVO::CReport*>& getReports();
+
+	// 从文件中加载CCollectionEvent列表
+	int loadCollectionEvents(const char* pszFilepath);
+
+	// 取得CCollectionEvent列表
+	std::vector<SERVO::CCollectionEvent*>& getCollectionEvents();
+
+	// 取消/删除所有CollectionEvent
+	void clearAllCollectionEvent();
+
+
+	SERVO::CReport* getReport(int rptid);
+
 	void setListener(SECSListener listener);
 	unsigned OnCimWork();
 	void OnTimer(UINT nTimerid);
@@ -94,6 +147,7 @@
 	/* request开头的函数为主动发送数据的函数 */
 	int requestAreYouThere();
 	int requestAlarmReport(int ALCD, int ALID, const char* ALTX);
+	int requestEventReportSend(unsigned int DATAID, unsigned int RPTID, const std::vector<std::string>& values);
 
 private:
 	void replyAck(int s, int f, unsigned int systemBytes, BYTE ack, const char* pszAckName);
@@ -106,6 +160,7 @@
 	int replyEquipmentConstantRequest(IMessage* pRecv);
 	int replyEquipmentConstantSend(IMessage* pRecv);
 	int replyDatetime(IMessage* pRecv);
+	int replyDefineReport(IMessage* pRecv);
 	int replyLinkEventReport(IMessage* pRecv);
 	int replyEanbleDisableEventReport(IMessage* pRecv);
 	int replyCommand(IMessage* pRecv);
@@ -117,6 +172,8 @@
 	inline void Lock() { EnterCriticalSection(&m_criticalSection); }
 	inline void Unlock() { LeaveCriticalSection(&m_criticalSection); }
 	int onRecvMsg(IMessage* pMessage);
+	void clearAllVariabel();
+	std::vector<unsigned int> parseVidList(CString& strNums);
 
 private:
 	CModel* m_pModel;
@@ -144,5 +201,17 @@
 	
 	// RPTID to Report
 	std::map<unsigned int, REPORT> m_mapReport;
+
+	// VID to Report
+	std::map<unsigned int, VALUE> m_mapValue;
+
+	// CVariable vector
+	std::vector<SERVO::CVariable*> m_variabels;
+
+	// CReport vector
+	std::vector<SERVO::CReport*> m_reports;
+
+	// CollectionEvent vector
+	std::vector<SERVO::CCollectionEvent*> m_collectionEvent;
 };
 

--
Gitblit v1.9.3