From f56f083a7e59e58dd44913b11ce4e959fb0475cc Mon Sep 17 00:00:00 2001
From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com>
Date: 星期三, 20 十一月 2024 19:16:44 +0800
Subject: [PATCH] 1. 添加运行日志界面2.运行日志基本功能已经完成
---
SourceCode/Bond/BondEq/BondEqDlg.cpp | 54 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 42 insertions(+), 12 deletions(-)
diff --git a/SourceCode/Bond/BondEq/BondEqDlg.cpp b/SourceCode/Bond/BondEq/BondEqDlg.cpp
index 0735685..9668aa4 100644
--- a/SourceCode/Bond/BondEq/BondEqDlg.cpp
+++ b/SourceCode/Bond/BondEq/BondEqDlg.cpp
@@ -9,15 +9,13 @@
#include "Common.h"
#include "CBonder.h"
#include "SettingsDlg.h"
-#include "UserManager.h"
#include "LoginDlg.h"
#include "ChangePasswordDlg.h"
#include "InputDialog.h"
-
-// test
-#include "AxisSettingsDlg.h"
#include "UserManagerDlg.h"
+// test
+#include "SystemLogManagerDlg.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -184,6 +182,17 @@
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;
+ }
// 菜单
@@ -228,6 +237,7 @@
// 更新登录状态
UpdateLoginStatus();
+ logManager.log(SystemLogManager::LogType::Info, _T("BondEq启动..."));
return TRUE; // 除非将焦点设置到控件，否则返回 TRUE
@@ -352,6 +362,8 @@
UserManager::getInstance().terminateIdleDetection();
KillTimer(1);
#endif
+
+ SystemLogManager::getInstance().log(SystemLogManager::LogType::Info, _T("BondEq关闭..."));
}
void CBondEqDlg::OnSize(UINT nType, int cx, int cy)
@@ -512,6 +524,7 @@
LRESULT CBondEqDlg::OnToolbarBtnClicked(WPARAM wParam, LPARAM lParam)
{
int id = (int)lParam;
+ SystemLogManager& logManager = SystemLogManager::getInstance();
if (id == IDC_BUTTON_RUN || id == IDC_BUTTON_STOP || id == IDC_BUTTON_SETTINGS)
{
CInputDialog inputDialog(_T("验证用户"), _T("请输入用户密码："));
@@ -524,6 +537,7 @@
std::string strPass = UserManager::getInstance().getCurrentPass();
if (inputText.Compare(strPass.c_str()) != 0) {
AfxMessageBox(_T("密码错误！"));
+ logManager.log(SystemLogManager::LogType::Info, _T("验证时，密码错误！"));
return 0;
}
}
@@ -531,10 +545,12 @@
if (id == IDC_BUTTON_RUN) {
m_pTopToolbar->GetBtn(IDC_BUTTON_RUN)->EnableWindow(FALSE);
m_pTopToolbar->GetBtn(IDC_BUTTON_STOP)->EnableWindow(TRUE);
+ logManager.log(SystemLogManager::LogType::Operation, _T("运行..."));
}
else if (id == IDC_BUTTON_STOP) {
m_pTopToolbar->GetBtn(IDC_BUTTON_RUN)->EnableWindow(TRUE);
m_pTopToolbar->GetBtn(IDC_BUTTON_STOP)->EnableWindow(FALSE);
+ logManager.log(SystemLogManager::LogType::Operation, _T("停止..."));
}
else if (id == IDC_BUTTON_SETTINGS) {
CSettingsDlg dlg;
@@ -546,35 +562,49 @@
if (menuId == 0) {
CLoginDlg loginDlg;
loginDlg.DoModal();
- UpdateLoginStatus();
}
else if (1 == menuId) {
+ // test
+ CSystemLogManagerDlg dlg;
+ dlg.DoModal();
+
CChangePasswordDlg changePasswordDlg;
- if (changePasswordDlg.DoModal() == IDOK) {
- }
+ changePasswordDlg.DoModal();
}
else if (2 == menuId) {
CUserManagerDlg dlg;
- dlg.DoModal();
+ if (dlg.DoModal()!= IDOK) {
+ logManager.log(SystemLogManager::LogType::Operation, _T("用户管理的预操作被取消！"));
+ }
}
else if (3 == menuId) {
- int ret = AfxMessageBox(_T("是否切换用户？切换用户会退出当前账号！"), MB_OK | MB_ICONEXCLAMATION);
- if (ret != MB_OK) {
+ int ret = AfxMessageBox(_T("是否切换用户？切换用户会退出当前账号！"), MB_OKCANCEL | MB_ICONEXCLAMATION);
+ if (ret != IDOK) {
return 0;
}
+ logManager.log(SystemLogManager::LogType::Operation, _T("确认切换角色！"));
if (userManager.isLoggedIn()) {
+ logManager.log(SystemLogManager::LogType::Info, _T("退出登录！"));
userManager.logout();
}
CLoginDlg loginDlg;
loginDlg.DoModal();
- UpdateLoginStatus();
}
else {
+ CString cstrMessage;
+ cstrMessage.Format(_T("是否退出用户 [%s]？"), userManager.getCurrentUser().c_str());
+ int ret = AfxMessageBox(_T(cstrMessage), MB_OKCANCEL | MB_ICONEXCLAMATION);
+ if (ret != IDOK) {
+ return 0;
+ }
+
+ logManager.log(SystemLogManager::LogType::Info, _T("退出登录！"));
userManager.logout();
- UpdateLoginStatus();
}
+
+ UpdateLoginStatus();
}
return 0;
--
Gitblit v1.9.3