From 8860b7e63527fad69f15944d340b7158edde1bed Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期六, 19 七月 2025 16:10:39 +0800
Subject: [PATCH] 1.Define Report功能测试，EAP模拟

---
 SourceCode/Bond/Servo/HsmsPassive.h |   13 ++++---------
 1 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/SourceCode/Bond/Servo/HsmsPassive.h b/SourceCode/Bond/Servo/HsmsPassive.h
index 742c7fc..7dbbbf6 100644
--- a/SourceCode/Bond/Servo/HsmsPassive.h
+++ b/SourceCode/Bond/Servo/HsmsPassive.h
@@ -103,10 +103,11 @@
 	unsigned int getCEID(int RPTID);
 
 	// define Report
-	void defineReport(unsigned int VID, unsigned int RPTID);
+	SERVO::CReport* defineReport(unsigned int RPTID, std::vector<unsigned int>& vids);
 
 	// 取消 define report
-	void deleteReport(unsigned int RPTID);
+	bool removeReport(int rptid);
+	void clearAllReport();
 
 	// 从文件中加载CVariable列表
 	int loadVarialbles(const char* pszFilepath);
@@ -120,9 +121,6 @@
 	// 从文件中加载CReport列表
 	int loadReports(const char* pszFilepath);
 
-	// 取消/删除所有 define report
-	void deleteAllReport();
-
 	// 取得Report列表
 	std::vector<SERVO::CReport*>& getReports();
 
@@ -134,6 +132,7 @@
 
 	// 取消/删除所有CollectionEvent
 	void clearAllCollectionEvent();
+
 
 	SERVO::CReport* getReport(int rptid);
 
@@ -175,7 +174,6 @@
 	int onRecvMsg(IMessage* pMessage);
 	void clearAllVariabel();
 	std::vector<unsigned int> parseVidList(CString& strNums);
-	void clearAllReport();
 
 private:
 	CModel* m_pModel;
@@ -203,9 +201,6 @@
 	
 	// RPTID to Report
 	std::map<unsigned int, REPORT> m_mapReport;
-
-	// VID to RPTID
-	std::map<unsigned int, unsigned int> m_mapValueIdToPRTID;
 
 	// VID to Report
 	std::map<unsigned int, VALUE> m_mapValue;

--
Gitblit v1.9.3