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/BondEqDlg.cpp | 126 +++++++++++++++++++++++++++++++++---------
1 files changed, 99 insertions(+), 27 deletions(-)
diff --git a/SourceCode/Bond/BondEq/BondEqDlg.cpp b/SourceCode/Bond/BondEq/BondEqDlg.cpp
index 21935a5..1a8a2ec 100644
--- a/SourceCode/Bond/BondEq/BondEqDlg.cpp
+++ b/SourceCode/Bond/BondEq/BondEqDlg.cpp
@@ -10,10 +10,11 @@
#include "CBonder.h"
#include "SettingsDlg.h"
#include "UserManager.h"
+#include "SystemLogManager.h"
#include "LoginDlg.h"
-
-// test
-#include "AxisSettingsDlg.h"
+#include "ChangePasswordDlg.h"
+#include "InputDialog.h"
+#include "UserManagerDlg.h"
#ifdef _DEBUG
@@ -181,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);
// 菜单
@@ -223,10 +241,8 @@
InitRxWindows();
- // 登录管理
- if (userManager.isLoggedIn()) {
- m_pTopToolbar->SetOperatorBtnText(userManager.getCurrentUser().c_str());
- }
+ // 更新登录状态
+ UpdateLoginStatus();
return TRUE; // 除非将焦点设置到控件，否则返回 TRUE
@@ -351,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)
@@ -511,6 +533,22 @@
LRESULT CBondEqDlg::OnToolbarBtnClicked(WPARAM wParam, LPARAM lParam)
{
int id = (int)lParam;
+ if (id == IDC_BUTTON_RUN || id == IDC_BUTTON_STOP || id == IDC_BUTTON_SETTINGS)
+ {
+ CInputDialog inputDialog(_T("验证用户"), _T("请输入用户密码："));
+ if (inputDialog.DoModal() != IDOK) {
+ AfxMessageBox(_T("取消验证！"));
+ return 0;
+ }
+
+ CString inputText = inputDialog.GetInputText();
+ std::string strPass = UserManager::getInstance().getCurrentPass();
+ if (inputText.Compare(strPass.c_str()) != 0) {
+ AfxMessageBox(_T("密码错误！"));
+ return 0;
+ }
+ }
+
if (id == IDC_BUTTON_RUN) {
m_pTopToolbar->GetBtn(IDC_BUTTON_RUN)->EnableWindow(FALSE);
m_pTopToolbar->GetBtn(IDC_BUTTON_STOP)->EnableWindow(TRUE);
@@ -527,24 +565,42 @@
int menuId = (int)wParam;
UserManager& userManager = UserManager::getInstance();
if (menuId == 0) {
- ShowLoginDlg();
- }
- else if (1 == menuId) {
- if (userManager.isLoggedIn()) {
- userManager.logout();
- }
-
- ShowLoginDlg();
- }
- else if (2 == menuId) {
- if (userManager.isLoggedIn()) {
- userManager.logout();
- m_pTopToolbar->SetOperatorBtnText(_T("未登录"));
- }
-
- CAxisSettingsDlg loginDlg;
+ CLoginDlg loginDlg;
loginDlg.DoModal();
}
+ else if (1 == menuId) {
+ CChangePasswordDlg changePasswordDlg;
+ changePasswordDlg.DoModal();
+ }
+ else if (2 == menuId) {
+ CUserManagerDlg dlg;
+ dlg.DoModal();
+ }
+ else if (3 == menuId) {
+ int ret = AfxMessageBox(_T("是否切换用户？切换用户会退出当前账号！"), MB_OK | MB_ICONEXCLAMATION);
+ if (ret != MB_OK) {
+ return 0;
+ }
+
+ if (userManager.isLoggedIn()) {
+ userManager.logout();
+ }
+
+ CLoginDlg loginDlg;
+ loginDlg.DoModal();
+ }
+ 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();
}
return 0;
@@ -616,17 +672,33 @@
return pDlg;
}
-void CBondEqDlg::ShowLoginDlg()
+void CBondEqDlg::UpdateLoginStatus()
{
- CLoginDlg loginDlg;
- loginDlg.DoModal();
-
+ HMENU hMenu = m_pTopToolbar->GetOperatorMenu();
UserManager& userManager = UserManager::getInstance();
if (userManager.isLoggedIn())
{
+ ::EnableMenuItem(hMenu, ID_OPEATOR_LOGIN, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
+ ::EnableMenuItem(hMenu, ID_OPERATOR_CHANGE_PASSWORD, MF_BYCOMMAND | MF_ENABLED);
+ ::EnableMenuItem(hMenu, ID_OPEATOR_SWITCH, MF_BYCOMMAND | MF_ENABLED);
+ ::EnableMenuItem(hMenu, ID_OPERATOR_LOGOUT, MF_BYCOMMAND | MF_ENABLED);
+
+ if (userManager.getCurrentUserRole() == UserRole::SuperAdmin) {
+ ::EnableMenuItem(hMenu, ID_OPEATOR_USER_MANAGER, MF_BYCOMMAND | MF_ENABLED);
+ }
+ else {
+ ::EnableMenuItem(hMenu, ID_OPEATOR_USER_MANAGER, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
+ }
+
m_pTopToolbar->SetOperatorBtnText(userManager.getCurrentUser().c_str());
}
else {
+ ::EnableMenuItem(hMenu, ID_OPEATOR_LOGIN, MF_BYCOMMAND | MF_ENABLED);
+ ::EnableMenuItem(hMenu, ID_OPERATOR_CHANGE_PASSWORD, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
+ ::EnableMenuItem(hMenu, ID_OPEATOR_USER_MANAGER, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
+ ::EnableMenuItem(hMenu, ID_OPEATOR_SWITCH, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
+ ::EnableMenuItem(hMenu, ID_OPERATOR_LOGOUT, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
+
m_pTopToolbar->SetOperatorBtnText(_T("未登录"));
}
}
--
Gitblit v1.9.3