From aadeadede11fabacebc5378ac0548794f5f49a74 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期四, 11 十二月 2025 13:51:57 +0800
Subject: [PATCH] 1.实现报告的增加和删除；
---
SourceCode/Bond/Servo/HsmsPassive.h | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/HsmsPassive.h b/SourceCode/Bond/Servo/HsmsPassive.h
index de60213..91b03a4 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鍒楄〃
@@ -142,10 +145,14 @@
// 鍙栧緱CVariable鍒楄〃
std::vector<SERVO::CVariable*>& getVariables();
+ unsigned int getMaxVariableId() const;
// 鍙栧緱鎸囧畾Variable
SERVO::CVariable* getVariable(int variableId);
SERVO::CVariable* getVariable(const char* pszName);
+ int deleteVariable(int variableId);
+ int addVariable(const char* pszName, const char* pszFormat, const char* pszRemark, int& outId);
+ int updateVariable(int variableId, const char* pszName, const char* pszFormat, const char* pszRemark);
// 璁剧疆鍙橀噺鍊�
void setVariableValue(const char* pszName, __int64 value);
@@ -157,6 +164,7 @@
// 鍙栧緱Report鍒楄〃
std::vector<SERVO::CReport*>& getReports();
+ unsigned int getMaxReportId() const;
// 浠庢枃浠朵腑鍔犺浇CCollectionEvent鍒楄〃
int loadCollectionEvents(const char* pszFilepath);
@@ -234,6 +242,8 @@
int onRecvMsg(IMessage* pMessage);
void clearAllVariabel();
std::vector<unsigned int> parseVidList(CString& strNums);
+ int writeVariablesToFile(const std::string& filepath);
+ int writeReportsToFile(const std::string& filepath);
private:
CModel* m_pModel;
@@ -251,6 +261,12 @@
private:
SECSListener m_listener;
+ std::string m_strVariableFilepath;
+ bool m_bVariableUtf8{ false };
+ bool m_bVariableUtf8Bom{ false };
+ std::string m_strReportFilepath;
+ bool m_bReportUtf8{ false };
+ bool m_bReportUtf8Bom{ false };
BOOL m_bCimWorking;
HANDLE m_hCimWorkEvent;
HANDLE m_hCimWorkThreadHandle;
--
Gitblit v1.9.3