From 8dbd14952aa622587a92866dc01943869ea4f9dc Mon Sep 17 00:00:00 2001
From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com>
Date: 星期三, 20 十一月 2024 11:28:02 +0800
Subject: [PATCH] 1. 添加系统运行记录表 2. 完善用户管理的部分细节
---
SourceCode/Bond/BondEq/DBManager/UserManager.cpp | 20 ++
SourceCode/Bond/BondEq/InputDialog.cpp | 68 +++++++++
SourceCode/Bond/BondEq/DBManager/UserManager.h | 12 +
SourceCode/Bond/BondEq/InputDialog.h | 37 +++++
SourceCode/Bond/BondEq/DBManager/SystemLogManager.h | 54 +++++++
SourceCode/Bond/BondEq/BondEqDlg.cpp | 42 ++++-
SourceCode/Bond/BondEq/UserManagerDlg.cpp | 55 ++++++-
SourceCode/Bond/x64/Debug/Config/BondEq.db | 0
SourceCode/Bond/BondEq/DBManager/SystemLogManager.cpp | 105 +++++++++++++++
SourceCode/Bond/BondEq/BondEq.vcxproj | 2
10 files changed, 374 insertions(+), 21 deletions(-)
diff --git a/SourceCode/Bond/BondEq/BondEq.vcxproj b/SourceCode/Bond/BondEq/BondEq.vcxproj
index aabce71..55b39dd 100644
--- a/SourceCode/Bond/BondEq/BondEq.vcxproj
+++ b/SourceCode/Bond/BondEq/BondEq.vcxproj
@@ -217,6 +217,7 @@
<ClInclude Include="Common.h" />
<ClInclude Include="Configuration.h" />
<ClInclude Include="CPanelProject.h" />
+ <ClInclude Include="DBManager\SystemLogManager.h" />
<ClInclude Include="DBManager\UserManager.h" />
<ClInclude Include="EQState.h" />
<ClInclude Include="EQStateMonitor.h" />
@@ -274,6 +275,7 @@
<ClCompile Include="CProjectPageRemoteEqs.cpp" />
<ClCompile Include="Configuration.cpp" />
<ClCompile Include="CPanelProject.cpp" />
+ <ClCompile Include="DBManager\SystemLogManager.cpp" />
<ClCompile Include="DBManager\UserManager.cpp" />
<ClCompile Include="EQState.cpp" />
<ClCompile Include="EQStateMonitor.cpp" />
diff --git a/SourceCode/Bond/BondEq/BondEqDlg.cpp b/SourceCode/Bond/BondEq/BondEqDlg.cpp
index 0735685..1a8a2ec 100644
--- a/SourceCode/Bond/BondEq/BondEqDlg.cpp
+++ b/SourceCode/Bond/BondEq/BondEqDlg.cpp
@@ -10,12 +10,10 @@
#include "CBonder.h"
#include "SettingsDlg.h"
#include "UserManager.h"
+#include "SystemLogManager.h"
#include "LoginDlg.h"
#include "ChangePasswordDlg.h"
#include "InputDialog.h"
-
-// test
-#include "AxisSettingsDlg.h"
#include "UserManagerDlg.h"
@@ -184,6 +182,23 @@
SetTimer(1, 60000, nullptr);
#endif
userManager.loadSession();
+ std::unique_ptr<BL::Database>& db = userManager.getDatabaseInstance();
+
+ // 设置日志模块的数据库连接
+ SystemLogManager& logManager = SystemLogManager::getInstance();
+ logManager.setDatabase(db);
+
+ // 初始化日志表
+ if (!logManager.initializeLogTable()) {
+ AfxMessageBox("初始化系统日志表失败！");
+ return FALSE;
+ }
+
+ std::string strUsername = userManager.getCurrentUser();
+ if (strUsername.empty()) {
+ strUsername = "SYSTEM";
+ }
+ logManager.log(SystemLogManager::LogType::Info, _T("BondEq启动..."), strUsername);
// 菜单
@@ -352,6 +367,12 @@
UserManager::getInstance().terminateIdleDetection();
KillTimer(1);
#endif
+
+ std::string strUsername = UserManager::getInstance().getCurrentUser();
+ if (strUsername.empty()) {
+ strUsername = "SYSTEM";
+ }
+ SystemLogManager::getInstance().log(SystemLogManager::LogType::Info, _T("BondEq关闭..."), strUsername);
}
void CBondEqDlg::OnSize(UINT nType, int cx, int cy)
@@ -546,12 +567,10 @@
if (menuId == 0) {
CLoginDlg loginDlg;
loginDlg.DoModal();
- UpdateLoginStatus();
}
else if (1 == menuId) {
CChangePasswordDlg changePasswordDlg;
- if (changePasswordDlg.DoModal() == IDOK) {
- }
+ changePasswordDlg.DoModal();
}
else if (2 == menuId) {
CUserManagerDlg dlg;
@@ -569,12 +588,19 @@
CLoginDlg loginDlg;
loginDlg.DoModal();
- UpdateLoginStatus();
}
else {
+ CString cstrMessage;
+ cstrMessage.Format(_T("是否退出用户 [%s]？"), userManager.getCurrentUser().c_str());
+ int ret = AfxMessageBox(_T(cstrMessage), MB_OK | MB_ICONEXCLAMATION);
+ if (ret != MB_OK) {
+ return 0;
+ }
+
userManager.logout();
- UpdateLoginStatus();
}
+
+ UpdateLoginStatus();
}
return 0;
diff --git a/SourceCode/Bond/BondEq/DBManager/SystemLogManager.cpp b/SourceCode/Bond/BondEq/DBManager/SystemLogManager.cpp
new file mode 100644
index 0000000..92a6502
--- /dev/null
+++ b/SourceCode/Bond/BondEq/DBManager/SystemLogManager.cpp
@@ -0,0 +1,105 @@
+#include "stdafx.h"
+#include "SystemLogManager.h"
+#include <iostream>
+#include <sstream>
+#include <stdexcept>
+
+// 静态成员变量初始化
+std::unique_ptr<SystemLogManager> SystemLogManager::m_instance = nullptr;
+std::mutex SystemLogManager::m_mutex;
+
+// 获取单例实例
+SystemLogManager& SystemLogManager::getInstance() {
+ if (m_instance == nullptr) {
+ std::lock_guard<std::mutex> lock(m_mutex);
+ if (m_instance == nullptr) {
+ m_instance = std::unique_ptr<SystemLogManager>(new SystemLogManager());
+ }
+ }
+ return *m_instance;
+}
+
+// 构造函数
+SystemLogManager::SystemLogManager() : m_pDB(nullptr) {}
+
+// 设置数据库连接
+void SystemLogManager::setDatabase(std::unique_ptr<BL::Database>& db) {
+ std::lock_guard<std::mutex> lock(m_mutex);
+ m_pDB = &db;
+}
+
+// 初始化日志表
+bool SystemLogManager::initializeLogTable() {
+ if (!m_pDB || !(*m_pDB)) {
+ std::cerr << "Database connection is not set." << std::endl;
+ return false;
+ }
+
+ const std::string createTableQuery = R"(
+ CREATE TABLE IF NOT EXISTS system_logs (
+ id INTEGER PRIMARY KEY AUTOINCREMENT,
+ log_type TEXT NOT NULL,
+ event TEXT NOT NULL,
+ username TEXT NOT NULL,
+ timestamp DATETIME DEFAULT CURRENT_TIMESTAMP
+ )
+ )";
+ return (*m_pDB)->executeQuery(createTableQuery);
+}
+
+// 添加日志
+bool SystemLogManager::log(LogType logType, const std::string& event, const std::string& username) {
+ if (!m_pDB || !(*m_pDB)) {
+ std::cerr << "Database connection is not set." << std::endl;
+ return false;
+ }
+
+ std::ostringstream query;
+ query << "INSERT INTO system_logs (log_type, event, username) VALUES ("
+ << "'" << logTypeToString(logType) << "', "
+ << "'" << event << "', "
+ << "'" << username << "')";
+ return (*m_pDB)->executeQuery(query.str());
+}
+
+// 获取日志内容
+std::vector<std::vector<std::string>> SystemLogManager::getLogs(int startPosition, int count) {
+ std::vector<std::vector<std::string>> logs;
+
+ if (!m_pDB || !(*m_pDB)) {
+ std::cerr << "Database connection is not set." << std::endl;
+ return logs;
+ }
+
+ std::ostringstream query;
+
+ // 如果 startPosition 和 count 都是 -1，获取全部数据
+ if (startPosition == -1 && count == -1) {
+ query << "SELECT id, log_type, event, username, timestamp FROM system_logs";
+ }
+ else {
+ query << "SELECT id, log_type, event, username, timestamp FROM system_logs "
+ << "LIMIT " << count << " OFFSET " << startPosition;
+ }
+
+ auto results = (*m_pDB)->fetchResults(query.str());
+ for (const auto& row : results) {
+ logs.push_back(row);
+ }
+
+ return logs;
+}
+
+// 转换日志类型为字符串
+std::string SystemLogManager::logTypeToString(LogType logType) const {
+ switch (logType) {
+ case LogType::Info:
+ return _T("信息");
+ case LogType::Error:
+ return _T("错误");
+ case LogType::Operation:
+ return _T("操作");
+ default:
+ return _T("未知");
+ }
+}
diff --git a/SourceCode/Bond/BondEq/DBManager/SystemLogManager.h b/SourceCode/Bond/BondEq/DBManager/SystemLogManager.h
new file mode 100644
index 0000000..290e046
--- /dev/null
+++ b/SourceCode/Bond/BondEq/DBManager/SystemLogManager.h
@@ -0,0 +1,54 @@
+#ifndef SYSTEM_LOG_MANAGER_H
+#define SYSTEM_LOG_MANAGER_H
+
+#include <string>
+#include <memory>
+#include <mutex>
+#include <chrono>
+#include "Database.h"
+
+class SystemLogManager {
+public:
+ enum class LogType {
+ Info, // 信息日志
+ Error, // 错误日志
+ Operation // 操作日志
+ };
+
+ // 获取单例实例
+ static SystemLogManager& getInstance();
+
+ // 设置数据库连接
+ void setDatabase(std::unique_ptr<BL::Database>& db);
+
+ // 添加日志
+ bool log(LogType logType, const std::string& event, const std::string& username = "SYSTEM");
+
+ // 获取日志
+ std::vector<std::vector<std::string>> SystemLogManager::getLogs(int startPosition = -1, int count = -1);
+
+ // 初始化日志表
+ bool initializeLogTable();
+
+private:
+ // 构造函数（私有化）
+ SystemLogManager();
+
+ // 禁止拷贝和赋值
+ SystemLogManager(const SystemLogManager&) = delete;
+ SystemLogManager& operator=(const SystemLogManager&) = delete;
+
+ // 转换日志类型为字符串
+ std::string logTypeToString(LogType logType) const;
+
+ // 数据库连接
+ std::unique_ptr<BL::Database>* m_pDB;
+
+ // 单例实例
+ static std::unique_ptr<SystemLogManager> m_instance;
+
+ // 线程安全锁
+ static std::mutex m_mutex;
+};
+
+#endif // SYSTEM_LOG_MANAGER_H
\ No newline at end of file
diff --git a/SourceCode/Bond/BondEq/DBManager/UserManager.cpp b/SourceCode/Bond/BondEq/DBManager/UserManager.cpp
index 7184b03..bd3f4df 100644
--- a/SourceCode/Bond/BondEq/DBManager/UserManager.cpp
+++ b/SourceCode/Bond/BondEq/DBManager/UserManager.cpp
@@ -29,6 +29,11 @@
terminateIdleDetection();
}
+// 提供数据库连接
+std::unique_ptr<BL::Database>& UserManager::getDatabaseInstance() {
+ return m_pDB;
+}
+
// 初始化数据库，创建用户表并插入初始管理员用户
bool UserManager::initializeDatabase() {
std::string dbFilePath = getDatabaseFilePath();
@@ -450,16 +455,31 @@
return m_strCurrentUser;
}
+// 修改当前登录用户名
+void UserManager::setCurrentUser(const std::string& strName) {
+ m_strCurrentUser = strName;
+}
+
// 获取当前登录用户密码
std::string UserManager::getCurrentPass() const {
return m_strCurrentPass;
}
+// 修改当前登录用户密码
+void UserManager::setCurrentPass(const std::string& strPass) {
+ m_strCurrentPass = strPass;
+}
+
// 获取当前登录用户角色
UserRole UserManager::getCurrentUserRole() const {
return m_enCurrentUserRole;
}
+// 修改当前登录用户角色
+void UserManager::setCurrentUserRole(UserRole emRole) {
+ m_enCurrentUserRole = emRole;
+}
+
// 获取当前登录用户的无操作超时时间
std::chrono::minutes UserManager::getSessionTimeout() const {
return m_tmSessionTimeout;
diff --git a/SourceCode/Bond/BondEq/DBManager/UserManager.h b/SourceCode/Bond/BondEq/DBManager/UserManager.h
index 37fd44b..44bb5cc 100644
--- a/SourceCode/Bond/BondEq/DBManager/UserManager.h
+++ b/SourceCode/Bond/BondEq/DBManager/UserManager.h
@@ -22,6 +22,9 @@
UserManager(const UserManager&) = delete;
UserManager& operator=(const UserManager&) = delete;
+ // 提供数据库连接
+ std::unique_ptr<BL::Database>& getDatabaseInstance();
+
// 用户操作
bool login(const std::string& username, const std::string& password, bool rememberMe = false);
void logout();
@@ -67,12 +70,21 @@
// 获取当前登录用户名
std::string getCurrentUser() const;
+ // 修改当前登录用户名
+ void setCurrentUser(const std::string& strName);
+
// 获取当前登录用户密码
std::string getCurrentPass() const;
+ // 修改当前登录用户密码
+ void setCurrentPass(const std::string& strPass);
+
// 获取当前登录用户角色
UserRole getCurrentUserRole() const;
+ // 修改当前登录用户角色
+ void setCurrentUserRole(UserRole emRole);
+
// 获取当前登录用户的无操作超时时间
std::chrono::minutes getSessionTimeout() const;
diff --git a/SourceCode/Bond/BondEq/InputDialog.cpp b/SourceCode/Bond/BondEq/InputDialog.cpp
new file mode 100644
index 0000000..ab890fe
--- /dev/null
+++ b/SourceCode/Bond/BondEq/InputDialog.cpp
@@ -0,0 +1,68 @@
+锘�// InputDialog.cpp: 瀹炵幇鏂囦欢
+//
+
+#include "stdafx.h"
+#include "BondEq.h"
+#include "afxdialogex.h"
+#include "InputDialog.h"
+
+
+// CInputDialog 瀵硅瘽妗�
+
+IMPLEMENT_DYNAMIC(CInputDialog, CDialogEx)
+
+CInputDialog::CInputDialog(const CString& strTitle, const CString& strPrompt, CWnd* pParent /*=nullptr*/)
+ : CDialogEx(IDD_DIALOG_INPUT, pParent), m_strTitle(strTitle), m_strPrompt(strPrompt), m_strInput(_T(""))
+{
+
+}
+
+CInputDialog::~CInputDialog()
+{
+}
+
+CString CInputDialog::GetInputText() const
+{
+ return m_strInput;
+}
+
+void CInputDialog::DoDataExchange(CDataExchange* pDX)
+{
+ CDialogEx::DoDataExchange(pDX);
+ DDX_Control(pDX, IDC_EDIT_INPUT, m_editInput);
+ DDX_Control(pDX, IDC_STATIC_PROMPT, m_staticPrompt);
+}
+
+
+BEGIN_MESSAGE_MAP(CInputDialog, CDialogEx)
+ ON_BN_CLICKED(IDOK, &CInputDialog::OnBnClickedOk)
+END_MESSAGE_MAP()
+
+
+// CInputDialog 娑堟伅澶勭悊绋嬪簭
+
+
+BOOL CInputDialog::OnInitDialog()
+{
+ CDialogEx::OnInitDialog();
+
+ // TODO: 鍦ㄦ娣诲姞棰濆鐨勫垵濮嬪寲
+ SetWindowText(m_strTitle);
+ m_staticPrompt.SetWindowText(m_strPrompt);
+
+ return TRUE; // return TRUE unless you set the focus to a control
+ // 寮傚父: OCX 灞炴�ч〉搴旇繑鍥� FALSE
+}
+
+
+void CInputDialog::OnBnClickedOk()
+{
+ // TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
+ m_editInput.GetWindowText(m_strInput);
+ if (m_strInput.IsEmpty()) {
+ AfxMessageBox(_T("杈撳叆涓嶈兘涓虹┖锛�"));
+ return;
+ }
+
+ CDialogEx::OnOK();
+}
diff --git a/SourceCode/Bond/BondEq/InputDialog.h b/SourceCode/Bond/BondEq/InputDialog.h
new file mode 100644
index 0000000..352bdf0
--- /dev/null
+++ b/SourceCode/Bond/BondEq/InputDialog.h
@@ -0,0 +1,37 @@
+锘�#pragma once
+#include "afxdialogex.h"
+
+
+// CInputDialog 瀵硅瘽妗�
+
+class CInputDialog : public CDialogEx
+{
+ DECLARE_DYNAMIC(CInputDialog)
+
+public:
+ CInputDialog(const CString& strTitle, const CString& strPrompt, CWnd* pParent = nullptr);
+ virtual ~CInputDialog();
+
+ CString GetInputText() const; // 鑾峰彇杈撳叆鍐呭
+
+// 瀵硅瘽妗嗘暟鎹�
+#ifdef AFX_DESIGN_TIME
+ enum { IDD = IDD_DIALOG_INPUT };
+#endif
+
+private:
+ CEdit m_editInput;
+ CStatic m_staticPrompt;
+
+ CString m_strTitle; // 瀵硅瘽妗嗘爣棰�
+ CString m_strPrompt; // 鎻愮ず鏂囨湰
+ CString m_strInput; // 杈撳叆鐨勬枃鏈�
+
+protected:
+ virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV 鏀寔
+
+ DECLARE_MESSAGE_MAP()
+public:
+ virtual BOOL OnInitDialog();
+ afx_msg void OnBnClickedOk();
+};
diff --git a/SourceCode/Bond/BondEq/UserManagerDlg.cpp b/SourceCode/Bond/BondEq/UserManagerDlg.cpp
index 24df33f..f58d1e6 100644
--- a/SourceCode/Bond/BondEq/UserManagerDlg.cpp
+++ b/SourceCode/Bond/BondEq/UserManagerDlg.cpp
@@ -12,6 +12,7 @@
#include <set>
+const COLORREF CURR_USER_BK_COLOR = RGB(0, 255, 0);
// CUserManagerDlg 瀵硅瘽妗�
@@ -113,12 +114,12 @@
if (!usersData.empty()) {
m_gridUserManager.SetRowCount(usersData.size() + 1);
- for (size_t i = 0; i < usersData.size(); i++) {
+ for (int i = 0; i < usersData.size(); i++) {
int nRowIdx = i + 1;
int nColIdx = 0;
m_gridUserManager.SetItemText(nRowIdx, nColIdx++, std::to_string(i + 1).c_str());
- for (size_t j = 0; j < usersData[i].size(); j++) {
+ for (int j = 0; j < usersData[i].size(); j++) {
if (usersData[i][1].empty()) {
continue;
}
@@ -177,8 +178,9 @@
}
for (int i = 0; i < nCols; i++) {
- bool ret = m_gridUserManager.SetItemBkColour(nCurrNameRow, i, RGB(0, 255, 0));
+ m_gridUserManager.SetItemBkColour(nCurrNameRow, i, CURR_USER_BK_COLOR);
}
+ m_gridUserManager.SetItemState(nCurrNameRow, 3, GVIS_READONLY);
m_gridUserManager.Invalidate();
m_gridUserManager.UpdateWindow();
@@ -463,16 +465,20 @@
// 绗�4鍒椾负鏉冮檺鍒�, 绗�8鍒椾负瑙掕壊鎻忚堪鍒�, 浠庢槧灏勪腑鏌ユ壘瀵瑰簲鎻忚堪
if (nCol == 3) {
- CString selectedRole = m_gridUserManager.GetItemText(nRow, nCol);
-
- auto it = m_mapRoleDescriptions.find(selectedRole);
- if (it != m_mapRoleDescriptions.end()) {
- m_gridUserManager.SetItemText(nRow, 7, it->second);
- m_gridUserManager.RedrawCell(nRow, 7);
+ if (m_gridUserManager.GetItemBkColour(nRow, nCol) == CURR_USER_BK_COLOR) {
+ AfxMessageBox(_T("褰撳墠鐧诲綍鐢ㄦ埛鏉冮檺涓嶈兘淇敼锛�"));
}
else {
- m_gridUserManager.SetItemText(nRow, 7, _T(""));
- m_gridUserManager.RedrawCell(nRow, 7);
+ CString selectedRole = m_gridUserManager.GetItemText(nRow, nCol);
+ auto it = m_mapRoleDescriptions.find(selectedRole);
+ if (it != m_mapRoleDescriptions.end()) {
+ m_gridUserManager.SetItemText(nRow, 7, it->second);
+ m_gridUserManager.RedrawCell(nRow, 7);
+ }
+ else {
+ m_gridUserManager.SetItemText(nRow, 7, _T(""));
+ m_gridUserManager.RedrawCell(nRow, 7);
+ }
}
}
@@ -560,10 +566,20 @@
std::vector<std::vector<std::string>> vecData;
std::set<std::string> usernameSet; // 鐢ㄤ簬瀛樺偍鐢ㄦ埛鍚嶏紝妫�鏌ユ槸鍚﹂噸澶�
+ int nCurrUserRow = -1;
+ UserManager& userManager = UserManager::getInstance();
for (int i = 1; i < m_gridUserManager.GetRowCount(); ++i) {
std::vector<std::string> rowData;
CString cellText = m_gridUserManager.GetItemText(i, 1);
std::string username = CT2A(cellText.GetString());
+
+ cellText = m_gridUserManager.GetItemText(i, 2);
+ std::string userpass = CT2A(cellText.GetString());
+
+ if (username.empty() || userpass.empty()) {
+ AfxMessageBox(_T("鐢ㄦ埛鍚嶅拰瀵嗙爜涓嶈兘涓虹┖锛�"));
+ return;
+ }
if (usernameSet.find(username) != usernameSet.end()) {
CString message;
@@ -571,8 +587,21 @@
AfxMessageBox(message, MB_ICONEXCLAMATION);
return;
}
-
usernameSet.insert(username);
+
+ if (nCurrUserRow == -1 && m_gridUserManager.GetItemBkColour(i, 0) == CURR_USER_BK_COLOR){
+ nCurrUserRow = i;
+ if (username.compare(userManager.getCurrentUser()) != 0) {
+ userManager.setCurrentUser(username);
+ }
+
+ if (userpass.compare(userManager.getCurrentPass()) != 0) {
+ userManager.setCurrentPass(userpass);
+ }
+
+ userManager.clearSession();
+ userManager.saveSession();
+ }
for (int j = 1; j < m_gridUserManager.GetColumnCount() - 1; ++j) {
CString cellText = m_gridUserManager.GetItemText(i, j);
@@ -596,6 +625,6 @@
vecData.push_back(rowData);
}
- UserManager::getInstance().setUsers(vecData);
+ userManager.setUsers(vecData);
CDialogEx::OnOK();
}
diff --git a/SourceCode/Bond/x64/Debug/Config/BondEq.db b/SourceCode/Bond/x64/Debug/Config/BondEq.db
index f424b51..4e066d3 100644
--- a/SourceCode/Bond/x64/Debug/Config/BondEq.db
+++ b/SourceCode/Bond/x64/Debug/Config/BondEq.db
Binary files differ
--
Gitblit v1.9.3