From 23a50ec03beb2a4d99cc89766256a053d1d19727 Mon Sep 17 00:00:00 2001
From: darker <mr.darker@163.com>
Date: 星期二, 11 二月 2025 11:23:14 +0800
Subject: [PATCH] 1. 修改SECS数据库管理类的名称，之前的名称不适合
---
/dev/null | 46 ---------------
SourceCode/Bond/Servo/Servo.vcxproj | 4
SourceCode/Bond/Servo/Servo.vcxproj.filters | 4
SourceCode/Bond/Servo/Servo.cpp | 14 ++--
SourceCode/Bond/Servo/SECSRuntimeManager.cpp | 22 +++---
SourceCode/Bond/Servo/SECSRuntimeManager.h | 46 +++++++++++++++
6 files changed, 68 insertions(+), 68 deletions(-)
diff --git a/SourceCode/Bond/Servo/SECSConfigManager.h b/SourceCode/Bond/Servo/SECSConfigManager.h
deleted file mode 100644
index 72c9d01..0000000
--- a/SourceCode/Bond/Servo/SECSConfigManager.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#ifndef SECS_CONFIG_MANAGER_H
-#define SECS_CONFIG_MANAGER_H
-
-#include <string>
-#include <vector>
-#include <mutex>
-#include "Database.h"
-
-class SECSConfigManager {
-public:
- /**
- * 获取单例实例
- * @return SECSConfigManager实例的引用
- */
- static SECSConfigManager& getInstance();
-
- /**
- * 设置数据库连接
- * @param db 数据库连接的指针
- */
- void setDatabase(BL::Database* db);
-
- /**
- * 初始化SECS设置管理库
- * @return 成功返回true，失败返回false
- */
- bool initSECSSetting();
-
- /**
- * 销毁SECS设置管理库
- */
- void termSECSSetting();
-
-private:
- SECSConfigManager();
- ~SECSConfigManager();
-
- // 禁止拷贝和赋值
- SECSConfigManager(const SECSConfigManager&) = delete;
- SECSConfigManager& operator=(const SECSConfigManager&) = delete;
-
- BL::Database* m_pDB;
- static std::mutex m_mutex;
-};
-
-#endif // SECS_CONFIG_MANAGER_H
\ No newline at end of file
diff --git a/SourceCode/Bond/Servo/SECSConfigManager.cpp b/SourceCode/Bond/Servo/SECSRuntimeManager.cpp
similarity index 65%
rename from SourceCode/Bond/Servo/SECSConfigManager.cpp
rename to SourceCode/Bond/Servo/SECSRuntimeManager.cpp
index 1e28577..8838144 100644
--- a/SourceCode/Bond/Servo/SECSConfigManager.cpp
+++ b/SourceCode/Bond/Servo/SECSRuntimeManager.cpp
@@ -1,26 +1,26 @@
#include "stdafx.h"
-#include "SECSConfigManager.h"
+#include "SECSRuntimeManager.h"
// 常量
-const std::string DATABASE_FILE = R"(SECSConfigManager.db)";
+const std::string DATABASE_FILE = R"(SECSRuntimeManager.db)";
// 静态成员初始化
-std::mutex SECSConfigManager::m_mutex;
+std::mutex SECSRuntimeManager::m_mutex;
// 获取单例实例
-SECSConfigManager& SECSConfigManager::getInstance() {
- static SECSConfigManager instance;
+SECSRuntimeManager& SECSRuntimeManager::getInstance() {
+ static SECSRuntimeManager instance;
return instance;
}
// 构造函数
-SECSConfigManager::SECSConfigManager() {
+SECSRuntimeManager::SECSRuntimeManager() {
m_pDB = new BL::SQLiteDatabase();
}
// 析构函数
-SECSConfigManager::~SECSConfigManager() {
- termSECSSetting();
+SECSRuntimeManager::~SECSRuntimeManager() {
+ termRuntimeSetting();
if (m_pDB != nullptr) {
delete m_pDB;
@@ -29,13 +29,13 @@
}
// 设置数据库连接
-void SECSConfigManager::setDatabase(BL::Database* db) {
+void SECSRuntimeManager::setDatabase(BL::Database* db) {
std::lock_guard<std::mutex> lock(m_mutex);
m_pDB = db;
}
// 初始化SECS设置管理库
-bool SECSConfigManager::initSECSSetting() {
+bool SECSRuntimeManager::initRuntimeSetting() {
char path[MAX_PATH];
GetModuleFileName(NULL, path, MAX_PATH);
std::string exePath(path);
@@ -53,7 +53,7 @@
}
// 销毁SECS设置管理库
-void SECSConfigManager::termSECSSetting() {
+void SECSRuntimeManager::termRuntimeSetting() {
if (m_pDB != nullptr) {
m_pDB->disconnect();
}
diff --git a/SourceCode/Bond/Servo/SECSRuntimeManager.h b/SourceCode/Bond/Servo/SECSRuntimeManager.h
new file mode 100644
index 0000000..5c41733
--- /dev/null
+++ b/SourceCode/Bond/Servo/SECSRuntimeManager.h
@@ -0,0 +1,46 @@
+#ifndef SECS_RUNTIME_MANAGER_H
+#define SECS_RUNTIME_MANAGER_H
+
+#include <string>
+#include <vector>
+#include <mutex>
+#include "Database.h"
+
+class SECSRuntimeManager {
+public:
+ /**
+ * 获取单例实例
+ * @return SECSRuntimeManager实例的引用
+ */
+ static SECSRuntimeManager& getInstance();
+
+ /**
+ * 设置数据库连接
+ * @param db 数据库连接的指针
+ */
+ void setDatabase(BL::Database* db);
+
+ /**
+ * 初始化SECS运行设置管理库
+ * @return 成功返回true，失败返回false
+ */
+ bool initRuntimeSetting();
+
+ /**
+ * 销毁SECS运行设置管理库
+ */
+ void termRuntimeSetting();
+
+private:
+ SECSRuntimeManager();
+ ~SECSRuntimeManager();
+
+ // 禁止拷贝和赋值
+ SECSRuntimeManager(const SECSRuntimeManager&) = delete;
+ SECSRuntimeManager& operator=(const SECSRuntimeManager&) = delete;
+
+ BL::Database* m_pDB;
+ static std::mutex m_mutex;
+};
+
+#endif // SECS_RUNTIME_MANAGER_H
\ No newline at end of file
diff --git a/SourceCode/Bond/Servo/Servo.cpp b/SourceCode/Bond/Servo/Servo.cpp
index d23cb02..d1f502a 100644
--- a/SourceCode/Bond/Servo/Servo.cpp
+++ b/SourceCode/Bond/Servo/Servo.cpp
@@ -7,7 +7,7 @@
#include "ServoDlg.h"
#include "ServoGraph.h"
#include "AlarmManager.h"
-#include "SECSConfigManager.h"
+#include "SECSRuntimeManager.h"
// 声明全局变量，用于管理 GDI+ 初始化
ULONG_PTR g_diplusToken;
@@ -118,16 +118,16 @@
}
- // 初始化SECS设置管理库
+ // 初始化SECS运行设置管理库
try {
- if (!SECSConfigManager::getInstance().initSECSSetting()) {
- AfxMessageBox("初始化SECS设置管理库失败！");
+ if (!SECSRuntimeManager::getInstance().initRuntimeSetting()) {
+ AfxMessageBox("初始化SECS运行设置失败！");
return FALSE;
}
}
catch (const std::exception& ex) {
CString errorMsg;
- errorMsg.Format(_T("初始化SECS设置管理库失败：%s"), CString(ex.what()));
+ errorMsg.Format(_T("初始化SECS运行设置失败：%s"), CString(ex.what()));
AfxMessageBox(errorMsg, MB_ICONERROR);
return FALSE;
}
@@ -175,8 +175,8 @@
// 销毁报警表
AlarmManager::getInstance().termAlarmTable();
- // 销毁SECS设置管理库
- SECSConfigManager::getInstance().termSECSSetting();
+ // 销毁SECS运行设置管理库
+ SECSRuntimeManager::getInstance().termRuntimeSetting();
return CWinApp::ExitInstance();
}
diff --git a/SourceCode/Bond/Servo/Servo.vcxproj b/SourceCode/Bond/Servo/Servo.vcxproj
index 48469d7..fed2d8a 100644
--- a/SourceCode/Bond/Servo/Servo.vcxproj
+++ b/SourceCode/Bond/Servo/Servo.vcxproj
@@ -204,7 +204,7 @@
<ClInclude Include="LogEdit.h" />
<ClInclude Include="Model.h" />
<ClInclude Include="Resource.h" />
- <ClInclude Include="SECSConfigManager.h" />
+ <ClInclude Include="SECSRuntimeManager.h" />
<ClInclude Include="SecsTestDlg.h" />
<ClInclude Include="Servo.h" />
<ClInclude Include="ServoDlg.h" />
@@ -224,7 +224,7 @@
<ClCompile Include="LogDlg.cpp" />
<ClCompile Include="LogEdit.cpp" />
<ClCompile Include="Model.cpp" />
- <ClCompile Include="SECSConfigManager.cpp" />
+ <ClCompile Include="SECSRuntimeManager.cpp" />
<ClCompile Include="SecsTestDlg.cpp" />
<ClCompile Include="Servo.cpp" />
<ClCompile Include="ServoDlg.cpp" />
diff --git a/SourceCode/Bond/Servo/Servo.vcxproj.filters b/SourceCode/Bond/Servo/Servo.vcxproj.filters
index 435f788..eddda24 100644
--- a/SourceCode/Bond/Servo/Servo.vcxproj.filters
+++ b/SourceCode/Bond/Servo/Servo.vcxproj.filters
@@ -23,7 +23,7 @@
<ClCompile Include="ServoGraph.cpp" />
<ClCompile Include="stdafx.cpp" />
<ClCompile Include="TerminalDisplayDlg.cpp" />
- <ClCompile Include="SECSConfigManager.cpp" />
+ <ClCompile Include="SECSRuntimeManager.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="AlarmManager.h" />
@@ -45,7 +45,7 @@
<ClInclude Include="stdafx.h" />
<ClInclude Include="targetver.h" />
<ClInclude Include="TerminalDisplayDlg.h" />
- <ClInclude Include="SECSConfigManager.h" />
+ <ClInclude Include="SECSRuntimeManager.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="Servo.rc" />
--
Gitblit v1.9.3