From 33f080ddc32f3545b685b2e0a7a5df3c35894270 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期四, 11 十二月 2025 14:43:40 +0800
Subject: [PATCH] 1.Event删除功能的实现;

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

diff --git a/SourceCode/Bond/Servo/HsmsPassive.h b/SourceCode/Bond/Servo/HsmsPassive.h
index aeb5bde..8106bc4 100644
--- a/SourceCode/Bond/Servo/HsmsPassive.h
+++ b/SourceCode/Bond/Servo/HsmsPassive.h
@@ -135,6 +135,9 @@
 
 	// 鍙栨秷 define report
 	bool removeReport(int rptid);
+	int deleteReport(int rptid);
+	int addReport(int rptid, const std::vector<unsigned int>& vids);
+	int updateReport(int rptid, const std::vector<unsigned int>& vids);
 	void clearAllReport();
 
 	// 浠庢枃浠朵腑鍔犺浇CVariable鍒楄〃
@@ -161,6 +164,7 @@
 
 	// 鍙栧緱Report鍒楄〃
 	std::vector<SERVO::CReport*>& getReports();
+	unsigned int getMaxReportId() const;
 
 	// 浠庢枃浠朵腑鍔犺浇CCollectionEvent鍒楄〃
 	int loadCollectionEvents(const char* pszFilepath);
@@ -170,13 +174,13 @@
 
 	// 鍙栨秷/鍒犻櫎鎵�鏈塁ollectionEvent
 	void clearAllCollectionEvent();
+	int deleteCollectionEvent(unsigned short CEID);
 
 	// 鍙栧緱CCollectionEvent
 	SERVO::CCollectionEvent* getEvent(unsigned short CEID);
 
 	// 鍙栧緱Report
 	SERVO::CReport* getReport(int rptid);
-	int deleteReport(int rptid);
 
 	void setListener(SECSListener listener);
 	unsigned OnCimWork();
@@ -241,6 +245,7 @@
 	std::vector<unsigned int> parseVidList(CString& strNums);
 	int writeVariablesToFile(const std::string& filepath);
 	int writeReportsToFile(const std::string& filepath);
+	int writeCollectionEventsToFile(const std::string& filepath);
 
 private:
 	CModel* m_pModel;
@@ -264,6 +269,9 @@
 	std::string m_strReportFilepath;
 	bool m_bReportUtf8{ false };
 	bool m_bReportUtf8Bom{ false };
+	std::string m_strCollectionEventFilepath;
+	bool m_bCollectionUtf8{ false };
+	bool m_bCollectionUtf8Bom{ false };
 	BOOL m_bCimWorking;
 	HANDLE m_hCimWorkEvent;
 	HANDLE m_hCimWorkThreadHandle;

--
Gitblit v1.9.3