From e8a27bb203fe2aff70390a5eca002d7438da9b0f Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期三, 22 十月 2025 14:24:34 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/BondEq/BondEqDlg.cpp | 285 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 258 insertions(+), 27 deletions(-)
diff --git a/SourceCode/Bond/BondEq/BondEqDlg.cpp b/SourceCode/Bond/BondEq/BondEqDlg.cpp
index 62305d3..cabcaf7 100644
--- a/SourceCode/Bond/BondEq/BondEqDlg.cpp
+++ b/SourceCode/Bond/BondEq/BondEqDlg.cpp
@@ -7,11 +7,17 @@
#include "BondEqDlg.h"
#include "afxdialogex.h"
#include "Common.h"
-#include "Servo.h"
+#include "CBonder.h"
+#include "ToolUnits.h"
#include "SettingsDlg.h"
-#include "UserManager.h"
+#include "InputDialog.h"
#include "LoginDlg.h"
+#include "ChangePasswordDlg.h"
+#include "UserManagerDlg.h"
+#include "SystemLogManagerDlg.h"
+// 测试
+#include "RecipeListDlg.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -67,6 +73,8 @@
m_pMainContainer = nullptr;
m_pHomeDialog = nullptr;
m_pActiveView = nullptr;
+ m_pActiveComponentDlg = nullptr;
+ m_pAlarmWnd = nullptr;
}
void CBondEqDlg::DoDataExchange(CDataExchange* pDX)
@@ -127,7 +135,36 @@
}
}
}
+ else if (RX_CODE_SELECT_COMPONENT == code) {
+ CComponent* pComponent;
+ if (pAny->getPtrValue("ptr", (void*&)pComponent)) {
+ if (pComponent->getClassName().compare("CPLC") == 0) {
+ if (m_pMainContainer != nullptr) {
+ if (m_pActiveComponentDlg != nullptr) {
+ if (m_pActiveComponentDlg->GetContext() != (void*)pComponent) {
+ m_pActiveComponentDlg->DestroyWindow();
+ delete m_pActiveComponentDlg;
+ m_pActiveComponentDlg = nullptr;
+ }
+ }
+ if (m_pActiveComponentDlg == nullptr) {
+ m_pActiveComponentDlg = CreateComponentPLCDlg(pComponent);
+ }
+ }
+ }
+ }
+ }
+ else if (code == RX_CODE_ALARM_ON) {
+ AlarmOn();
+ CAlarmMonitor* pComponent = (CAlarmMonitor*)theApp.m_model.getBonder().GetComponent(ALARM_MONITOR);
+ m_pTopToolbar->GetBtn(IDC_BUTTON_ALARM)->EnableWindow(pComponent->isAlarming());
+ }
+ else if (code == RX_CODE_ALARM_OFF) {
+ AlarmOff();
+ CAlarmMonitor* pComponent = (CAlarmMonitor*)theApp.m_model.getBonder().GetComponent(ALARM_MONITOR);
+ m_pTopToolbar->GetBtn(IDC_BUTTON_ALARM)->EnableWindow(pComponent->isAlarming());
+ }
pAny->release();
}, [&]() -> void {
// onComplete
@@ -178,7 +215,50 @@
SetTimer(1, 60000, nullptr);
#endif
userManager.loadSession();
+ std::unique_ptr<BL::Database>& db = userManager.getDatabaseInstance();
+ // 设置运行日志模块的数据库连接
+ SystemLogManager& logManager = SystemLogManager::getInstance();
+ logManager.setDatabase(db.get());
+
+ // 初始化运行日志表
+ try {
+ if (!logManager.initializeLogTable()) {
+ AfxMessageBox("初始化系统日志模块失败！");
+ return FALSE;
+ }
+ }
+ catch (const std::exception& ex) {
+ CString errorMsg;
+ errorMsg.Format(_T("初始化系统日志模块失败：%s"), CString(ex.what()));
+ AfxMessageBox(errorMsg, MB_ICONERROR);
+ return FALSE;
+ }
+
+ // 初始化报警模块
+ AlarmManager& alarmManager = AlarmManager::getInstance();
+ alarmManager.setDatabase(db.get());
+ try {
+ if (!alarmManager.initializeAlarmTable()) {
+ AfxMessageBox("初始化报警模块失败！");
+ return FALSE;
+ }
+ }
+ catch (const std::exception& ex) {
+ CString errorMsg;
+ errorMsg.Format(_T("初始化报警模块失败：%s"), CString(ex.what()));
+ AfxMessageBox(errorMsg, MB_ICONERROR);
+ return FALSE;
+ }
+
+ // 设置配方文件夹路径
+ RecipeManager& recipeManager = RecipeManager::getInstance();
+ std::string strRecipePath = CToolUnits::getRecipePath();
+ CToolUnits::createDir(strRecipePath.c_str());
+ recipeManager.setRecipeFolder(strRecipePath);
+ if (!recipeManager.loadRecipe("Default")) {
+ AfxMessageBox("Default 配方加载失败！");
+ }
// 菜单
CMenu menu;
@@ -195,6 +275,10 @@
m_pTopToolbar->Create(IDD_TOP_TOOLBAR, this);
m_pTopToolbar->ShowWindow(SW_SHOW);
m_pTopToolbar->GetBtn(IDC_BUTTON_STOP)->EnableWindow(FALSE);
+ m_pTopToolbar->GetBtn(IDC_BUTTON_ALARM)->EnableWindow(FALSE);
+ HMENU hMenu = m_pTopToolbar->GetOperatorMenu();
+ ASSERT(hMenu);
+ ::EnableMenuItem(hMenu, ID_OPEATOR_SWITCH, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
// 设备面板
@@ -212,16 +296,21 @@
// Home页
m_pHomeDialog = CreateHomeDlg();
ShowWindow(SW_SHOWMAXIMIZED);
- SetTimer(2, 1000, nullptr);
InitRxWindows();
- // 登录管理
- if (userManager.isLoggedIn()) {
- m_pTopToolbar->SetOperatorBtnText(userManager.getCurrentUser().c_str());
- }
+ // 更新登录状态
+ UpdateLoginStatus();
+ logManager.log(SystemLogManager::LogType::Info, _T("BondEq启动..."));
+
+
+ // 自动启动
+ theApp.m_model.getBonder().start();
+ m_pTopToolbar->GetBtn(IDC_BUTTON_RUN)->EnableWindow(FALSE);
+ m_pTopToolbar->GetBtn(IDC_BUTTON_STOP)->EnableWindow(TRUE);
+ logManager.log(SystemLogManager::LogType::Operation, _T("运行..."));
return TRUE; // 除非将焦点设置到控件，否则返回 TRUE
@@ -279,8 +368,8 @@
void CBondEqDlg::OnClose()
{
// TODO: 在此添加消息处理程序代码和/或调用默认值
- CServo& servo = theApp.m_model.getServo();
- if (servo.isRunning()) {
+ CBonder& bonder = theApp.m_model.getBonder();
+ if (bonder.isRunning()) {
AfxMessageBox("程序和机器正在运行中，请先停止工作再退出程序！");
return;
}
@@ -333,8 +422,19 @@
m_pActiveView = nullptr;
}
+ if (m_pActiveComponentDlg != nullptr) {
+ m_pActiveComponentDlg->DestroyWindow();
+ delete m_pActiveComponentDlg;
+ m_pActiveComponentDlg = nullptr;
+ }
+
if (m_hbrBkgnd != nullptr) {
::DeleteObject(m_hbrBkgnd);
+ }
+
+ if (m_pAlarmWnd != nullptr) {
+ m_pAlarmWnd->DestroyWindow();
+ delete m_pAlarmWnd;
}
ASSERT(m_pObserver != NULL);
@@ -346,6 +446,8 @@
UserManager::getInstance().terminateIdleDetection();
KillTimer(1);
#endif
+
+ SystemLogManager::getInstance().log(SystemLogManager::LogType::Info, _T("BondEq关闭..."));
}
void CBondEqDlg::OnSize(UINT nType, int cx, int cy)
@@ -447,13 +549,16 @@
void CBondEqDlg::OnMenuFileSettings()
{
- CSettingsDlg dlg;
+ CRecipeListDlg dlg;
dlg.DoModal();
+
+ //CSettingsDlg dlg;
+ //dlg.DoModal();
}
void CBondEqDlg::OnUpdateMenuFileSettings(CCmdUI* pCmdUI)
{
- pCmdUI->Enable(!theApp.m_model.getServo().isRunning());
+ pCmdUI->Enable(!theApp.m_model.getBonder().isRunning());
}
void CBondEqDlg::OnMenuFileExit()
@@ -463,7 +568,7 @@
void CBondEqDlg::OnUpdateMenuFileExit(CCmdUI* pCmdUI)
{
- pCmdUI->Enable(!theApp.m_model.getServo().isRunning());
+ pCmdUI->Enable(!theApp.m_model.getBonder().isRunning());
}
void CBondEqDlg::OnMenuHelpAbout()
@@ -497,7 +602,7 @@
{
int id = (int)lParam;
if (id == VIEW_TOOL_BTN_CLOSE) {
- CloseView((CBaseView*)wParam);
+ CloseView((CComponentDlg*)wParam);
}
return 0;
@@ -506,13 +611,40 @@
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("请输入用户密码："));
+ 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("密码错误！"));
+ logManager.log(SystemLogManager::LogType::Info, _T("验证时，密码错误！"));
+ return 0;
+ }
+ */
+ }
+
if (id == IDC_BUTTON_RUN) {
+ theApp.m_model.getBonder().start();
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) {
+ theApp.m_model.getBonder().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_ALARM) {
+ AlarmOn();
}
else if (id == IDC_BUTTON_SETTINGS) {
CSettingsDlg dlg;
@@ -522,21 +654,51 @@
int menuId = (int)wParam;
UserManager& userManager = UserManager::getInstance();
if (menuId == 0) {
- ShowLoginDlg();
+ CLoginDlg loginDlg;
+ loginDlg.DoModal();
}
else if (1 == menuId) {
+ CChangePasswordDlg changePasswordDlg;
+ changePasswordDlg.DoModal();
+ }
+ else if (2 == menuId) {
+ CUserManagerDlg dlg;
+ if (dlg.DoModal()!= IDOK) {
+ logManager.log(SystemLogManager::LogType::Operation, _T("用户管理的预操作被取消！"));
+ }
+ }
+ else if (3 == menuId) {
+ CSystemLogManagerDlg dlg;
+ dlg.DoModal();
+ }
+ else if (4 == menuId) {
+ 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();
}
- ShowLoginDlg();
+ CLoginDlg loginDlg;
+ loginDlg.DoModal();
}
- else if (2 == menuId) {
- if (userManager.isLoggedIn()) {
- userManager.logout();
- m_pTopToolbar->SetOperatorBtnText(_T("未登录"));
+ 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();
}
return 0;
@@ -554,6 +716,14 @@
pView->DestroyWindow();
delete (CBaseView*)pView;
m_pActiveView = nullptr;
+ m_pMainContainer->Resize();
+}
+
+void CBondEqDlg::CloseView(CComponentDlg* pView)
+{
+ pView->DestroyWindow();
+ delete pView;
+ m_pActiveComponentDlg = nullptr;
m_pMainContainer->Resize();
}
@@ -578,10 +748,7 @@
}
}
}
- else if (2 == nIDEvent) {
- KillTimer(2);
- theApp.m_model.createRemoteEqs();
- }
+
CDialogEx::OnTimer(nIDEvent);
}
@@ -611,17 +778,81 @@
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_OPERATOR_SYSTEM_LOG, 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_OPERATOR_SYSTEM_LOG, 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("未登录"));
}
}
+
+CComponentPLCDlg* CBondEqDlg::CreateComponentPLCDlg(CComponent* pComponent)
+{
+ CComponentPLCDlg* pDlg = new CComponentPLCDlg(m_pMainContainer);
+ pDlg->SetContext(pComponent);
+ pDlg->Create(IDD_COMPONENT_PLC, m_pMainContainer);
+
+
+ CString strIcon0, strIcon1, strIcon2, strIcon3;
+ strIcon0.Format(_T("%s\\Res\\small_close0.ico"), (LPTSTR)(LPCTSTR)theApp.m_strAppDir);
+ strIcon1.Format(_T("%s\\Res\\small_close1.ico"), (LPTSTR)(LPCTSTR)theApp.m_strAppDir);
+ strIcon2.Format(_T("%s\\Res\\small_close2.ico"), (LPTSTR)(LPCTSTR)theApp.m_strAppDir);
+ strIcon3.Format(_T("%s\\Res\\small_close3.ico"), (LPTSTR)(LPCTSTR)theApp.m_strAppDir);
+ pDlg->AddToolBtn(VIEW_TOOL_BTN_CLOSE,
+ (LPTSTR)(LPCTSTR)strIcon0,
+ (LPTSTR)(LPCTSTR)strIcon1,
+ (LPTSTR)(LPCTSTR)strIcon2,
+ (LPTSTR)(LPCTSTR)strIcon3, "关闭");
+ pDlg->ShowWindow(SW_SHOW);
+ pDlg->SetWindowText(pComponent->getName().c_str());
+ m_pMainContainer->Resize();
+
+ return pDlg;
+}
+
+void CBondEqDlg::AlarmOn()
+{
+ if (m_pAlarmWnd == nullptr) {
+ m_pAlarmWnd = new CAlarmPopupDlg();
+ m_pAlarmWnd->SetPLC(theApp.m_model.getBonder().getPLC("PLC(1)"));
+ m_pAlarmWnd->Create(IDD_DIALOG_POPUP_ALARM, this);
+ m_pAlarmWnd->CenterWindow();
+ }
+ m_pAlarmWnd->AlarmOn();
+}
+
+void CBondEqDlg::AlarmOff()
+{
+ if (m_pAlarmWnd == nullptr) {
+ m_pAlarmWnd = new CAlarmPopupDlg();
+ m_pAlarmWnd->SetPLC(theApp.m_model.getBonder().getPLC("PLC(1)"));
+ m_pAlarmWnd->Create(IDD_DIALOG_POPUP_ALARM, this);
+ m_pAlarmWnd->CenterWindow();
+ }
+ m_pAlarmWnd->AlarmOff();
+}
--
Gitblit v1.9.3